106 Commits

Author SHA1 Message Date
JEECG
06144206df 修改nacos命名空间springboot3的id也是springboot3,方便理解 2024-06-22 23:23:05 +08:00
JEECG
3d3b5850ad online的依赖升级个小版本号 2024-06-22 17:18:59 +08:00
JEECG
816eeb9225 3.7.0版本合并springboot3分支
本次提交未升级【minidao、仪表盘、online的依赖】
2024-06-22 17:03:43 +08:00
JEECG
49f709a32a 升级积木报表到最新版1.7.6 2024-06-19 11:03:31 +08:00
JEECG
35ab818741 3.7.0 大版本发布 2024-06-15 17:33:32 +08:00
JEECG
b45e75007b 3.7.0 大版本发布 2024-06-13 11:43:50 +08:00
JEECG
06e6594b75 3.7.0 大版本发布(升级online) 2024-06-13 10:16:01 +08:00
JEECG
0ff93a220d 3.7.0 大版本发布(仪表盘模块升级) 2024-06-12 18:49:24 +08:00
JEECG
e1378f4ee5 3.7.0 大版本发布 2024-06-12 14:45:37 +08:00
JEECG
a6b6e7c9d4 3.7.0大版本发布 2024-06-11 22:58:04 +08:00
EightMonth
f1496b5084 rocketmq-starter应用举例 2024-04-12 10:16:30 +08:00
JEECG
7b06715bff 排除minidao的子依赖jsqlparser和druid,总与mybatisplus冲突 2024-04-11 11:13:39 +08:00
JEECG
c117abb2d4 升级druid到1.2.22 2024-04-08 14:23:49 +08:00
JEECG
ea6927a2a7
Merge pull request #6007 from EightMonth/master
修复 #5901
2024-04-08 13:52:58 +08:00
EightMonth
4fed40ff7d
Update pom.xml 2024-04-03 16:06:04 +08:00
JEECG
ab49983759 回滚druid版本升级,导致问题“角色功能报错,列表查询报错。 #6070” 2024-04-03 09:44:01 +08:00
EightMonth
5a09a6fb4a
Merge branch 'master' into master 2024-04-02 15:43:35 +08:00
JEECG
ac93bf7d6b 升级积木报表到1.7.4,升级druid到1.2.22 2024-04-01 13:47:48 +08:00
EightMonth
e3e1cd6b0d 修复 #5936 2024-03-25 16:27:53 +08:00
EightMonth
6e0277c60a 升级druid版本,修复 #5936 2024-03-25 14:37:00 +08:00
EightMonth
e923654161 升级jimu版本至1.7.3,屏蔽flyway 2024-03-25 10:52:37 +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
70847d17f1 升级积木报表版本 2024-03-23 21:22:29 +08:00
JEECG
9fd40d0973 代码生成器jar包中携带配置文件导致 spring.profiles.active 被覆盖 #6010 2024-03-20 10:07:54 +08:00
JEECG
fee729e16c 【回滚】暂时回退mybatisplus、minidao版本,online模块不兼容 2024-03-18 14:06:09 +08:00
JEECG
10a3e9c6ba 升级knife4j、mybatisplus、justauth、minidao版本 2024-03-18 10:11:05 +08:00
zhangdaiscott
39af6e25ee ChatGPT AI助手,对接配置文档 2024-03-11 19:08:33 +08:00
zhangdaiscott
8f99a80352 【优化代码生成功能】uniapp调整目录、升级sql的命名改成flyway规则 2024-03-09 22:11:00 +08:00
zhangdaiscott
936a87e738 积木报表 v1.7.2 紧急发布,修复 1.7.1 严重 Bug 2024-03-07 22:32:39 +08:00
zhangdaiscott
37a38ad288 【3.6.3版本发布】升级版本号 2024-03-06 17:13:05 +08:00
zhangdaiscott
e15e9d80c4 【3.6.3版本发布】ai聊天模块新增代码 2024-03-06 16:22:03 +08:00
EightMonth
7c68b46943 添加springboot3的配置变更 2024-03-01 16:04:57 +08:00
EightMonth
c5d620d2b2 升级jedis版本至3.8.0 2024-01-08 13:54:04 +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
JEECG
ca9a433f3c
Merge pull request #5765 from hoperunChen/springboot3-fix-#5723
fix issue for springboot3 #5723: 指定jaxb-runtime版本,添加修改记录
2024-01-04 21:41:11 +08:00
chenrui
d5903ba52a Merge remote-tracking branch 'upstream/springboot3' into springboot3-fix-#5741 2024-01-04 20:37:37 +08:00
chenrui
3ee635eddf fix issue for springboot3 #5723: 指定jaxb-runtime版本,添加修改记录 2024-01-04 20:32:26 +08:00
chenrui
21bc68fb53 fix issue for springboot3 #5741: shiro 无法使用 spring boot 3.X 自带的jedis,降版本处理 2024-01-04 20:19:46 +08:00
zhangdaiscott
169a66f5dd 升级新版本号3.6.2 2024-01-03 13:47:33 +08:00
chenrui
46e3e62b59 fix issue for springboot3 #5741: shiro 无法使用 spring boot 3.X 自带的jedis,降版本处理 2024-01-02 13:31:57 +08:00
zhangdaiscott
69287a772b 小功能修改 2023-12-29 19:41:44 +08:00
zhangdaiscott
3656264f8a 提供积木报表fastjson2版本 2023-12-28 22:34:23 +08:00
JEECG
b5fd5fe782
Merge pull request #5716 from EightMonth/springboot3
升级fastjson至2.0.43,替换tomcat为undertow
2023-12-26 17:21:30 +08:00
EightMonth
b311fedc6b 升级fastjson至2.0.43,替换tomcat为undertow 2023-12-26 15:03:35 +08:00
zhangdaiscott
09f92f01aa 提交online新依赖(解决online接口安全漏洞问题) 2023-12-26 14:08:20 +08:00
zhangdaiscott
e321a0405f 升级aliyun.oss和minio的依赖 2023-12-26 10:01:57 +08:00
zhangdaiscott
732f05dc74 提供springboot3版本的online依赖支持 2023-12-21 14:57:14 +08:00
kezhijie
25180e41c8 更新minidao支持springboot3版本 2023-12-21 09:29:16 +08:00
kezhijie
a99e3f2268 更新积木报表支持springboot3版本 2023-12-21 09:28:00 +08:00
kezhijie
098bb12b9e 更改jeecg-boot-starter3依赖 2023-12-21 09:26:39 +08:00