ruoyi
/
cloud-server
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(): 修复诸多依赖冲突问题

detached
dongzeliang 2024-06-06 16:11:29 +08:00
parent b42ff96aad
commit 26a4af7c9b
19 changed files with 133 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cloud-common/cloud-common-core/pom.xml
View File

@ -56,8 +56,8 @@
<!-- mybatis - plus 依赖 -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.3.1</version>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<version>3.5.6</version>
<exclusions>
<exclusion>
<groupId>com.github.jsqlparser</groupId>
@ -70,6 +70,12 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.16</version>
</dependency>
<!-- Hibernate Validator -->
<dependency>
<groupId>org.springframework.boot</groupId>

7
cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java
View File

@ -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;
/**

14
cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/validation/ValidationConfig.java 100644
View File

@ -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();
}
}

4
cloud-common/cloud-common-datasource/pom.xml
View File

@ -20,14 +20,14 @@
<!-- Druid -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<artifactId>druid-spring-boot-3-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<!-- Dynamic DataSource -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
<version>${dynamic-ds.version}</version>
</dependency>

13
cloud-common/cloud-common-swagger/pom.xml
View File

@ -24,10 +24,21 @@
</dependency>
<!-- Swagger -->
<dependency>
<!--<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.fox.version}</version>
</dependency>-->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.5.0</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

13
cloud-modules/cloud-modules-file/pom.xml
View File

@ -42,10 +42,10 @@
</dependency>
<!-- FastDFS -->
<dependency>
<!--<dependency>
<groupId>com.github.tobato</groupId>
<artifactId>fastdfs-client</artifactId>
</dependency>
</dependency>-->
<!-- Minio -->
<dependency>
@ -56,17 +56,22 @@
<!-- MuYu Common Swagger -->
<dependency>
<!--<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-swagger</artifactId>
</dependency>
-->
<!-- MuYu Common System-->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-system</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
</dependencies>
<build>

2
cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java
View File

@ -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) {

94
cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java
View File

@ -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();
// }
//}

11
cloud-modules/cloud-modules-gen/pom.xml
View File

@ -42,11 +42,11 @@
</dependency>
<!-- Swagger UI -->
<dependency>
<!--<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.fox.version}</version>
</dependency>
</dependency>-->
<!-- Apache Velocity -->
<dependency>
@ -67,9 +67,14 @@
</dependency>
<!-- MuYu Common Swagger -->
<dependency>
<!--<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-swagger</artifactId>
</dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
</dependencies>

4
cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/CloudGenApplication.java
View File

@ -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 {

7
cloud-modules/cloud-modules-job/pom.xml
View File

@ -73,9 +73,14 @@
</dependency>
<!-- MuYu Common Swagger -->
<dependency>
<!--<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-swagger</artifactId>
</dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
</dependencies>

4
cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/CloudJobApplication.java
View File

@ -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 {

8
cloud-modules/cloud-modules-system/pom.xml
View File

@ -73,11 +73,15 @@
</dependency>
<!-- MuYu Common Swagger -->
<dependency>
<!--<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-swagger</artifactId>
</dependency>
</dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
</dependencies>
<build>

4
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java
View File

@ -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 {

2
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
View File

@ -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;

6
cloud-modules/cloud-modules-system/src/main/resources/logback/dev.xml
View File

@ -8,7 +8,7 @@
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${log.sky.pattern}</pattern>
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
@ -23,7 +23,7 @@
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.sky.pattern}</pattern>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
@ -45,7 +45,7 @@
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.sky.pattern}</pattern>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->

8
cloud-modules/cloud-modules-system/src/main/resources/logback/prod.xml
View File

@ -23,9 +23,7 @@
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.sky.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>INFO</level>
@ -45,9 +43,7 @@
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.sky.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>ERROR</level>

8
cloud-modules/cloud-modules-system/src/main/resources/logback/test.xml
View File

@ -23,9 +23,7 @@
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.sky.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>INFO</level>
@ -45,9 +43,7 @@
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.sky.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>ERROR</level>

6
pom.xml
View File

@ -20,14 +20,14 @@
<spring-boot.version>3.2.6</spring-boot.version>
<spring-cloud.version>2023.0.2</spring-cloud.version>
<spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>
<spring-boot-admin.version>2.7.10</spring-boot-admin.version>
<spring-boot-admin.version>3.2.3</spring-boot-admin.version>
<swagger.fox.version>3.0.0</swagger.fox.version>
<swagger.core.version>1.6.2</swagger.core.version>
<tobato.version>1.27.2</tobato.version>
<kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>1.4.7</pagehelper.boot.version>
<druid.version>1.2.16</druid.version>
<dynamic-ds.version>3.5.2</dynamic-ds.version>
<druid.version>1.2.23</druid.version>
<dynamic-ds.version>4.3.0</dynamic-ds.version>
<commons.io.version>2.13.0</commons.io.version>
<velocity.version>2.3</velocity.version>
<fastjson.version>2.0.41</fastjson.version>