Commit Graph

70 Commits (1632c241eeb6118287c3637dcab54ad86514218e)

Author SHA1 Message Date
JEECG 43d47c08cb 【jeecgboot 3.7.0里程碑版本发布——合并springboot3sas分支】
Merge remote-tracking branch 'origin/springboot3' into springboot3_sas

# Conflicts:
#	.gitignore
#	db/tables_nacos.sql
#	jeecg-boot-base-core/pom.xml
#	jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantPackServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml
#	pom.xml
2024-06-22 19:55:35 +08:00
JEECG 816eeb9225 3.7.0版本合并springboot3分支
本次提交未升级【minidao、仪表盘、online的依赖】
2024-06-22 17:03:43 +08:00
JEECG a6b6e7c9d4 3.7.0大版本发布 2024-06-11 22:58:04 +08:00
EightMonth 9db6c1a7ac 优化生产环境屏蔽swagger处理 2024-06-06 10:39:50 +08:00
EightMonth b8162a4a6d 修复#6127 #6130 2024-04-25 16:01:58 +08:00
EightMonth faebdee755 修复#6100、@IgnoreAuth扫描加速 2024-04-25 11:52:41 +08:00
EightMonth f1496b5084 rocketmq-starter应用举例 2024-04-12 10:16:30 +08:00
EightMonth 06b41ae479 Merge branch 'master' into springboot3
# Conflicts:
#	db/tables_nacos.sql
#	jeecg-boot-base-core/pom.xml
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
#	jeecg-module-system/jeecg-system-start/pom.xml
#	jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
#	jeecg-server-cloud/jeecg-cloud-gateway/pom.xml
#	jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
#	pom.xml
2024-03-25 09:39:13 +08:00
JEECG 10a3e9c6ba 升级knife4j、mybatisplus、justauth、minidao版本 2024-03-18 10:11:05 +08:00
zhangdaiscott 37a38ad288 【3.6.3版本发布】升级版本号 2024-03-06 17:13:05 +08:00
zhangdaiscott f3f70e8549 【3.6.3版本发布】代码修复 2024-03-06 16:22:36 +08:00
EightMonth c27c5a9a9b 梳理服务配置信息 2024-03-01 15:49:28 +08:00
zhangdaiscott bc52aa918d gateway的配置改坏了,导致命名空间等不好使 2024-02-29 17:30:04 +08:00
EightMonth 84077e6e24 移除shiro 2024-01-16 19:49:15 +08:00
EightMonth 3ac8ee304a 完全替换shiro权限注解,新增手机登录、APP登录 2024-01-12 09:26:30 +08:00
EightMonth cdea05ebb0 Merge branch 'master' into springboot3
# Conflicts:
#	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
#	jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
#	jeecg-module-system/jeecg-system-biz/pom.xml
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/WechatVerifyController.java
#	jeecg-module-system/jeecg-system-start/pom.xml
#	jeecg-server-cloud/jeecg-visual/jeecg-cloud-sentinel/pom.xml
#	pom.xml
2024-01-08 13:52:33 +08:00
zhangdaiscott 169a66f5dd 升级新版本号3.6.2 2024-01-03 13:47:33 +08:00
kezhijie d818b1dd9d 更新jeecg-boot-starter3依赖 2023-12-21 09:26:39 +08:00
kezhijie bcdbec0091 更新jeecg-boot-starter3依赖 2023-12-21 09:26:39 +08:00
kezhijie 098bb12b9e 更改jeecg-boot-starter3依赖 2023-12-21 09:26:39 +08:00
kezhijie 4a6c750b19 为注释内容添加注释原因 2023-12-21 09:26:39 +08:00
kezhijie 9bed25be8c spring3 2023-12-21 09:26:30 +08:00
JEECG a406c7cd81
Merge pull request #5659 from EightMonth/master
修改docker-compose文件添加network配置
2023-12-12 17:49:27 +08:00
kezhijie 480878a3db 修改docker-compose文件添加network配置 2023-12-12 17:43:54 +08:00
JEECG a85499119d
Merge pull request #5605 from EightMonth/master
修复 #5556

sentinel配置文件修改账号密码,logging.level.pattern 等配置无效! #5556
shiro集成 redis 不支持 sentinel 方式部署的redis集群 #5569
2023-12-12 16:23:32 +08:00
zhangdaiscott 074920552a JeecgBoot 3.6.1版本发布——ONLINE专题版本 2023-12-07 12:01:14 +08:00
kezhijie 8dcc5bdf8a 修复 #5556 2023-11-23 13:50:07 +08:00
JEECG 04c55fa3ba
Merge pull request #5480 from EightMonth/master
优化seata测试案例,使全局事务可以 回滚
2023-10-20 13:59:54 +08:00
zhangdaiscott 524cd4a3d1 JeecgBoot 3.6.0大版本发布 2023-10-18 15:04:41 +08:00
kezhijie a364025bd2 升级seata版本至1.5.2 2023-10-16 18:24:17 +08:00
JEECG 6d34164a16
Merge pull request #5277 from Chenzhexian/master
网关路由配置Bug问题!!!
2023-10-16 12:04:45 +08:00
kezhijie 78e371ab9f 优化seata测试案例,使全局事务可以 回滚 2023-09-26 10:17:14 +08:00
zhangdaiscott 30caf045ed 解决jeecg-cloud-nacos 打包镜像运行问题 #5379 2023-09-20 19:39:36 +08:00
zhangdaiscott d557aa4cc0 jeecgboot 3.5.5版本发布(跳过3.5.4) 2023-09-20 11:58:10 +08:00
zhangdaiscott ee1a568bed 升级mybatis-plus、dynamic-datasource-spring-boot-starter、commons-fileupload依赖版本号 2023-09-20 10:37:19 +08:00
zhangdaiscott 946d535f68 jeecg-cloud-xxljob模块中logback.xml中生成日志路径问题 #5344 2023-09-16 21:40:52 +08:00
Chenzhexian 5974a2e8a4
Update DynamicRouteLoader.java 2023-08-18 09:54:20 +08:00
Chenzhexian 30151a2324
Update DynamicRouteLoader.java 2023-08-17 16:06:16 +08:00
Chenzhexian 28293aba7d
Create PredicatesVo.java 2023-08-17 16:01:51 +08:00
zhangdaiscott 7167668c2a JeecgBoot 低代码平台 3.5.3 版本发布,Online 功能专题升级 2023-07-23 23:11:39 +08:00
zhangdaiscott 96b3ba6e9a nacos支持开启鉴权的配置 2023-07-18 14:43:46 +08:00
zhangdaiscott 436bfbced9 升级Nacos 至 2.2.3 版本解决 raft 漏洞问题 2023-07-17 19:54:16 +08:00
zhangdaiscott 5273b81f94 【issues/5115】因swagger文档导致gateway内存溢出 2023-07-17 16:11:04 +08:00
zhangdaiscott 101ffd91af 升级版本号3.5.2 2023-06-07 15:00:01 +08:00
zhangdaiscott 793295a8fe Seata示例启动不了 #4748 2023-05-10 17:21:23 +08:00
zhangdaiscott 1a74dd1a2e Seata示例启动不了 #4748 2023-05-08 22:05:47 +08:00
zhangdaiscott fd7d0b7202 如何指定nacos命名空间和分组 2023-04-17 14:29:58 +08:00
zhangdaiscott 96586517bd Merge remote-tracking branch 'remotes/origin/master' 2023-04-17 13:32:49 +08:00
miniFrank b089bb96f1 [bugfix]
1. 修复nacos命名问题;
2. 将RouteGroup对齐到nacosgroup;
https://github.com/jeecgboot/jeecg-boot/issues/4743
2023-04-16 21:12:36 +08:00
zhangdaiscott 9da4850bd7 3.5.1 版本发布 2023-04-14 16:12:01 +08:00