chenbowen
|
4106cfced2
|
Merge branch 'dev' into test
# Conflicts:
# zt-dependencies/pom.xml
|
2025-11-20 18:36:13 +08:00 |
|
chenbowen
|
985b429f6f
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# zt-dependencies/pom.xml
|
2025-11-20 18:35:03 +08:00 |
|
chenbowen
|
0b646295da
|
1. 新增 iwork 同步用户组织信息接口
2. 修复错误设置版本信息在 zt-dependencies 的 bug
|
2025-11-20 18:27:01 +08:00 |
|
qianshijiang
|
5374b0567b
|
封装树形数据操作工具类
|
2025-11-20 15:09:08 +08:00 |
|
qianshijiang
|
47f710648b
|
新增业务附件查询权限标识
|
2025-11-20 10:25:57 +08:00 |
|
chenbowen
|
4c9b1c616e
|
Merge branch 'dev' into test
|
2025-11-18 19:03:09 +08:00 |
|
chenbowen
|
88fb1652e6
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# zt-dependencies/pom.xml
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/sso/ExternalSsoServiceImpl.java
|
2025-11-18 18:51:57 +08:00 |
|
chenbowen
|
52a0b561f9
|
1. 新增针对外部的自定义 sso 菜单外链
|
2025-11-18 18:47:50 +08:00 |
|
chenbowen
|
74d2a1a236
|
1. 升级 3.0.44
|
2025-11-18 14:13:47 +08:00 |
|
chenbowen
|
585dd3449f
|
Merge branch 'dev' into test
|
2025-11-18 11:39:28 +08:00 |
|
chenbowen
|
8dc3e81d4f
|
1. 升级 3.0.44
|
2025-11-18 11:39:01 +08:00 |
|
chenbowen
|
6b3453e4ee
|
Merge branch 'dev' into test
|
2025-11-18 10:59:55 +08:00 |
|
chenbowen
|
633e430f46
|
1. 新增分页接口聚合查询注解支持
2. 优化 databus api 日志记录的字段缺失问题
3. 新增 eplat sso 页面登录校验
4. 用户、部门编辑新增 seata 事务支持
5. 新增 iwork 流程发起接口
6. 新增 eban 同步用户时的岗位处理逻辑
7. 新增无 skywalking 时的 traceId 支持
|
2025-11-18 10:59:29 +08:00 |
|
qianshijiang
|
8b3d93dc17
|
新增业务附件查询权限标识
|
2025-11-18 10:57:42 +08:00 |
|
chenbowen
|
266eb45e00
|
1. 新增分页接口聚合查询注解支持
2. 优化 databus api 日志记录的字段缺失问题
3. 新增 eplat sso 页面登录校验
4. 用户、部门编辑新增 seata 事务支持
5. 新增 iwork 流程发起接口
6. 新增 eban 同步用户时的岗位处理逻辑
7. 新增无 skywalking 时的 traceId 支持
|
2025-11-18 10:03:34 +08:00 |
|
qianshijiang
|
c4482af144
|
新增业务附件查询权限标识
|
2025-11-17 18:01:00 +08:00 |
|
chenbowen
|
d5a1e5c157
|
Merge branch 'dev' into test
|
2025-11-13 21:41:13 +08:00 |
|
chenbowen
|
53a0293b7c
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-13 21:40:08 +08:00 |
|
chenbowen
|
af7f103a38
|
调整后台返回部门id与公司id类型为 string
|
2025-11-13 21:39:27 +08:00 |
|
chenbowen
|
2280d29fb6
|
调整后台返回部门id与公司id类型为 string
|
2025-11-13 21:16:08 +08:00 |
|
chenbowen
|
71e63519ae
|
调整后台返回部门id与公司id类型为 string
|
2025-11-13 21:10:38 +08:00 |
|
chenbowen
|
c8dca75943
|
Merge branch 'dev' into test
|
2025-11-13 18:45:33 +08:00 |
|
chenbowen
|
2eb09ff35d
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-13 18:45:11 +08:00 |
|
chenbowen
|
c1f12dfe5e
|
1. 修复 userinfo 过多导致的用户登录失败错误
|
2025-11-13 18:44:28 +08:00 |
|
wencai he
|
428c9a60b1
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc!3
|
2025-11-13 09:44:31 +00:00 |
|
hewencai
|
4efa894c8f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-13 17:32:31 +08:00 |
|
hewencai
|
f02745454d
|
修改门户管理图片显示逻辑
|
2025-11-13 17:32:30 +08:00 |
|
qianshijiang
|
d9fa921fda
|
添加异步任务工具类
|
2025-11-13 14:59:11 +08:00 |
|
chenbowen
|
b6951a4c6b
|
1. infra 模块扩展为两个实例
|
2025-11-13 11:22:18 +08:00 |
|
chenbowen
|
3e5a0a4845
|
1. 缩减 dsc 服务占用资源
|
2025-11-13 11:11:22 +08:00 |
|
wencai he
|
49a54e2199
|
Merge branch 'dev' into 'test'
feat:新增门户管理功能
See merge request jygk/dsc!2
|
2025-11-13 02:29:50 +00:00 |
|
hewencai
|
e00086c6e8
|
feat:新增门户管理功能
|
2025-11-13 10:28:19 +08:00 |
|
chenbowen
|
9c99750dd8
|
1. zt-module-report 不在进行部署
|
2025-11-13 09:14:50 +08:00 |
|
chenbowen
|
bd56cb0405
|
Merge branch 'dev' into test
|
2025-11-12 22:26:02 +08:00 |
|
chenbowen
|
c399bdf720
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-12 22:25:46 +08:00 |
|
chenbowen
|
1a34cbc678
|
1. 验证码接口 url 不校验租户
|
2025-11-12 22:23:58 +08:00 |
|
chenbowen
|
81fb8eea8f
|
Merge branch 'dev' into test
|
2025-11-11 17:16:15 +08:00 |
|
chenbowen
|
8423775582
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-11 17:15:55 +08:00 |
|
chenbowen
|
aa159638b9
|
1. 只要标记了业务接口，就需要全量的拦截，不再区分 url
|
2025-11-11 17:14:31 +08:00 |
|
wencai he
|
2c4f46b6de
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc!1
|
2025-11-10 08:06:35 +00:00 |
|
hewencai
|
03c76b071a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-10 10:41:48 +08:00 |
|
hewencai
|
a6b87f01a7
|
add:增加seata和doc4j依赖
|
2025-11-10 10:41:08 +08:00 |
|
chenbowen
|
3312ed328d
|
1. dsc bpm deploy 单独进行发布
|
2025-11-07 12:58:59 +08:00 |
|
chenbowen
|
7d74ff7acc
|
Merge branch 'dev' into test
|
2025-11-07 12:46:18 +08:00 |
|
chenbowen
|
b7f07ba8da
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-07 12:45:49 +08:00 |
|
chenbowen
|
3c19722cbd
|
1. 调整附件临时 url 过期时间为 24 小时
|
2025-11-07 12:37:49 +08:00 |
|
chenbowen
|
5037c741a9
|
Merge branch 'dev' into test
|
2025-11-06 23:10:34 +08:00 |
|
chenbowen
|
b8b8495dfe
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-11-06 23:10:12 +08:00 |
|
chenbowen
|
f25ee5091e
|
1. 调整 databus api 策略，添加每次重试新建请求的逻辑
|
2025-11-06 23:08:55 +08:00 |
|
chenbowen
|
5fb15c31ed
|
1. 调整 pod 资源限制
|
2025-11-06 18:33:25 +08:00 |
|