167 Commits

Author SHA1 Message Date
JEECG
fbc312c35d
Merge pull request #6173 from EightMonth/springboot3
修复#6127 #6130
2024-04-25 20:04:26 +08:00
EightMonth
b8162a4a6d 修复#6127 #6130 2024-04-25 16:01:58 +08:00
EightMonth
6fc34d8a39
升级druid1.2.22版本兼容处理 2024-04-03 16:18:31 +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
EightMonth
73bd04d04a
Merge branch 'master' into master 2024-03-22 16:38:39 +08:00
EightMonth
266ebd9122 修复 #5901 2024-03-19 09:41:29 +08:00
JEECG
990f79fdfe 调整flyway配置,检查数据库类型只有mysql才启用 2024-03-18 09:27:54 +08:00
zhangdaiscott
b15e6e0422 【优化代码生成功能】uniapp调整目录 2024-03-09 22:30:41 +08:00
zhangdaiscott
8f99a80352 【优化代码生成功能】uniapp调整目录、升级sql的命名改成flyway规则 2024-03-09 22:11:00 +08:00
zhangdaiscott
b0ce456909 【3.6.3版本发布】升级积木报表的升级SQL 2024-03-06 18:45:44 +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
zhangdaiscott
4a857680d0 原生表单新增携带 createTime 等系统字段 #1033 2024-02-23 09:59:19 +08:00
zhangdaiscott
a47d0984dc [issues/5755]vue代码不加入逻辑删除字段
[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件
[issues/1022]我这个控件是哪里设置没对吗,为什么打开已有的记录,会触发提示“请输入”验证? #1022
fix 带条件字典存在单引号导致js编译错误
2024-02-19 16:40:33 +08:00
zhangdaiscott
9dfdd47b36 springboot3版本的仪表盘依赖有问题,升级一个版本 2024-01-12 11:32:26 +08:00
zhangdaiscott
272a7540eb 仪表盘升级为springboot3版本 2024-01-12 11:00:51 +08:00
EightMonth
ad796f079f flywaydb兼容springboot3报错,先注释掉 2024-01-12 11:00:37 +08:00
zhangdaiscott
3618842f44 [issue/5787]增加非空判断防止代码生成时空指针异常 2024-01-09 19:12:16 +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
fd8c848c9e 修改小bug 2024-01-07 20:30:49 +08:00
zhangdaiscott
09614a0239 修复几个bug 2024-01-07 20:28:41 +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
zhangdaiscott
0bd7f715c4 默认删除人大金仓依赖,需要请自己放开 2024-01-04 13:57:23 +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
169a66f5dd 升级新版本号3.6.2 2024-01-03 13:47:33 +08:00
zhangdaiscott
7e39b31123 日志暂时不做权限控制 2024-01-03 13:44:36 +08:00
chenrui
da08adbea1 fix issue for springboot3 #5742: 修改代码生成时的schema注解参数 2024-01-02 13:41:54 +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
ed86ea3da1 默认不需要nosql支持包 2023-12-28 11:03:10 +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
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
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
c36ece8923 补充信息 2023-12-23 19:24:15 +08:00