Przeglądaj źródła

compile success base on jdk17, spring boot 3.x, shoulder 0.8

lym 4 tygodni temu
rodzic
commit
46fa6d9119
16 zmienionych plików z 50 dodań i 48 usunięć
  1. 1 1
      shoulder-gateway/shoulder-api-gateway/src/main/java/cn/itlym/shoulder/platform/gateway/client/dto/param/AccessToken2ServiceTokenParam.java
  2. 1 1
      shoulder-gateway/shoulder-api-gateway/src/main/java/cn/itlym/shoulder/platform/gateway/client/dto/param/DeleteServiceTokenParam.java
  3. 2 2
      shoulder-generator/src/main/java/cn/itlym/shoulder/generator/GeneratorApp.java
  4. 1 1
      shoulder-generator/src/main/resources/template/DTO.java.vm
  5. 1 1
      shoulder-generator/src/main/resources/template/JpaEntity.java.vm
  6. 1 1
      shoulder-generator/src/main/resources/template/JpaRepository.java.vm
  7. 6 3
      shoulder-notify-center/shoulder-sms/sms-center/src/main/java/cn/itlym/shoulder/platform/notify/sms/entity/EmailEntity.java
  8. 5 5
      shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/DemoRestfulApi.java
  9. 5 5
      shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-reference/__rootArtifactId__-reference-xxx/src/main/java/reference/api/DemoService.java
  10. 3 4
      shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-start/src/main/java/start/controller/DemoController.java
  11. 5 5
      shoulder-system-center/system-api/src/main/java/cn/itlym/shoulder/platform/system/api/SysConfigRestfulApi.java
  12. 5 5
      shoulder-system-center/system-api/src/main/java/cn/itlym/shoulder/platform/system/api/SysDictionaryRestfulApi.java
  13. 2 2
      shoulder-system-center/system-common/pom.xml
  14. 5 5
      shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/DemoRestfulApi.java
  15. 5 0
      shoulder-user-center/uaa-core/pom.xml
  16. 2 7
      shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/controller/DemoController.java

+ 1 - 1
shoulder-gateway/shoulder-api-gateway/src/main/java/cn/itlym/shoulder/platform/gateway/client/dto/param/AccessToken2ServiceTokenParam.java

@@ -1,6 +1,6 @@
 package cn.itlym.shoulder.platform.gateway.client.dto.param;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 /**
  * @author lym

+ 1 - 1
shoulder-gateway/shoulder-api-gateway/src/main/java/cn/itlym/shoulder/platform/gateway/client/dto/param/DeleteServiceTokenParam.java

@@ -1,6 +1,6 @@
 package cn.itlym.shoulder.platform.gateway.client.dto.param;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 
 /**
  * @author lym

+ 2 - 2
shoulder-generator/src/main/java/cn/itlym/shoulder/generator/GeneratorApp.java

@@ -1,10 +1,11 @@
 package cn.itlym.shoulder.generator;
 
 import cn.itlym.shoulder.generator.service.SysGeneratorService;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.io.IOUtils;
 import org.mybatis.spring.annotation.MapperScan;
-import org.shoulder.core.dto.response.ListResult;
 import org.shoulder.core.dto.response.BaseResult;
+import org.shoulder.core.dto.response.ListResult;
 import org.shoulder.core.util.StringUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -14,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 

+ 1 - 1
shoulder-generator/src/main/resources/template/DTO.java.vm

@@ -8,7 +8,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.Length;
 
 #if(${hasBigDecimal})

+ 1 - 1
shoulder-generator/src/main/resources/template/JpaEntity.java.vm

@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 	#if(${hasBigDecimal})
 	import java.math.BigDecimal;
 	#end

+ 1 - 1
shoulder-generator/src/main/resources/template/JpaRepository.java.vm

@@ -8,7 +8,7 @@ import org.springframework.data.Page;
 import org.springframework.data.domain;
 
 import ${package}.${pkgName}.entity.${className}Entity;
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 import java.util.List;
 import java.util.Map;

+ 6 - 3
shoulder-notify-center/shoulder-sms/sms-center/src/main/java/cn/itlym/shoulder/platform/notify/sms/entity/EmailEntity.java

@@ -1,12 +1,15 @@
 package cn.itlym.shoulder.platform.notify.sms.entity;
 
 import cn.itlym.shoulder.platform.notify.sms.dto.EmailDTO;
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Arrays;
-import java.util.Date;
 
 //@Entity
 @Table(name = "tb_email")
@@ -62,7 +65,7 @@ public class EmailEntity implements Serializable {
         this.subject = mail.getSubject();
         this.content = mail.getContent();
         this.template = mail.getTemplate();
-        this.sendTime = new Timestamp(new Date().getTime());
+        this.sendTime = new Timestamp(System.currentTimeMillis());
     }
 
     public Long getId() {

+ 5 - 5
shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/DemoRestfulApi.java

@@ -5,11 +5,11 @@ package ${package}.api;
 
 import org.shoulder.core.dto.response.BaseResult;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 /**
  * demo restful api

+ 5 - 5
shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-reference/__rootArtifactId__-reference-xxx/src/main/java/reference/api/DemoService.java

@@ -5,11 +5,11 @@ package ${package}.api;
 
 import org.shoulder.core.dto.response.BaseResult;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 /**
  * demo 服务的接口

+ 3 - 4
shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-start/src/main/java/start/controller/DemoController.java

@@ -3,9 +3,8 @@
 #set( $symbol_escape = '\' )
 package ${package}.start.controller;
 
-import lombok.extern.shoulder.SLog;
+import org.shoulder.core.log.AppLoggers;
 import org.shoulder.core.log.Logger;
-import org.shoulder.core.log.LoggerFactory;
 import org.shoulder.web.annotation.SkipResponseWrap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,9 +22,9 @@ import org.springframework.web.bind.annotation.RestController;
 public class DemoController {
 
     /**
-     * 定义 shoulder 的 logger, 使用注解 {@link SLog} 时则可不写这行代码
+     * 接口 logger
      */
-    private static final Logger log = LoggerFactory.getLogger(DemoController.class);
+    private static final Logger log = AppLoggers.APP_SERVICE;
 
 
     /**

+ 5 - 5
shoulder-system-center/system-api/src/main/java/cn/itlym/shoulder/platform/system/api/SysConfigRestfulApi.java

@@ -2,11 +2,11 @@ package cn.itlym.shoulder.platform.system.api;
 
 import org.shoulder.core.dto.response.BaseResult;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 /**
  * 系统配置

+ 5 - 5
shoulder-system-center/system-api/src/main/java/cn/itlym/shoulder/platform/system/api/SysDictionaryRestfulApi.java

@@ -2,11 +2,11 @@ package cn.itlym.shoulder.platform.system.api;
 
 import org.shoulder.core.dto.response.BaseResult;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 /**
  * 数据字典

+ 2 - 2
shoulder-system-center/system-common/pom.xml

@@ -23,8 +23,8 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct</artifactId>
+            <groupId>cn.itlym</groupId>
+            <artifactId>shoulder-starter-beanmap</artifactId>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

+ 5 - 5
shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/DemoRestfulApi.java

@@ -2,11 +2,11 @@ package cn.itlym.platform.uaa.api;
 
 import org.shoulder.core.dto.response.BaseResult;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 /**
  * demo restful api

+ 5 - 0
shoulder-user-center/uaa-core/pom.xml

@@ -18,6 +18,11 @@
             <artifactId>shoulder-platform-starter-micro</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>cn.itlym</groupId>
+            <artifactId>shoulder-starter-beanmap</artifactId>
+        </dependency>
+
         <!-- 持久层接口 -->
         <dependency>
             <groupId>cn.itlym.platform</groupId>

+ 2 - 7
shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/controller/DemoController.java

@@ -1,8 +1,7 @@
 package cn.itlym.platform.uaa.start.controller;
 
-import lombok.extern.shoulder.SLog;
+import org.shoulder.core.log.AppLoggers;
 import org.shoulder.core.log.Logger;
-import org.shoulder.core.log.LoggerFactory;
 import org.shoulder.web.annotation.SkipResponseWrap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,16 +12,12 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author shoulder
  */
-//@SLog // 与 @Slf4j 类似,在希望打日志的类上添加 @SLog 注解,编译时将生成类似下面定义 logger 的代码
 @SkipResponseWrap // 该类所有方法的返回值将不被包装
 @RestController
 @RequestMapping("demo")
 public class DemoController {
 
-    /**
-     * 定义 shoulder 的 logger, 使用注解 {@link SLog} 时则可不写这行代码
-     */
-    private static final Logger log = LoggerFactory.getLogger(DemoController.class);
+    private static final Logger log = AppLoggers.APP_SERVICE;
 
 
     /**