Commit Graph

1117 Commits (cdea05ebb0abdbe34b0b59101eabaffb30f06b55)

Author SHA1 Message Date
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
JEECG 2be6052cd4
Merge pull request #5766 from hoperunChen/springboot3-fix-#5742
fix issue for springboot3 #5742: 修改代码生成时的schema注解参数
2024-01-04 21:40:53 +08:00
JEECG 68ed67ee49
shiro 无法使用 spring boot 3.X 自带的jedis,降版本处理 Merge pull request #5767 from hoperunChen/springboot3-fix-#5741
fix issue for springboot3 #5741: shiro 无法使用 spring boot 3.X 自带的jedis,降版本处理
2024-01-04 21:40:31 +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 6fe8f1d81a 从3.6.2+版本增加flyway自动升级数据库机制 2024-01-04 14:56:06 +08:00
zhangdaiscott 0bd7f715c4 默认删除人大金仓依赖,需要请自己放开 2024-01-04 13:57:23 +08:00
zhangdaiscott 041d88161e 2024年首版本发布(antd4和仪表盘大升级) 2024-01-03 22:12:07 +08:00
zhangdaiscott 79a62aa056 从3.6.2+版本增加flyway自动升级数据库机制 2024-01-03 22:07:27 +08:00
zhangdaiscott b86b4d9676 从3.6.2+版本增加flyway自动升级数据库机制 2024-01-03 22:01:07 +08:00
zhangdaiscott aeaac80012 2024年首版本发布(antd4和仪表盘大升级) 2024-01-03 19:46:35 +08:00
zhangdaiscott e0ef20cf08 3.6.2版本对应的数据库脚本 2024-01-03 18:58:30 +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 7e39b31123 日志暂时不做权限控制 2024-01-03 13:44:36 +08:00
zhangdaiscott 18765450a6 2024年首版本发布(仪表盘大升级) 2024-01-03 13:40:44 +08:00
zhangdaiscott dff8c84d9c 2024年首版本发布(仪表盘大升级) 2024-01-03 13:37:06 +08:00
zhangdaiscott d962c34846 新版数据库,有新升级sql和权限授权配置 2024-01-03 13:36:01 +08:00
chenrui da08adbea1 fix issue for springboot3 #5742: 修改代码生成时的schema注解参数 2024-01-02 13:41:54 +08:00
chenrui 46e3e62b59 fix issue for springboot3 #5741: shiro 无法使用 spring boot 3.X 自带的jedis,降版本处理 2024-01-02 13:31:57 +08:00
zhangdaiscott cd9794d818 删除无用代码 2023-12-31 17:11:18 +08:00
zhangdaiscott 5034b7cf18 提供新版仪表盘 2023-12-31 15:14:04 +08:00
zhangdaiscott fdde84c68a 代码生成器更新 2023-12-29 21:14:49 +08:00
zhangdaiscott 4c54ff6f52 Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot 2023-12-29 19:44:16 +08:00
zhangdaiscott de3285dc1b 通知公告 2023-12-29 19:43:12 +08:00
zhangdaiscott 7f0c035c4c 企业微信集成改造 2023-12-29 19:42:36 +08:00
zhangdaiscott 43593e8def 加权限注解 2023-12-29 19:42:24 +08:00
zhangdaiscott 48b0b608d8 租户改造 2023-12-29 19:42:13 +08:00
zhangdaiscott 69287a772b 小功能修改 2023-12-29 19:41:44 +08:00
zhangdaiscott 3656264f8a 提供积木报表fastjson2版本 2023-12-28 22:34:23 +08:00
zhangdaiscott 3361d48cd4 Merge branch 'springboot3' of https://github.com/zhangdaiscott/jeecg-boot into springboot3 2023-12-28 11:03:26 +08:00
zhangdaiscott ed86ea3da1 默认不需要nosql支持包 2023-12-28 11:03:10 +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
EightMonth 33c0104a02 增加undertow配置到test\prod 环境 2023-12-26 17:11:54 +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
JEECG 337d5a9489
Merge pull request #5692 from hoperunChen/fix-QQYUN-7527
fix QQYUN-7527 vue3代码生成默认带上高级查询
2023-12-26 14:35:56 +08:00
zhangdaiscott cfeb81ee1e Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot.git 2023-12-26 14:08:37 +08:00
zhangdaiscott 09f92f01aa 提交online新依赖(解决online接口安全漏洞问题) 2023-12-26 14:08:20 +08:00
JEECG 6d1094936b
Merge pull request #5691 from hoperunChen/Fix-QQYUN-7583
fix QQYUN-7583 Vue3风格表单页面多选控件渲染成了下拉多选
2023-12-26 14:00:59 +08:00
JEECG 8836a2793a
Merge pull request #5690 from hoperunChen/fix-issues-#5658
fix issues #5658 树表复选框与展开按钮重叠问题
2023-12-26 13:59:52 +08:00
zhangdaiscott e321a0405f 升级aliyun.oss和minio的依赖 2023-12-26 10:01:57 +08:00
zhangdaiscott c36ece8923 补充信息 2023-12-23 19:24:15 +08:00
zhangdaiscott a82213b90c 还原错误提交 2023-12-21 15:47:28 +08:00
zhangdaiscott 98facdd2ee Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot.git 2023-12-21 15:45:21 +08:00