Browse Source

1.调整 pom.xml 中的依赖结构
2.使用 jakarta 替换 javax

reghao 4 months ago
parent
commit
139ec0a129
100 changed files with 213 additions and 196 deletions
  1. 1 1
      account/account-api/src/main/java/cn/reghao/tnb/account/api/dto/AccountRegistryStatus.java
  2. 2 2
      account/account-api/src/main/java/cn/reghao/tnb/account/api/dto/CrawledUser.java
  3. 5 0
      account/account-service/pom.xml
  4. 1 1
      account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountProfileController.java
  5. 2 2
      account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/AccountLoginDto.java
  6. 3 3
      account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/AccountRegisterDto.java
  7. 1 1
      account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/OAuthAppDto.java
  8. 2 2
      account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/PasswordResetDto.java
  9. 1 1
      account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/PasswordUpdateDto.java
  10. 1 1
      account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/UserEmailUpdate.java
  11. 3 3
      account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/VerifyCodeDto.java
  12. 3 3
      account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserAccount.java
  13. 3 3
      account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserLogin.java
  14. 3 3
      account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserRegistry.java
  15. 3 3
      account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserRole.java
  16. 2 2
      account/account-service/src/main/java/cn/reghao/tnb/account/app/security/WebSecurityConfig.java
  17. 1 1
      account/account-service/src/main/java/cn/reghao/tnb/account/app/template/FreeMarkerConfig.java
  18. 5 5
      auth/pom.xml
  19. 4 4
      common/pom.xml
  20. 3 3
      content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/ImagePublishSbt.java
  21. 2 2
      content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/VideoFilePublish.java
  22. 1 1
      content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/VideoFileUpdate.java
  23. 1 1
      content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/VideoSearch.java
  24. 2 2
      content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/comment/CommentDto.java
  25. 2 2
      content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/comment/CommentSbtDto.java
  26. 3 3
      content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/geo/MallReplyDto.java
  27. 1 1
      content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/spider/BiliData.java
  28. 2 2
      content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/spider/CrawledVideo.java
  29. 6 0
      content/content-service/pom.xml
  30. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/HongbaoDto.java
  31. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/ImageMessage.java
  32. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/AlbumImageData.java
  33. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/ArticlePublishSbt.java
  34. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/AudioPublishSbt.java
  35. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/AudioScopeUpdate.java
  36. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UpdateAlbumCover.java
  37. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UpdateAlbumName.java
  38. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UpdateAlbumScope.java
  39. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UpdateArticleContent.java
  40. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UpdateArticleScope.java
  41. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UserStatus.java
  42. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/data/spider/TaskContext.java
  43. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/controller/PaperController.java
  44. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/controller/QuestionController.java
  45. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/dto/ExamMarkResult.java
  46. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/dto/PaperAddDto.java
  47. 4 5
      content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/dto/QuestionAddDto.java
  48. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/dto/UserResult.java
  49. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/po/PaperQuestion.java
  50. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/provider/QuestionAddGroupSequenceProvider.java
  51. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/query/GetPaperQuery.java
  52. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/vo/QuestionAnswer.java
  53. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/model/vo/MapPoint.java
  54. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/service/ChartMapService.java
  55. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/model/dto/BuyItem.java
  56. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/model/dto/BuyProductDto.java
  57. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/model/dto/CartDto.java
  58. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/model/po/Logistics.java
  59. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/AlbumActionDto.java
  60. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/AlbumCreateDto.java
  61. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/CategoryAdd.java
  62. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/NoticeAdd.java
  63. 4 4
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/SearchCriteria.java
  64. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/UserRcmd.java
  65. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoCoverUpdate.java
  66. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoErrorReport.java
  67. 2 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoInfoUpdate.java
  68. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoPublishSbt.java
  69. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoScopeUpdate.java
  70. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/BannerVideo.java
  71. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PlayComplete.java
  72. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PlayRecord.java
  73. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostAlbum.java
  74. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostCategory.java
  75. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostItem.java
  76. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostTag.java
  77. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/SearchRecord.java
  78. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/SiteNotice.java
  79. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoCategoryPost.java
  80. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoError.java
  81. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoFile.java
  82. 3 3
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoPost.java
  83. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoStatistic.java
  84. 2 2
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoTag.java
  85. 1 1
      content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/rcmd/task/RcmdConsumer.java
  86. 4 0
      data/data-service/pom.xml
  87. 1 1
      data/data-service/src/main/java/cn/reghao/tnb/data/app/security/CustomReactiveAuthorizationManager.java
  88. 2 2
      file/file-api/src/main/java/cn/reghao/file/api/dto/BuyDto.java
  89. 6 0
      file/file-service/pom.xml
  90. 2 2
      file/file-service/src/main/java/cn/reghao/tnb/file/app/model/dto/AvatarUpdate.java
  91. 3 3
      file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/AlbumCreate.java
  92. 2 2
      file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/AlbumEdit.java
  93. 1 1
      file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/CamDeviceDto.java
  94. 2 2
      file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/CamRecordDto.java
  95. 1 1
      file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/CreateDir.java
  96. 3 5
      file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/CreateFolder.java
  97. 1 1
      file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/DeleteFile.java
  98. 2 2
      file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/MoveFile.java
  99. 1 1
      file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/RenameFile.java
  100. 2 2
      file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/SearchForm.java

+ 1 - 1
account/account-api/src/main/java/cn/reghao/tnb/account/api/dto/AccountRegistryStatus.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.account.api.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**

+ 2 - 2
account/account-api/src/main/java/cn/reghao/tnb/account/api/dto/CrawledUser.java

@@ -5,8 +5,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**

+ 5 - 0
account/account-service/pom.xml

@@ -43,6 +43,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

+ 1 - 1
account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountProfileController.java

@@ -11,7 +11,7 @@ import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

+ 2 - 2
account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/AccountLoginDto.java

@@ -6,8 +6,8 @@ import cn.reghao.jutil.web.validator.ValidEnum;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 
 /**

+ 3 - 3
account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/AccountRegisterDto.java

@@ -4,9 +4,9 @@ import cn.reghao.tnb.account.app.model.constant.LoginPlat;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 
 /**

+ 1 - 1
account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/OAuthAppDto.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.account.app.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**

+ 2 - 2
account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/PasswordResetDto.java

@@ -3,8 +3,8 @@ package cn.reghao.tnb.account.app.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 
 /**

+ 1 - 1
account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/PasswordUpdateDto.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.account.app.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**

+ 1 - 1
account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/UserEmailUpdate.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.account.app.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

+ 3 - 3
account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/VerifyCodeDto.java

@@ -5,9 +5,9 @@ import cn.reghao.tnb.account.app.model.constant.VerifyChannel;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 
 /**

+ 3 - 3
account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserAccount.java

@@ -6,9 +6,9 @@ import lombok.*;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.Set;

+ 3 - 3
account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserLogin.java

@@ -3,9 +3,9 @@ package cn.reghao.tnb.account.app.model.po;
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.*;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * 用户登入日志

+ 3 - 3
account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserRegistry.java

@@ -5,9 +5,9 @@ import cn.reghao.tnb.common.util.ConstantId;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * 帐号开放注册规则

+ 3 - 3
account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserRole.java

@@ -4,9 +4,9 @@ import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * 持久化到数据库版本的 UserAuthority

+ 2 - 2
account/account-service/src/main/java/cn/reghao/tnb/account/app/security/WebSecurityConfig.java

@@ -22,7 +22,7 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHand
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
-import org.springframework.security.web.context.SecurityContextPersistenceFilter;
+import org.springframework.security.web.context.SecurityContextHolderFilter;
 
 /**
  * Web 应用安全配置
@@ -65,7 +65,7 @@ public class WebSecurityConfig {
                 .authorizeHttpRequests(request -> request
                         .requestMatchers("/api/account/**").authenticated()
                         .anyRequest().permitAll())
-                .addFilterAfter(new LoginRedirectFilter(), SecurityContextPersistenceFilter.class)
+                .addFilterAfter(new LoginRedirectFilter(), SecurityContextHolderFilter.class)
                 .addFilterBefore(accountAuthFilter(authenticationManager), UsernamePasswordAuthenticationFilter.class)
                 .addFilterBefore(thirdPartyAuthFilter(authenticationManager), UsernamePasswordAuthenticationFilter.class)
                 .securityContext().securityContextRepository(mySecurityContextRepository)

+ 1 - 1
account/account-service/src/main/java/cn/reghao/tnb/account/app/template/FreeMarkerConfig.java

@@ -8,7 +8,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 

+ 5 - 5
auth/pom.xml

@@ -35,6 +35,11 @@
             <version>0.12.6</version>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+            <version>2.1.2</version>
+        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -50,10 +55,5 @@
             <artifactId>jaxb-core</artifactId>
             <version>2.3.0</version>
         </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
-        </dependency>
     </dependencies>
 </project>

+ 4 - 4
common/pom.xml

@@ -31,13 +31,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
         <dependency>

+ 3 - 3
content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/ImagePublishSbt.java

@@ -1,10 +1,10 @@
 package cn.reghao.tnb.content.api.dto;
 
+import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
-import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -16,7 +16,7 @@ import java.io.Serializable;
 public class ImagePublishSbt implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @Length(min = 1, max = 50, message = "相册名最多为 50 个字符")
+    @Size(min = 1, max = 50, message = "相册名最多为 50 个字符")
     private String albumName;
     @NotNull
     private Integer scope;

+ 2 - 2
content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/VideoFilePublish.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.api.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**

+ 1 - 1
content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/VideoFileUpdate.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.content.api.dto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**

+ 1 - 1
content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/VideoSearch.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.content.api.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**

+ 2 - 2
content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/comment/CommentDto.java

@@ -3,8 +3,8 @@ package cn.reghao.tnb.content.api.dto.comment;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;

+ 2 - 2
content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/comment/CommentSbtDto.java

@@ -3,8 +3,8 @@ package cn.reghao.tnb.content.api.dto.comment;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;

+ 3 - 3
content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/geo/MallReplyDto.java

@@ -6,9 +6,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 

+ 1 - 1
content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/spider/BiliData.java

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 

+ 2 - 2
content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/spider/CrawledVideo.java

@@ -3,8 +3,8 @@ package cn.reghao.tnb.content.api.dto.spider;
 import cn.reghao.tnb.account.api.dto.CrawledUser;
 import lombok.*;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**

+ 6 - 0
content/content-service/pom.xml

@@ -55,6 +55,12 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/HongbaoDto.java

@@ -6,8 +6,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/message/ImageMessage.java

@@ -3,8 +3,8 @@ package cn.reghao.tnb.content.app.chat.model.dto.message;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/AlbumImageData.java

@@ -2,9 +2,9 @@ package cn.reghao.tnb.content.app.data.model.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.List;
 

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/ArticlePublishSbt.java

@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/AudioPublishSbt.java

@@ -6,8 +6,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/AudioScopeUpdate.java

@@ -4,7 +4,7 @@ import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.jutil.web.validator.ValidEnum;
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UpdateAlbumCover.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.data.model.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UpdateAlbumName.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.data.model.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UpdateAlbumScope.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.data.model.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UpdateArticleContent.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.data.model.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UpdateArticleScope.java

@@ -4,7 +4,7 @@ import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.jutil.web.validator.ValidEnum;
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UserStatus.java

@@ -3,8 +3,8 @@ package cn.reghao.tnb.content.app.data.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.List;
 

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/data/spider/TaskContext.java

@@ -8,7 +8,7 @@ import cn.reghao.tnb.content.app.data.spider.task.GetNewsDetailTask;
 import cn.reghao.tnb.content.app.data.spider.task.GetNewsIndexTask;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/controller/PaperController.java

@@ -18,7 +18,7 @@ import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.List;
 
 /**

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/controller/QuestionController.java

@@ -13,7 +13,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.List;
 
 /**

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/dto/ExamMarkResult.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.content.app.exam.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/dto/PaperAddDto.java

@@ -5,9 +5,9 @@ import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.Date;
 import java.util.List;
 

+ 4 - 5
content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/dto/QuestionAddDto.java

@@ -7,17 +7,16 @@ import cn.reghao.tnb.content.app.exam.model.provider.QuestionAddGroupSequencePro
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.validator.group.GroupSequenceProvider;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao
  * @date 2024-08-25 15:46:19
  */
-@GroupSequenceProvider(QuestionAddGroupSequenceProvider.class)
+//@GroupSequenceProvider(QuestionAddGroupSequenceProvider.class)
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/dto/UserResult.java

@@ -6,8 +6,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/po/PaperQuestion.java

@@ -5,8 +5,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/provider/QuestionAddGroupSequenceProvider.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.exam.model.provider;
 
 import cn.reghao.tnb.content.app.exam.model.constant.QuestionType;
 import cn.reghao.tnb.content.app.exam.model.dto.QuestionAddDto;
-import org.hibernate.validator.spi.group.DefaultGroupSequenceProvider;
+//import org.hibernate.validator.spi.group.DefaultGroupSequenceProvider;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,8 +11,8 @@ import java.util.List;
  * @author reghao
  * @date 2024-09-01 10:13:47
  */
-public class QuestionAddGroupSequenceProvider implements DefaultGroupSequenceProvider<QuestionAddDto> {
-    @Override
+public class QuestionAddGroupSequenceProvider /*implements DefaultGroupSequenceProvider<QuestionAddDto>*/ {
+    //@Override
     public List<Class<?>> getValidationGroups(QuestionAddDto questionAddDto) {
         List<Class<?>> defaultGroupSequence = new ArrayList<>();
         defaultGroupSequence.add(QuestionAddDto.class);

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/query/GetPaperQuery.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.content.app.exam.model.query;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/model/vo/QuestionAnswer.java

@@ -6,8 +6,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 
 /**

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/model/vo/MapPoint.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/geo/service/ChartMapService.java

@@ -14,7 +14,7 @@ import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.*;
 import java.util.stream.Collectors;
 

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/model/dto/BuyItem.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.content.app.mall.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/model/dto/BuyProductDto.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.mall.model.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/model/dto/CartDto.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.mall.model.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/model/po/Logistics.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.mall.model.po;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/AlbumActionDto.java

@@ -5,9 +5,9 @@ import cn.reghao.tnb.content.api.constant.AlbumAction;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/AlbumCreateDto.java

@@ -5,8 +5,8 @@ import cn.reghao.tnb.content.api.constant.PostScope;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/CategoryAdd.java

@@ -2,9 +2,9 @@ package cn.reghao.tnb.content.app.vod.model.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/NoticeAdd.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.vod.model.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao

+ 4 - 4
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/SearchCriteria.java

@@ -4,10 +4,10 @@ import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.tnb.content.api.constant.VideoStatus;
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/UserRcmd.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.vod.model.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoCoverUpdate.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.vod.model.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoErrorReport.java

@@ -5,8 +5,8 @@ import cn.reghao.tnb.content.api.constant.VideoErrorType;
 import cn.reghao.tnb.content.api.constant.VideoStatus;
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao

+ 2 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoInfoUpdate.java

@@ -1,10 +1,9 @@
 package cn.reghao.tnb.content.app.vod.model.dto;
 
 import lombok.Getter;
-import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoPublishSbt.java

@@ -6,9 +6,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Set;
 

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/VideoScopeUpdate.java

@@ -4,8 +4,8 @@ import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.jutil.web.validator.ValidEnum;
 import lombok.Getter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/BannerVideo.java

@@ -5,8 +5,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PlayComplete.java

@@ -5,8 +5,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PlayRecord.java

@@ -4,8 +4,8 @@ import cn.reghao.jutil.jdk.db.BaseObject;
 import cn.reghao.tnb.message.api.dto.MediaProgress;
 import lombok.*;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * 视频播放记录

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostAlbum.java

@@ -9,9 +9,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostCategory.java

@@ -6,9 +6,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostItem.java

@@ -5,8 +5,8 @@ import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostTag.java

@@ -6,9 +6,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * 稿件标签

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/SearchRecord.java

@@ -7,9 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.time.LocalDateTime;
 
 /**

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/SiteNotice.java

@@ -5,9 +5,9 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoCategoryPost.java

@@ -5,8 +5,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoError.java

@@ -6,8 +6,8 @@ import cn.reghao.tnb.content.app.vod.model.dto.VideoErrorReport;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * 视频错误

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoFile.java

@@ -6,9 +6,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 /**
  * 视频文件

+ 3 - 3
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoPost.java

@@ -11,9 +11,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.time.LocalDateTime;
 
 /**

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoStatistic.java

@@ -6,8 +6,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * 视频数据统计

+ 2 - 2
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoTag.java

@@ -5,8 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 1 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/rcmd/task/RcmdConsumer.java

@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.concurrent.Executor;
 
 /**

+ 4 - 0
data/data-service/pom.xml

@@ -28,6 +28,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis-reactive</artifactId>

+ 1 - 1
data/data-service/src/main/java/cn/reghao/tnb/data/app/security/CustomReactiveAuthorizationManager.java

@@ -17,7 +17,7 @@ import org.springframework.util.PathMatcher;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.Map;
 import java.util.Objects;
 

+ 2 - 2
file/file-api/src/main/java/cn/reghao/file/api/dto/BuyDto.java

@@ -3,8 +3,8 @@ package cn.reghao.file.api.dto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.List;
 

+ 6 - 0
file/file-service/pom.xml

@@ -54,6 +54,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>

+ 2 - 2
file/file-service/src/main/java/cn/reghao/tnb/file/app/model/dto/AvatarUpdate.java

@@ -5,8 +5,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 3 - 3
file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/AlbumCreate.java

@@ -1,9 +1,9 @@
 package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.Getter;
-import org.hibernate.validator.constraints.Length;
+import jakarta.validation.constraints.Size;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao
@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 public class AlbumCreate {
-    @Length(min = 1, max = 10, message = "相册名长度为 1 ~ 10 个字符")
+    @Size(min = 1, max = 10, message = "相册名长度为 1 ~ 10 个字符")
     private String albumName;
     @NotNull
     private Integer fileType;

+ 2 - 2
file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/AlbumEdit.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.file.app.zdisk.model.dto;
 
 import lombok.Getter;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

+ 1 - 1
file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/CamDeviceDto.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.file.app.zdisk.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

+ 2 - 2
file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/CamRecordDto.java

@@ -3,8 +3,8 @@ package cn.reghao.tnb.file.app.zdisk.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

+ 1 - 1
file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/CreateDir.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.file.app.zdisk.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

+ 3 - 5
file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/CreateFolder.java

@@ -4,9 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 
 /**
  * @author reghao
@@ -17,8 +15,8 @@ import javax.validation.constraints.NotBlank;
 @Setter
 @Getter
 public class CreateFolder {
-    @Length(min = 1, max = 255)
+    @Size(min = 1, max = 255)
     private String pid;
-    @Length(min = 1, max = 255)
+    @Size(min = 1, max = 255)
     private String folderName;
 }

+ 1 - 1
file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/DeleteFile.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.file.app.zdisk.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

+ 2 - 2
file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/MoveFile.java

@@ -3,8 +3,8 @@ package cn.reghao.tnb.file.app.zdisk.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import java.util.List;
 
 /**

+ 1 - 1
file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/RenameFile.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.file.app.zdisk.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @author reghao

+ 2 - 2
file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/model/dto/SearchForm.java

@@ -3,8 +3,8 @@ package cn.reghao.tnb.file.app.zdisk.model.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * @author reghao

Some files were not shown because too many files changed in this diff