Commit Graph

967 Commits

Author SHA1 Message Date
chenbowen
179c22e409 1. 固定测试环境网关地址,避免被人覆盖 2025-12-30 10:32:30 +08:00
chenbowen
fac16d5e08 Merge branch 'dev' into test 2025-12-29 17:56:52 +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
wencai he
6bdcf8f371 Merge branch 'dev' into 'test'
Dev

See merge request jygk/dsc!17
2025-12-29 01:54:51 +00: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
c88fdad7ac Revert "1. 临时切换集群配合测试"
This reverts commit 26e5952252.
2025-12-27 13:12:22 +08:00
chenbowen
4d4912db5e Revert "1. 临时切换集群配合测试"
This reverts commit 3c3ac23008.
2025-12-27 13:12:22 +08:00
chenbowen
3c3ac23008 1. 临时切换集群配合测试 2025-12-27 12:48:56 +08:00
chenbowen
26e5952252 1. 临时切换集群配合测试 2025-12-27 12:26:27 +08:00
chenbowen
839e979904 Merge branch 'dev' into test 2025-12-25 18:19:58 +08:00
chenbowen
91b54cc9d1 1. 新增 seata 兼容模块打包 2025-12-25 18:19:46 +08:00
wencai he
c9f7495db1 Merge branch 'dev' into 'test'
Dev

See merge request jygk/dsc!16
2025-12-25 09:46:07 +00: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
1316d09626 Merge branch 'dev' into test 2025-12-25 17:31:52 +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
d9ab32165f Merge branch 'dev' into test 2025-12-25 10:47:38 +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
52f7a8f28b Merge branch 'dev' into test 2025-12-24 14:31:02 +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
hewencai
7ef5545dc0 update:调整数据同步用户-部门,用户-岗位同步顺序 2025-12-24 11:04:03 +08:00
hewencai
9b0e63a33e update:调整数据同步用户-部门,用户-岗位同步顺序 2025-12-24 11:04:01 +08:00
hewencai
2baede83e5 update:调整数据同步生产topic生成器 2025-12-24 11:03:59 +08:00
wencai he
25be319941 Merge branch 'dev' into 'test'
Dev

See merge request jygk/dsc!15
2025-12-24 02:42:20 +00:00
hewencai
bf27ebd5ba update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 10:42:18 +08:00
hewencai
2dc0de96a3 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 10:41:51 +08:00
wencai he
0fdfce0626 Merge branch 'dev' into 'test'
Dev

See merge request jygk/dsc!14
2025-12-24 02:37:39 +00:00
hewencai
a411da6754 Merge remote-tracking branch 'origin/dev' into dev 2025-12-24 10:36:17 +08:00
hewencai
9485d94574 update:调整数据同步用户-部门,用户-岗位同步逻辑 2025-12-24 10:36:00 +08:00
chenbowen
433e2fb4de 1. 修改每日最大发送次数 2025-12-24 10:27:57 +08:00
chenbowen
b9c44ebf91 Merge branch 'dev' into test 2025-12-24 10:15:46 +08:00
chenbowen
f526dd54b9 Merge remote-tracking branch 'base-version/main' into dev 2025-12-24 10:15:27 +08:00
chenbowen
7e87465ef9 1. 修正有误的短信配置 2025-12-24 10:14:52 +08:00
chenbowen
2052479728 1. 临时新增短信平台的单独 topic 消费 2025-12-23 19:05:07 +08:00
hewencai
1ac2f1e2cc Merge remote-tracking branch 'origin/dev' into dev 2025-12-23 18:21:13 +08:00
hewencai
7661982447 update:升级seata版本到2.4.0 2025-12-23 18:20:42 +08:00
chenbowen
48660f75cf Merge branch 'dev' into test 2025-12-23 17:53:25 +08:00
chenbowen
5843e2eb7a Merge remote-tracking branch 'refs/remotes/base-version/main' into dev 2025-12-23 17:52:55 +08:00
chenbowen
82ea639cdd 1. 去掉凭证唯一约束 2025-12-23 16:36:35 +08:00