diff --git a/cloud-common/cloud-common-core/pom.xml b/cloud-common/cloud-common-core/pom.xml index d545fe5..f9d00da 100644 --- a/cloud-common/cloud-common-core/pom.xml +++ b/cloud-common/cloud-common-core/pom.xml @@ -56,8 +56,8 @@ com.baomidou - mybatis-plus-boot-starter - 3.5.3.1 + mybatis-plus-spring-boot3-starter + 3.5.6 com.github.jsqlparser @@ -70,6 +70,12 @@ + + org.mybatis + mybatis + 3.5.16 + + org.springframework.boot diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java index abbb157..b904747 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java @@ -1,8 +1,9 @@ package com.muyu.common.core.utils.bean; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validator; + import java.util.Set; /** diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/validation/ValidationConfig.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/validation/ValidationConfig.java new file mode 100644 index 0000000..0540064 --- /dev/null +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/validation/ValidationConfig.java @@ -0,0 +1,14 @@ +package com.muyu.common.core.validation; + +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class ValidationConfig { + @Bean + public Validator validator() { + return Validation.byDefaultProvider().configure().buildValidatorFactory().getValidator(); + } +} diff --git a/cloud-common/cloud-common-datasource/pom.xml b/cloud-common/cloud-common-datasource/pom.xml index f78ca45..d1639d5 100644 --- a/cloud-common/cloud-common-datasource/pom.xml +++ b/cloud-common/cloud-common-datasource/pom.xml @@ -20,14 +20,14 @@ com.alibaba - druid-spring-boot-starter + druid-spring-boot-3-starter ${druid.version} com.baomidou - dynamic-datasource-spring-boot-starter + dynamic-datasource-spring-boot3-starter ${dynamic-ds.version} diff --git a/cloud-common/cloud-common-swagger/pom.xml b/cloud-common/cloud-common-swagger/pom.xml index 390098f..b4804c8 100644 --- a/cloud-common/cloud-common-swagger/pom.xml +++ b/cloud-common/cloud-common-swagger/pom.xml @@ -24,10 +24,21 @@ - + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.5.0 + + + slf4j-api + org.slf4j + + diff --git a/cloud-modules/cloud-modules-file/pom.xml b/cloud-modules/cloud-modules-file/pom.xml index f101ad7..8a21adb 100644 --- a/cloud-modules/cloud-modules-file/pom.xml +++ b/cloud-modules/cloud-modules-file/pom.xml @@ -42,10 +42,10 @@ - + @@ -56,17 +56,22 @@ - + com.muyu cloud-common-system + + org.springframework.boot + spring-boot-starter-web + + diff --git a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java index 313dda0..4e1c628 100644 --- a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java +++ b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java @@ -1,6 +1,5 @@ package com.muyu.file; -import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -10,7 +9,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * * @author muyu */ -@EnableCustomSwagger2 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) public class CloudFileApplication { public static void main (String[] args) { diff --git a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java index 3cc2ee3..81d9a45 100644 --- a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java +++ b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java @@ -1,47 +1,47 @@ -package com.muyu.file.service; - -import com.alibaba.nacos.common.utils.IoUtils; -import com.github.tobato.fastdfs.domain.fdfs.StorePath; -import com.github.tobato.fastdfs.service.FastFileStorageClient; -import com.muyu.common.core.utils.file.FileTypeUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.io.InputStream; - -/** - * FastDFS 文件存储 - * - * @author muyu - */ -@Service -public class FastDfsSysFileServiceImpl implements ISysFileService { - /** - * 域名或本机访问地址 - */ - @Value("${fdfs.domain}") - public String domain; - - @Autowired - private FastFileStorageClient storageClient; - - /** - * FastDfs文件上传接口 - * - * @param file 上传的文件 - * - * @return 访问地址 - * - * @throws Exception - */ - @Override - public String uploadFile (MultipartFile file) throws Exception { - InputStream inputStream = file.getInputStream(); - StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(), - FileTypeUtils.getExtension(file), null); - IoUtils.closeQuietly(inputStream); - return domain + "/" + storePath.getFullPath(); - } -} +//package com.muyu.file.service; +// +//import com.alibaba.nacos.common.utils.IoUtils; +//import com.github.tobato.fastdfs.domain.fdfs.StorePath; +//import com.github.tobato.fastdfs.service.FastFileStorageClient; +//import com.muyu.common.core.utils.file.FileTypeUtils; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.stereotype.Service; +//import org.springframework.web.multipart.MultipartFile; +// +//import java.io.InputStream; +// +///** +// * FastDFS 文件存储 +// * +// * @author muyu +// */ +//@Service +//public class FastDfsSysFileServiceImpl implements ISysFileService { +// /** +// * 域名或本机访问地址 +// */ +// @Value("${fdfs.domain}") +// public String domain; +// +// @Autowired +// private FastFileStorageClient storageClient; +// +// /** +// * FastDfs文件上传接口 +// * +// * @param file 上传的文件 +// * +// * @return 访问地址 +// * +// * @throws Exception +// */ +// @Override +// public String uploadFile (MultipartFile file) throws Exception { +// InputStream inputStream = file.getInputStream(); +// StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(), +// FileTypeUtils.getExtension(file), null); +// IoUtils.closeQuietly(inputStream); +// return domain + "/" + storePath.getFullPath(); +// } +//} diff --git a/cloud-modules/cloud-modules-gen/pom.xml b/cloud-modules/cloud-modules-gen/pom.xml index 95e06c5..30b0d48 100644 --- a/cloud-modules/cloud-modules-gen/pom.xml +++ b/cloud-modules/cloud-modules-gen/pom.xml @@ -42,11 +42,11 @@ - + @@ -67,9 +67,14 @@ - + + + + org.springframework.boot + spring-boot-starter-web diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/CloudGenApplication.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/CloudGenApplication.java index ef88945..4868540 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/CloudGenApplication.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/CloudGenApplication.java @@ -2,7 +2,7 @@ package com.muyu.gen; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; -import com.muyu.common.swagger.annotation.EnableCustomSwagger2; +//import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -12,7 +12,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @author muyu */ @EnableCustomConfig -@EnableCustomSwagger2 +//@EnableCustomSwagger2 @EnableMyFeignClients @SpringBootApplication public class CloudGenApplication { diff --git a/cloud-modules/cloud-modules-job/pom.xml b/cloud-modules/cloud-modules-job/pom.xml index 9520e04..2676963 100644 --- a/cloud-modules/cloud-modules-job/pom.xml +++ b/cloud-modules/cloud-modules-job/pom.xml @@ -73,9 +73,14 @@ - + + + + org.springframework.boot + spring-boot-starter-web diff --git a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/CloudJobApplication.java b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/CloudJobApplication.java index 74c525d..fcb8d9b 100644 --- a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/CloudJobApplication.java +++ b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/CloudJobApplication.java @@ -2,7 +2,7 @@ package com.muyu.job; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; -import com.muyu.common.swagger.annotation.EnableCustomSwagger2; +//import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -12,7 +12,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @author muyu */ @EnableCustomConfig -@EnableCustomSwagger2 +//@EnableCustomSwagger2 @EnableMyFeignClients @SpringBootApplication public class CloudJobApplication { diff --git a/cloud-modules/cloud-modules-system/pom.xml b/cloud-modules/cloud-modules-system/pom.xml index 9c13887..bb668d5 100644 --- a/cloud-modules/cloud-modules-system/pom.xml +++ b/cloud-modules/cloud-modules-system/pom.xml @@ -73,11 +73,15 @@ - + + + org.springframework.boot + spring-boot-starter-web + diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java index 71a3747..8d86380 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java @@ -2,7 +2,7 @@ package com.muyu.system; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; -import com.muyu.common.swagger.annotation.EnableCustomSwagger2; +//import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -12,7 +12,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @author muyu */ @EnableCustomConfig -@EnableCustomSwagger2 +//@EnableCustomSwagger2 @EnableMyFeignClients @SpringBootApplication public class CloudSystemApplication { diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index ab88e1c..c1d3f18 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -16,6 +16,7 @@ import com.muyu.system.domain.SysUserRole; import com.muyu.system.mapper.*; import com.muyu.system.service.SysUserService; import com.muyu.system.service.SysConfigService; +import jakarta.validation.Validator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +24,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import javax.validation.Validator; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/cloud-modules/cloud-modules-system/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-system/src/main/resources/logback/dev.xml index 8f58e98..d1b5629 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/logback/dev.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/logback/dev.xml @@ -8,7 +8,7 @@ - ${log.sky.pattern} + ${log.pattern} @@ -23,7 +23,7 @@ 60 - ${log.sky.pattern} + ${log.pattern} @@ -45,7 +45,7 @@ 60 - ${log.sky.pattern} + ${log.pattern} diff --git a/cloud-modules/cloud-modules-system/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-system/src/main/resources/logback/prod.xml index d4c8679..76a0d8f 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/logback/prod.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/logback/prod.xml @@ -23,9 +23,7 @@ 60 - - ${log.sky.pattern} - + INFO @@ -45,9 +43,7 @@ 60 - - ${log.sky.pattern} - + ERROR diff --git a/cloud-modules/cloud-modules-system/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-system/src/main/resources/logback/test.xml index d4c8679..2cd69e4 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/logback/test.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/logback/test.xml @@ -23,9 +23,7 @@ 60 - - ${log.sky.pattern} - + INFO @@ -45,9 +43,7 @@ 60 - - ${log.sky.pattern} - + ERROR diff --git a/pom.xml b/pom.xml index 852ba2b..fcc85b7 100644 --- a/pom.xml +++ b/pom.xml @@ -20,14 +20,14 @@ 3.2.6 2023.0.2 2023.0.1.0 - 2.7.10 + 3.2.3 3.0.0 1.6.2 1.27.2 2.3.3 1.4.7 - 1.2.16 - 3.5.2 + 1.2.23 + 4.3.0 2.13.0 2.3 2.0.41