3.2.0-beta,重构很大:升级springboot2.6.6、spring-cloud-alibaba 2021.1、mybatisplus3.5.1、代码规范部分重构

This commit is contained in:
zhangdaiscott
2022-04-18 09:37:28 +08:00
parent d0b68919b3
commit 69ecb39c9e
487 changed files with 9754 additions and 2928 deletions

View File

@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-system
EXPOSE 7001
ADD ./target/jeecg-cloud-system-start-3.1.0.jar ./
ADD ./target/jeecg-cloud-system-start-3.2.0.jar ./
CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-system-start-3.1.0.jar
CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-system-start-3.2.0.jar

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>jeecg-cloud-module</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>3.1.0</version>
<version>3.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jeecg-cloud-system-start</artifactId>
@ -16,19 +16,19 @@
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-starter-cloud</artifactId>
<!--system模块需要排除jeecg-system-cloud-api-->
<!-- 3.2版本号后,可选择是否排除jeecg-system-cloud-api不排除会优先通过fegin调用接口
<exclusions>
<exclusion>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-system-cloud-api</artifactId>
</exclusion>
</exclusions>
</exclusions>-->
</dependency>
<!-- 引入jeecg-boot-module-system依赖 -->
<!-- jeecg-boot-module-system依赖 -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-module-system</artifactId>
<!-- 排除demo模块demo模块采用微服务方式独立启动 -->
<!-- 排除demo模块demo模块采用微服务独立启动 -->
<exclusions>
<exclusion>
<groupId>org.jeecgframework.boot</groupId>
@ -37,32 +37,30 @@
</exclusions>
</dependency>
<!-- 测试模块依赖 -->
<!--rabbitmq消息队列
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-cloud-test-rabbitmq</artifactId>
<version>3.1.0</version>
</dependency>-->
<!--XxlJob、分布式锁
<!-- feign 熔断限流、分布式锁、xxljob示例 -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-cloud-test-more</artifactId>
<version>3.1.0</version>
</dependency>-->
<!-- 分布式事务
<version>${jeecgboot.version}</version>
</dependency>
<!-- rabbitmq例子
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-cloud-test-seata</artifactId>
<version>3.1.0</version>
<artifactId>jeecg-cloud-test-rabbitmq</artifactId>
<version>${jeecgboot.version}</version>
</dependency>-->
<!--库分表
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-cloud-test-shardingsphere</artifactId>
<version>3.1.0</version>
</dependency> -->
<!-- 测试模块依赖 -->
<!--布式事务例子
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-cloud-test-seata</artifactId>
<version>${jeecgboot.version}</version>
</dependency>-->
<!-- 分库分表例子-->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-cloud-test-shardingsphere</artifactId>
<version>${jeecgboot.version}</version>
</dependency>
</dependencies>

View File

@ -1,7 +1,11 @@
package org.jeecg;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.base.BaseMap;
import org.jeecg.common.constant.GlobalConstants;
import org.jeecg.common.util.oConvertUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
@ -9,6 +13,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.EnableScheduling;
import java.net.InetAddress;
@ -16,14 +21,16 @@ import java.net.UnknownHostException;
/**
* 微服务启动类(采用此类启动项目为微服务模式)
* 注意: 需要先在naocs里面创建配置文件参考文档 http://doc.jeecg.com/2043906
* 注意: 需要先在naocs里面创建配置文件参考文档 http://doc.jeecg.com/2704725
*/
@Slf4j
@SpringBootApplication
@EnableFeignClients(basePackages = {"org.jeecg"})
@EnableScheduling
public class JeecgSystemCloudApplication extends SpringBootServletInitializer{
public class JeecgSystemCloudApplication extends SpringBootServletInitializer implements CommandLineRunner {
@Autowired
private RedisTemplate<String, Object> redisTemplate;
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(JeecgSystemCloudApplication.class);
@ -44,4 +51,17 @@ public class JeecgSystemCloudApplication extends SpringBootServletInitializer{
}
/**
* 启动的时候触发下gateway网关刷新
*
* 解决: 先启动gateway后启动服务Swagger接口文档访问不通的问题
* @param args
*/
@Override
public void run(String... args) {
BaseMap params = new BaseMap();
params.put(GlobalConstants.HANDLER_NAME, GlobalConstants.LODER_ROUDER_HANDLER);
//刷新网关
redisTemplate.convertAndSend(GlobalConstants.REDIS_TOPIC_NAME, params);
}
}

View File

@ -3,4 +3,55 @@ server:
port: 7001
spring:
application:
name: jeecg-system
name: jeecg-system
# cloud:
# #Sentinel持久化配置
# sentinel:
# transport:
# dashboard: jeecg-boot-sentinel:9000
# datasource:
# #流控规则
# flow: # 指定数据源名称
# # 指定nacos数据源
# nacos:
# server-addr: @config.server-addr@
# # 指定配置文件
# dataId: ${spring.application.name}-flow-rules
# # 指定分组
# groupId: SENTINEL_GROUP
# # 指定配置文件规则类型
# rule-type: flow
# # 指定配置文件数据格式
# data-type: json
# #降级规则
# degrade:
# nacos:
# server-addr: @config.server-addr@
# dataId: ${spring.application.name}-degrade-rules
# groupId: SENTINEL_GROUP
# rule-type: degrade
# data-type: json
# #系统规则
# system:
# nacos:
# server-addr: @config.server-addr@
# dataId: ${spring.application.name}-system-rules
# groupId: SENTINEL_GROUP
# rule-type: system
# data-type: json
# #授权规则
# authority:
# nacos:
# server-addr: @config.server-addr@
# dataId: ${spring.application.name}-authority-rules
# groupId: SENTINEL_GROUP
# rule-type: authority
# data-type: json
# #热点参数
# param-flow:
# nacos:
# server-addr: @config.server-addr@
# dataId: ${spring.application.name}-param-rules
# groupId: SENTINEL_GROUP
# rule-type: param-flow
# data-type: json