From 46fa6d91196cfd9d7beebbe596f12c2acb30ac2d Mon Sep 17 00:00:00 2001 From: lym Date: Thu, 18 Apr 2024 21:01:25 +0800 Subject: [PATCH] compile success base on jdk17, spring boot 3.x, shoulder 0.8 --- .../dto/param/AccessToken2ServiceTokenParam.java | 2 +- .../client/dto/param/DeleteServiceTokenParam.java | 2 +- .../java/cn/itlym/shoulder/generator/GeneratorApp.java | 4 ++-- .../src/main/resources/template/DTO.java.vm | 2 +- .../src/main/resources/template/JpaEntity.java.vm | 2 +- .../src/main/resources/template/JpaRepository.java.vm | 2 +- .../platform/notify/sms/entity/EmailEntity.java | 9 ++++++--- .../src/main/java/api/DemoRestfulApi.java | 10 +++++----- .../src/main/java/reference/api/DemoService.java | 10 +++++----- .../src/main/java/start/controller/DemoController.java | 7 +++---- .../platform/system/api/SysConfigRestfulApi.java | 10 +++++----- .../platform/system/api/SysDictionaryRestfulApi.java | 10 +++++----- shoulder-system-center/system-common/pom.xml | 4 ++-- .../java/cn/itlym/platform/uaa/api/DemoRestfulApi.java | 10 +++++----- shoulder-user-center/uaa-core/pom.xml | 5 +++++ .../platform/uaa/start/controller/DemoController.java | 9 ++------- 16 files changed, 50 insertions(+), 48 deletions(-) diff --git a/shoulder-gateway/shoulder-api-gateway/src/main/java/cn/itlym/shoulder/platform/gateway/client/dto/param/AccessToken2ServiceTokenParam.java b/shoulder-gateway/shoulder-api-gateway/src/main/java/cn/itlym/shoulder/platform/gateway/client/dto/param/AccessToken2ServiceTokenParam.java index da722a6..f11c451 100644 --- a/shoulder-gateway/shoulder-api-gateway/src/main/java/cn/itlym/shoulder/platform/gateway/client/dto/param/AccessToken2ServiceTokenParam.java +++ b/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 diff --git a/shoulder-gateway/shoulder-api-gateway/src/main/java/cn/itlym/shoulder/platform/gateway/client/dto/param/DeleteServiceTokenParam.java b/shoulder-gateway/shoulder-api-gateway/src/main/java/cn/itlym/shoulder/platform/gateway/client/dto/param/DeleteServiceTokenParam.java index 4a580d0..f54f08f 100644 --- a/shoulder-gateway/shoulder-api-gateway/src/main/java/cn/itlym/shoulder/platform/gateway/client/dto/param/DeleteServiceTokenParam.java +++ b/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 diff --git a/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/GeneratorApp.java b/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/GeneratorApp.java index fcc9586..7b972ac 100644 --- a/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/GeneratorApp.java +++ b/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; diff --git a/shoulder-generator/src/main/resources/template/DTO.java.vm b/shoulder-generator/src/main/resources/template/DTO.java.vm index 4cc4da9..dedeb6f 100644 --- a/shoulder-generator/src/main/resources/template/DTO.java.vm +++ b/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}) diff --git a/shoulder-generator/src/main/resources/template/JpaEntity.java.vm b/shoulder-generator/src/main/resources/template/JpaEntity.java.vm index e7bf82d..f797fcd 100644 --- a/shoulder-generator/src/main/resources/template/JpaEntity.java.vm +++ b/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 diff --git a/shoulder-generator/src/main/resources/template/JpaRepository.java.vm b/shoulder-generator/src/main/resources/template/JpaRepository.java.vm index 9b16206..f1653f2 100644 --- a/shoulder-generator/src/main/resources/template/JpaRepository.java.vm +++ b/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; diff --git a/shoulder-notify-center/shoulder-sms/sms-center/src/main/java/cn/itlym/shoulder/platform/notify/sms/entity/EmailEntity.java b/shoulder-notify-center/shoulder-sms/sms-center/src/main/java/cn/itlym/shoulder/platform/notify/sms/entity/EmailEntity.java index d63f2c6..5fe1eb1 100644 --- a/shoulder-notify-center/shoulder-sms/sms-center/src/main/java/cn/itlym/shoulder/platform/notify/sms/entity/EmailEntity.java +++ b/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() { diff --git a/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/DemoRestfulApi.java b/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/DemoRestfulApi.java index 2f88b2d..3a5163d 100644 --- a/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/DemoRestfulApi.java +++ b/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 diff --git a/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-reference/__rootArtifactId__-reference-xxx/src/main/java/reference/api/DemoService.java b/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-reference/__rootArtifactId__-reference-xxx/src/main/java/reference/api/DemoService.java index b512f2e..668977c 100644 --- a/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-reference/__rootArtifactId__-reference-xxx/src/main/java/reference/api/DemoService.java +++ b/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 服务的接口 diff --git a/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-start/src/main/java/start/controller/DemoController.java b/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-start/src/main/java/start/controller/DemoController.java index 14b6a89..4319bfa 100644 --- a/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-start/src/main/java/start/controller/DemoController.java +++ b/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; /** diff --git a/shoulder-system-center/system-api/src/main/java/cn/itlym/shoulder/platform/system/api/SysConfigRestfulApi.java b/shoulder-system-center/system-api/src/main/java/cn/itlym/shoulder/platform/system/api/SysConfigRestfulApi.java index 8f68130..b6a0dd5 100644 --- a/shoulder-system-center/system-api/src/main/java/cn/itlym/shoulder/platform/system/api/SysConfigRestfulApi.java +++ b/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; /** * 系统配置 diff --git a/shoulder-system-center/system-api/src/main/java/cn/itlym/shoulder/platform/system/api/SysDictionaryRestfulApi.java b/shoulder-system-center/system-api/src/main/java/cn/itlym/shoulder/platform/system/api/SysDictionaryRestfulApi.java index 13d0257..d531a37 100644 --- a/shoulder-system-center/system-api/src/main/java/cn/itlym/shoulder/platform/system/api/SysDictionaryRestfulApi.java +++ b/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; /** * 数据字典 diff --git a/shoulder-system-center/system-common/pom.xml b/shoulder-system-center/system-common/pom.xml index 0934d19..b24b7fb 100644 --- a/shoulder-system-center/system-common/pom.xml +++ b/shoulder-system-center/system-common/pom.xml @@ -23,8 +23,8 @@ compile - org.mapstruct - mapstruct + cn.itlym + shoulder-starter-beanmap com.baomidou diff --git a/shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/DemoRestfulApi.java b/shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/DemoRestfulApi.java index 3ace2ba..7611fb1 100644 --- a/shoulder-user-center/uaa-api/src/main/java/cn/itlym/platform/uaa/api/DemoRestfulApi.java +++ b/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 diff --git a/shoulder-user-center/uaa-core/pom.xml b/shoulder-user-center/uaa-core/pom.xml index c7352c9..49d8988 100644 --- a/shoulder-user-center/uaa-core/pom.xml +++ b/shoulder-user-center/uaa-core/pom.xml @@ -18,6 +18,11 @@ shoulder-platform-starter-micro + + cn.itlym + shoulder-starter-beanmap + + cn.itlym.platform diff --git a/shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/controller/DemoController.java b/shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/controller/DemoController.java index 619e125..53c37b8 100644 --- a/shoulder-user-center/uaa-start/src/main/java/cn/itlym/platform/uaa/start/controller/DemoController.java +++ b/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; /**