104 Commits

Author SHA1 Message Date
EightMonth
72b34d082b 修复 #6169 2024-04-30 11:53:59 +08:00
EightMonth
b8162a4a6d 修复#6127 #6130 2024-04-25 16:01:58 +08:00
EightMonth
c92c9be49a 升级druid v1.2.22版本兼容处理 2024-04-08 14:04:07 +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
EightMonth
2cfc39b23f Merge branch 'master' of https://github.com/EightMonth/jeecg-boot 2024-03-22 17:12:32 +08:00
EightMonth
c8676b3040 优化注解生效范围配置 2024-03-22 17:11:18 +08:00
EightMonth
73bd04d04a
Merge branch 'master' into master 2024-03-22 16:38:39 +08:00
EightMonth
0ca4badb77 修复 #6021 2024-03-22 16:37:00 +08:00
JEECG
58865bef28 jimureport-drag:2.0.1 报错 java.lang.IllegalStateException: No TaglibFactory available #6021 2024-03-20 22:59:27 +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
JEECG
6360aee0ff 【QQYUN-8561】企业微信登陆请求接口设置上下文不一致,导致接口404 2024-03-18 09:25:51 +08:00
EightMonth
e38e395436
Merge branch 'master' into master 2024-03-15 15:29:35 +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
zhangdaiscott
e15e9d80c4 【3.6.3版本发布】ai聊天模块新增代码 2024-03-06 16:22:03 +08:00
zhangdaiscott
f7538c1ed8 【3.6.3版本发布】首页支持自定义 2024-03-06 16:20:49 +08:00
zhangdaiscott
a9dba08a8d 【3.6.3版本发布】性能优化部分代码 2024-03-06 16:19:51 +08:00
EightMonth
acf0713385 Update ShiroConfig.java 2024-02-29 17:43:56 +08:00
EightMonth
cee872000a 处理 #5601 ,添加@ignoreAuth注解 2024-02-29 17:11:44 +08:00
zhangdaiscott
e333b126b6 微服务下字典拦截器报错 2024-01-10 14:58:01 +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
zhangdaiscott
09614a0239 修复几个bug 2024-01-07 20:28:41 +08:00
zhangdaiscott
f532e57862 解决升级到springboot3, 表单excel导出失败,找不到 javax/servlet/ServletOutputStream #5738 2024-01-03 17:26:41 +08:00
zhangdaiscott
169a66f5dd 升级新版本号3.6.2 2024-01-03 13:47:33 +08:00
zhangdaiscott
69287a772b 小功能修改 2023-12-29 19:41:44 +08:00
JEECG
3deb0e5487
Merge pull request #5730 from EightMonth/springboot3
修改自动生成接口文档范围
2023-12-28 10:49:10 +08:00
EightMonth
9e4792941e 修改自动秣接口文档范围 2023-12-28 10:43:58 +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
zhangdaiscott
81ed5100af 补充注释 2023-12-26 16:42:24 +08:00
EightMonth
87f9dc0064 去除无意义内容 2023-12-26 15:17:50 +08:00
EightMonth
b311fedc6b 升级fastjson至2.0.43,替换tomcat为undertow 2023-12-26 15:03:35 +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
zhangdaiscott
1d8c8c30d0 升级hutool版本号,解决hutool漏洞问题 CVE-2023-42278、CVE-2023-42277、CVE-2023-42276、CVE-2023-33695、CVE-2023-3276、CVE-2022-4565 2023-12-20 11:09:40 +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
9588ace87f 企业微信域名文件认证万能接口 2023-12-08 17:06:42 +08:00
zhangdaiscott
074920552a JeecgBoot 3.6.1版本发布——ONLINE专题版本 2023-12-07 12:01:14 +08:00
kezhijie
decea393a5 移除更新格式化内容 2023-12-05 10:13:29 +08:00
kezhijie
65b0fab80d 移除格式化更新 2023-12-05 10:09:14 +08:00
kezhijie
1d4098ae14 修复 #5569 2023-12-04 20:02:30 +08:00
kezhijie
8dcc5bdf8a 修复 #5556 2023-11-23 13:50:07 +08:00
zhangdaiscott
4957330c1c 原生代码生成模板优化升级
1、表单默认值带不出来 issues/5304
2、一对多erp风格支持原生生成 issues/5294
3、查询条件样式错位
2023-10-20 12:07:57 +08:00
zhangdaiscott
524cd4a3d1 JeecgBoot 3.6.0大版本发布 2023-10-18 15:04:41 +08:00
zhangdaiscott
e15335ddab 更新公司名称 2023-10-11 10:58:51 +08:00
zhangdaiscott
b373a80498 升级driud依赖到1.2.19版本号 2023-10-11 10:58:38 +08:00
zhangdaiscott
d557aa4cc0 jeecgboot 3.5.5版本发布(跳过3.5.4) 2023-09-20 11:58:10 +08:00
zhangdaiscott
81351aeb7a dynamic-datasource-spring-boot-starter改为3.5.2稳定版本 2023-09-20 11:53:25 +08:00