pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2026-01-03 20:35:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

【合并升级v3.8.1】

Browse Source 
Merge remote-tracking branch 'origin/springboot3' into springboot3_sas

# Conflicts:
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
This commit is contained in:
JEECG
2025-07-08 18:32:55 +08:00
parent 64b3c9e42e 2d7c51eadc
commit ab98b26cac
370 changed files with 12871 additions and 5596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/handler/swagger/MySwaggerResourceProvider.java
View File

@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.gateway.route.RouteLocator;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component;
import springfox.documentation.swagger.web.SwaggerResource;
import springfox.documentation.swagger.web.SwaggerResourcesProvider;

8
jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java
View File

@ -9,9 +9,10 @@ import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.config.listener.Listener;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.common.utils.StringUtils;
import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.base.BaseMap;
import org.jeecg.common.constant.CacheConstant;
import org.jeecg.common.util.RedisUtil;
@ -31,7 +32,6 @@ import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import reactor.core.publisher.Mono;
import java.net.URI;
@ -170,9 +170,9 @@ public class DynamicRouteLoader implements ApplicationEventPublisherAware {
dynamicRouteService.add(definition);
}
}
if(!ObjectUtils.isEmpty(baseMap)){
if(ObjectUtils.isNotEmpty(baseMap)){
String delRouterId = baseMap.get("delRouterId");
if (!ObjectUtils.isEmpty(delRouterId)) {
if (ObjectUtils.isNotEmpty(delRouterId)) {
dynamicRouteService.delete(delRouterId);
}
}

2
jeecg-boot/jeecg-server-cloud/jeecg-demo-cloud-start/Dockerfile
View File

@ -1,4 +1,4 @@
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:21-anolis
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:17-anolis
MAINTAINER jeecgos@163.com

2
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/Dockerfile
View File

@ -1,4 +1,4 @@
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:21-anolis
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:17-anolis
MAINTAINER jeecgos@163.com

10
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java
View File

@ -8,8 +8,10 @@ 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.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cloud.openfeign.EnableFeignClients;
@ -23,14 +25,18 @@ import java.net.UnknownHostException;
/**
* 微服务启动类（采用此类启动项目为微服务模式）
* 注意： 需要先初始化Nacos的数据库脚本，db/tables_nacos.sql
* @author zyf
* 特别提醒:
* 1、需要先初始化Nacos的数据库脚本，db/tables_nacos.sql
* 2.需要集成mogodb请删除 exclude={MongoAutoConfiguration.class}
*
* @author jeecg
* @date: 2022/4/21 10:55
*/
@Slf4j
@SpringBootApplication
@EnableFeignClients(basePackages = {"org.jeecg"})
@EnableScheduling
@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
@ImportAutoConfiguration(JustAuthAutoConfiguration.class) // spring boot 3.x justauth 兼容性处理
public class JeecgSystemCloudApplication extends SpringBootServletInitializer implements CommandLineRunner {

2
jeecg-boot/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml
View File

@ -1,6 +1,6 @@
server:
port: 7001
spring:
application:
name: jeecg-system

2
jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/Dockerfile
View File

@ -1,4 +1,4 @@
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:21-anolis
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:17-anolis
MAINTAINER jeecgos@163.com

8
jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java
View File

@ -1,8 +1,6 @@
package org.jeecg.modules.test.feign.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
@ -10,6 +8,8 @@ import org.jeecg.modules.test.feign.client.JeecgTestClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.alibaba.csp.sentinel.annotation.SentinelResource;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
/**
* 微服务单元测试
@ -32,7 +32,7 @@ public class JeecgTestFeignController {
* @return
*/
@GetMapping("/getMessage")
@Operation(summary = "测试feign @SentinelResource熔断写法 | 测试熔断关闭jeecg-demo服务")
@Operation(summary = "测试feign调用demo服务1")
@SentinelResource(value = "test_more_getMessage", fallback = "getDefaultUser")
public Result<String> getMessage(@RequestParam(value = "name", required = false) String name) {
log.info("---------Feign fallbackFactory优先级高于@SentinelResource-----------------");
@ -47,7 +47,7 @@ public class JeecgTestFeignController {
* @return
*/
@GetMapping("/getMessage2")
@Operation(summary = "测试feign fallbackFactory熔断写法 | 测试熔断关闭jeecg-demo服务")
@Operation(summary = "测试feign调用demo服务2")
public Result<String> getMessage2(@RequestParam(value = "name", required = false) String name) {
log.info("---------测试 Feign fallbackFactory-----------------");
String resultMsg = jeecgTestClient.getMessage(" I am jeecg-system 服务节点，呼叫 jeecg-demo!");

4
jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/src/main/java/org/jeecg/modules/test/rabbitmq/controller/JeecgMqTestController.java
View File

@ -5,8 +5,6 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.boot.starter.rabbitmq.client.RabbitMqClient;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.base.BaseMap;
@ -17,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import cn.hutool.core.util.RandomUtil;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
/**

6
jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/src/main/java/org/jeecg/modules/test/rocketmq/controller/JeecgMqTestController.java
View File

@ -2,8 +2,8 @@ package org.jeecg.modules.test.rocketmq.controller;
import cn.hutool.core.util.RandomUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.jeecg.boot.starter.rabbitmq.client.RabbitMqClient;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.base.BaseMap;
@ -38,7 +38,7 @@ public class JeecgMqTestController {
* @return
*/
@GetMapping(value = "/rocketmq")
@Operation(description = "测试rocketmq")
@Operation(summary = "测试rocketmq")
public Result<?> rabbitMqClientTest(HttpServletRequest req) {
//rabbitmq消息队列测试
BaseMap map = new BaseMap();
@ -49,7 +49,7 @@ public class JeecgMqTestController {
}
@GetMapping(value = "/rocketmq2")
@Operation(description = "rocketmq消息总线测试")
@Operation(summary = "rocketmq消息总线测试")
public Result<?> rabbitmq2(HttpServletRequest req) {
//rabbitmq消息总线测试

3
jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/controller/SeataOrderController.java
View File

@ -6,8 +6,9 @@ package org.jeecg.modules.test.seata.order.controller;
* @date: 2022/01/24
* @version: V1.0
*/
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.jeecg.modules.test.seata.order.dto.PlaceOrderRequest;
import org.jeecg.modules.test.seata.order.service.SeataOrderService;
import org.springframework.beans.factory.annotation.Autowired;

12
jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java
View File

@ -1,7 +1,5 @@
package org.jeecg.modules.test.sharding.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
@ -12,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
/**
@ -33,7 +33,7 @@ public class JeecgShardingDemoController extends JeecgController<ShardingSysLog,
* @return
*/
@PostMapping(value = "/test1")
@Operation(summary = "单库分表")
@Operation(summary = "单库分表插入")
public Result<?> add() {
log.info("---------------------------------单库分表插入--------------------------------");
int size = 10;
@ -52,7 +52,7 @@ public class JeecgShardingDemoController extends JeecgController<ShardingSysLog,
* @return
*/
@PostMapping(value = "/list1")
@Operation(summary = "单库分表")
@Operation(summary = "单库分表查询")
public Result<?> list() {
return Result.OK(shardingSysLogService.list());
}
@ -62,7 +62,7 @@ public class JeecgShardingDemoController extends JeecgController<ShardingSysLog,
* @return
*/
@PostMapping(value = "/test2")
@Operation(summary = "分库分表")
@Operation(summary = "分库分表插入")
public Result<?> test2() {
int start=20;
int size=30;
@ -81,7 +81,7 @@ public class JeecgShardingDemoController extends JeecgController<ShardingSysLog,
* @return
*/
@PostMapping(value = "/list2")
@Operation(summary = "分库分表")
@Operation(summary = "分库分表查询")
public Result<?> list2() {
return Result.OK(shardingSysLogService.list());
}

2
jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/Dockerfile
View File

@ -1,4 +1,4 @@
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:21-anolis
FROM registry.cn-hangzhou.aliyuncs.com/dockerhub_mirror/java:17-anolis
MAINTAINER jeecgos@163.com