|
|
6ade7e22f8
|
积木报表扩展实现类放开注释
|
2024-06-22 20:06:13 +08:00 |
|
|
|
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 |
|
|
|
816eeb9225
|
3.7.0版本合并springboot3分支
本次提交未升级【minidao、仪表盘、online的依赖】
|
2024-06-22 17:03:43 +08:00 |
|
|
|
d44945f688
|
提示语修改
|
2024-06-20 19:34:15 +08:00 |
|
|
|
335c369546
|
提示语修改
|
2024-06-19 10:02:33 +08:00 |
|
|
|
fd7783644f
|
Merge pull request #6329 from EightMonth/master
修复字典导出问题，修复 #6311
|
2024-06-18 22:43:06 +08:00 |
|
|
|
f6a3e11aa2
|
修复字典导出问题，修复 #6311
|
2024-06-18 17:34:42 +08:00 |
|
|
|
2d37b166a2
|
解决：分配权限必须退出重新登录才生效，造成很多用户困扰
|
2024-06-18 16:18:35 +08:00 |
|
|
|
cff5ec5a40
|
解决：分配权限必须退出重新登录才生效，造成很多用户困扰(目前改法缺陷：只针对当前登录人的权限修改生效)
|
2024-06-18 16:04:45 +08:00 |
|
|
|
3a07d5a983
|
分配权限需要退出重新登录，给明确提示
|
2024-06-18 11:34:43 +08:00 |
|
|
|
2747868ea7
|
3.7.0 大版本发布（优化代码生成器模板）
|
2024-06-17 17:50:59 +08:00 |
|
|
|
ee497a8d1e
|
3.7.0 大版本发布（代码生成器模板大升级）
|
2024-06-13 14:30:24 +08:00 |
|
|
|
73d62b484c
|
3.7.0 大版本发布（仪表盘模块升级）
|
2024-06-12 18:49:38 +08:00 |
|
|
|
0ff93a220d
|
3.7.0 大版本发布（仪表盘模块升级）
|
2024-06-12 18:49:24 +08:00 |
|
|
|
a6b6e7c9d4
|
3.7.0大版本发布
|
2024-06-11 22:58:04 +08:00 |
|
|
|
70a37309dd
|
sas兼容shiro处理
|
2024-05-22 18:08:31 +08:00 |
|
|
|
4dc4e87900
|
解决SQL注入检测逻辑影响业务 #6105
|
2024-04-20 18:34:52 +08:00 |
|
|
|
13d00a8bb4
|
【issues/6113】online表单生成代码， 关联表生成vue3模板里的 *.data.ts 这个文件会有报错
|
2024-04-17 10:43:19 +08:00 |
|
|
|
200adb8490
|
使用代码生成器生成树的结构，批量删除时报错，在很老的jeecg,vue2版本就在报错了 #6043
|
2024-04-12 15:42:37 +08:00 |
|
|
|
7b06715bff
|
排除minidao的子依赖jsqlparser和druid，总与mybatisplus冲突
|
2024-04-11 11:13:39 +08:00 |
|
|
|
ea6927a2a7
|
Merge pull request #6007 from EightMonth/master
修复 #5901
|
2024-04-08 13:52:58 +08:00 |
|
|
|
ee4ff35c90
|
Revert "修复 #6070"
This reverts commit 6edef14f07.
|
2024-04-03 16:04:29 +08:00 |
|
|
|
6edef14f07
|
修复 #6070
|
2024-04-03 11:18:47 +08:00 |
|
|
|
ab49983759
|
回滚druid版本升级，导致问题“角色功能报错，列表查询报错。 #6070”
|
2024-04-03 09:44:01 +08:00 |
|
|
|
5a09a6fb4a
|
Merge branch 'master' into master
|
2024-04-02 15:43:35 +08:00 |
|
|
|
ac93bf7d6b
|
升级积木报表到1.7.4，升级druid到1.2.22
|
2024-04-01 13:47:48 +08:00 |
|
|
|
c9c6dd5c1d
|
Online表单中 下拉搜索框 搜索时报sql错误，生成的SQL多了一个 “and" #5978
字典下拉异步出错 #1108
|
2024-03-28 14:44:24 +08:00 |
|
|
|
f3cf90bd28
|
在租户不隔离的情况下导出部门报错
|
2024-03-25 09:42:33 +08:00 |
|
|
|
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 |
|
|
|
266ebd9122
|
修复 #5901
|
2024-03-19 09:41:29 +08:00 |
|
|
|
f741db874c
|
移除权限不足异常堆栈，权限加载加入缓存
|
2024-03-15 13:55:58 +08:00 |
|
|
|
b15e6e0422
|
【优化代码生成功能】uniapp调整目录
|
2024-03-09 22:30:41 +08:00 |
|
|
|
8f99a80352
|
【优化代码生成功能】uniapp调整目录、升级sql的命名改成flyway规则
|
2024-03-09 22:11:00 +08:00 |
|
|
|
364be22dd0
|
新增token校验、客户端便捷工具类、修复登录缺乏租户信息、强退功能失效
|
2024-03-08 16:30:23 +08:00 |
|
|
|
37a38ad288
|
【3.6.3版本发布】升级版本号
|
2024-03-06 17:13:05 +08:00 |
|
|
|
f3f70e8549
|
【3.6.3版本发布】代码修复
|
2024-03-06 16:22:36 +08:00 |
|
|
|
f7538c1ed8
|
【3.6.3版本发布】首页支持自定义
|
2024-03-06 16:20:49 +08:00 |
|
|
|
a9dba08a8d
|
【3.6.3版本发布】性能优化部分代码
|
2024-03-06 16:19:51 +08:00 |
|
|
|
b650d512b3
|
修复 #5903 ，完善在微服务的sas认证
|
2024-03-01 14:51:09 +08:00 |
|
|
|
4a857680d0
|
原生表单新增携带 createTime 等系统字段 #1033
|
2024-02-23 09:59:19 +08:00 |
|
|
|
a47d0984dc
|
[issues/5755]vue代码不加入逻辑删除字段
[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件
[issues/1022]我这个控件是哪里设置没对吗，为什么打开已有的记录，会触发提示“请输入”验证？ #1022
fix 带条件字典存在单引号导致js编译错误
|
2024-02-19 16:40:33 +08:00 |
|
|
|
84077e6e24
|
移除shiro
|
2024-01-16 19:49:15 +08:00 |
|
|
|
9dfdd47b36
|
springboot3版本的仪表盘依赖有问题，升级一个版本
|
2024-01-12 11:32:26 +08:00 |
|
|
|
272a7540eb
|
仪表盘升级为springboot3版本
|
2024-01-12 11:00:51 +08:00 |
|
|
|
3ac8ee304a
|
完全替换shiro权限注解，新增手机登录、APP登录
|
2024-01-12 09:26:30 +08:00 |
|
|
|
3618842f44
|
[issue/5787]增加非空判断防止代码生成时空指针异常
|
2024-01-09 19:12:16 +08:00 |
|
|
|
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 |
|
|
|
fd8c848c9e
|
修改小bug
|
2024-01-07 20:30:49 +08:00 |
|
|
|
09614a0239
|
修复几个bug
|
2024-01-07 20:28:41 +08:00 |
|
|
|
2be6052cd4
|
Merge pull request #5766 from hoperunChen/springboot3-fix-#5742
fix issue for springboot3 #5742: 修改代码生成时的schema注解参数
|
2024-01-04 21:40:53 +08:00 |
|
