Commit Graph

799 Commits

Author SHA1 Message Date
lzx
1fd704fe9d fix(databus): 修改用户同步的数据源过滤条件
- 将用户同步的数据源从 userSource = 2 更新为 userSource = 3
- 修正了数据总线用户提供者API中的查询条件配置
2026-01-09 15:33:33 +08:00
chenbowen
82c819c59a Merge remote-tracking branch 'base-version/test' into dev 2026-01-09 15:32:39 +08:00
lzx
bed76174c5 Merge remote-tracking branch 'origin/dev' into dev 2026-01-09 15:30:30 +08:00
chenbowen
c3502e78c8 1. 调整 databus 默认的重试策略 2026-01-09 15:25:42 +08:00
lzx
d283d92a4e fix(sync): 修改用户数据同步的数据源过滤条件
- 将用户同步的数据源从 userSource = 2 修改为 userSource = 3
- 更新了数据库查询条件以匹配新的数据源标识
- 修正了数据同步功能的数据过滤逻辑
2026-01-09 15:02:54 +08:00
chenbowen
cf540e12be Merge remote-tracking branch 'base-version/test' into dev 2026-01-09 13:56:51 +08:00
chenbowen
5b660f5a11 1.不再过滤 get 开头的 url 2026-01-09 11:46:59 +08:00
chenbowen
30029e0fd6 1.新增用户界面的用户来源类型展示 2026-01-09 11:44:57 +08:00
chenbowen
c2f38608e7 1.新增用户界面的用户来源类型展示 2026-01-08 17:05:21 +08:00
wuzongyong
b2c2cca798 feat(file): 为S3文件客户端添加预签名URL缓存功能
- 引入RedisTemplate依赖用于缓存预签名URL
- 添加Redis缓存配置,设置缓存前缀和50分钟过期时间
- 实现预签名URL的缓存读取和存储逻辑
- 添加延迟加载RedisTemplate的方法避免循环依赖
- 在文件删除时同步清除对应的缓存项
- 优化预签名URL生成流程,优先从缓存获取
2026-01-08 09:16:44 +08:00
chenbowen
e338de722f Merge remote-tracking branch 'base-version/main' into dev 2026-01-07 16:51:19 +08:00
chenbowen
9c3d7072bf Merge branch 'test' 2026-01-07 16:50:07 +08:00
chenbowen
b3b691a7e3 1.初始化日志时并没有有效的用户信息,设置为空字符串占位 2026-01-07 16:49:47 +08:00
chenbowen
4518b893a9 Merge remote-tracking branch 'base-version/main' into dev 2026-01-07 15:50:33 +08:00
chenbowen
64de518d4c 1.新增签名日志 2026-01-07 15:49:10 +08:00
maimaishu
674ef07c5a Merge branch 'test' of http://172.16.46.63:30001/gitlab/base-version/ztcloud into test 2026-01-07 08:45:17 +08:00
maimaishu
a07c71f1a0 [+]增加国密SM4接口加解密 2026-01-07 08:44:35 +08:00
chenbowen
b86a9a2811 Merge remote-tracking branch 'base-version/main' into dev 2026-01-06 15:24:13 +08:00
chenbowen
09c9276deb 1. 修复 CompanyDataPermissionIgnoreAspect 空指针问题 2026-01-06 11:17:20 +08:00
chenbowen
797cd2abd9 1. 修复 deptignore 注解会导致的空指针问题
2. 延长 databus 默认的请求超时时间
3. 调整初始化脚本部分字段的长度
2026-01-06 09:18:47 +08:00
maimaishu
d54edcd88b [#]修改部门推送消息逻辑 2026-01-05 17:46:31 +08:00
maimaishu
88b280a33f [+]增加IWork根据ID同步接口 2026-01-05 11:33:11 +08:00
maimaishu
2e761d1867 [+]增加部门推动消息功能 2026-01-02 17:27:53 +08:00
ranke
7bd44ffca9 新增根据流程实例ID获取抄送记录的接口,用于待办详情中展示 2025-12-31 17:06:51 +08:00
maimaishu
3ad65780a6 Merge branch 'test' of http://172.16.46.63:30001/gitlab/base-version/ztcloud into test 2025-12-31 16:57:00 +08:00
maimaishu
3573217507 [+]增加部门推动消息功能 2025-12-31 16:55:20 +08:00
qianshijiang
b155b1a00a 数据库配置修改 2025-12-31 16:36:01 +08:00
chenbowen
6ac7511019 新增忽略公司以及部门数据权限的注解 2025-12-30 18:38:07 +08:00
chenbowen
5d547acfea Merge remote-tracking branch 'refs/remotes/base-version/test' into dev 2025-12-30 18:28:57 +08:00
chenbowen
4579259973 1. 恢复发布私服库的指向 2025-12-30 18:27:47 +08:00
ranke
b81e8c6df2 新增根据流程管控按钮是否可用配置功能. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=551 2025-12-30 18:07:58 +08:00
hewencai
812e9727ae fix:添加seata达梦数据库兼容补丁 2025-12-29 16:16:06 +08:00
chenbowen
580d1d9047 1. 补全基准的菜单 sql 语句 2025-12-29 11:13:29 +08:00
hewencai
8e8acd6aaf fix:修复seata2.4版本下达梦数据库回滚异常问题,增加调试日志 2025-12-29 09:54:36 +08:00
hewencai
bca34ea437 Merge remote-tracking branch 'origin/dev' into dev 2025-12-29 09:53:18 +08:00
hewencai
8b469710ce fix:修复seata2.4版本下达梦数据库回滚异常问题,增加调试日志 2025-12-29 09:53:00 +08:00
chenbowen
91b54cc9d1 1. 新增 seata 兼容模块打包 2025-12-25 18:19:46 +08:00
hewencai
1d4380adc1 Merge remote-tracking branch 'origin/dev' into dev 2025-12-25 17:44:54 +08:00
hewencai
666008e3c6 fix:修复seata2.4版本下达梦数据库回滚异常问题 2025-12-25 17:44:34 +08:00
chenbowen
1c2e8e1332 Merge remote-tracking branch 'base-version/main' into dev 2025-12-25 17:31:32 +08:00
chenbowen
e6fc24d3b1 1. 目前涉及到太多没有租户的场景,默认使用主租户兜底 2025-12-25 17:29:45 +08:00
chenbowen
b698706dad Merge remote-tracking branch 'base-version/main' into dev 2025-12-25 10:47:20 +08:00
chenbowen
09c726d51b 1. 避免无登录的操作无法记录日志的情况
2. 短信登录可以不传递租户信息
2025-12-25 10:46:45 +08:00
chenbowen
ab3104cff7 Merge remote-tracking branch 'base-version/main' into dev 2025-12-24 14:30:39 +08:00
chenbowen
89a047d28b 1. 提升 infra 可以上传的附件大小 2025-12-24 14:30:03 +08:00
hewencai
3903b73905 Merge remote-tracking branch 'ztcloud/main' into main-ztcloud
# Conflicts:
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptService.java
2025-12-24 11:15:23 +08:00
hewencai
8823e316a0 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 11:04:49 +08:00
hewencai
01847264d5 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 11:04:48 +08:00
hewencai
516198ab53 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 11:04:45 +08:00
hewencai
7f54e7f07d update:升级seata版本到2.4.0 2025-12-24 11:04:05 +08:00