chenbowen
|
a4924bd718
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-17 14:40:00 +08:00 |
|
chenbowen
|
d81413e239
|
1. 修复 databus 在多层嵌套的 json 报文，签名存在异常的 bug
|
2025-12-17 14:39:23 +08:00 |
|
wencai he
|
e6a0eef084
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc!11
|
2025-12-17 03:32:22 +00:00 |
|
hewencai
|
0b8e200aa1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-12-17 11:32:12 +08:00 |
|
hewencai
|
738c82b000
|
update：调整数据同步生产topic生成器
|
2025-12-17 11:31:57 +08:00 |
|
chenbowen
|
ccdf3d28ff
|
1. 固定 databus 服务在 64 ip 配合网络测试
|
2025-12-17 09:42:16 +08:00 |
|
chenbowen
|
498e0b864a
|
Merge branch 'dev' into test
|
2025-12-16 21:36:52 +08:00 |
|
chenbowen
|
2d5b71896e
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-16 21:36:36 +08:00 |
|
chenbowen
|
12157d5dcb
|
1. 修复 databus 在多层嵌套的 json 报文，签名存在异常的 bug
|
2025-12-16 21:35:08 +08:00 |
|
hewencai
|
7e25d6d106
|
fix：修复数据同步配置校验缺失问题
(cherry picked from commit 13403ea027)
|
2025-12-16 18:43:38 +08:00 |
|
hewencai
|
13403ea027
|
fix：修复数据同步配置校验缺失问题
|
2025-12-16 18:43:08 +08:00 |
|
hewencai
|
fcc32fa2d8
|
Merge remote-tracking branch 'ztcloud/main' into main-ztcloud
|
2025-12-16 16:36:56 +08:00 |
|
hewencai
|
72fe903447
|
update：数据同步分发机构岗位绑定关系
|
2025-12-16 16:36:34 +08:00 |
|
hewencai
|
8782631eaa
|
update：数据同步分发机构岗位绑定关系
|
2025-12-16 16:36:30 +08:00 |
|
hewencai
|
a57d05ccd6
|
update：数据同步统一使用枚举类
|
2025-12-16 16:36:29 +08:00 |
|
wencai he
|
3828884a8b
|
Merge branch 'dev' into 'test'
update：数据同步分发机构岗位绑定关系
See merge request jygk/dsc!10
|
2025-12-16 06:34:34 +00:00 |
|
hewencai
|
218c6aa3dc
|
update：数据同步分发机构岗位绑定关系
|
2025-12-16 14:34:13 +08:00 |
|
chenbowen
|
aef2bf6e1d
|
Merge branch 'dev' into test
|
2025-12-16 14:03:08 +08:00 |
|
chenbowen
|
afc8c0f23c
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-16 14:02:53 +08:00 |
|
chenbowen
|
b6f5649b97
|
1. 新增生成自有组织 CODE，同步其他系统额外生成编码映射关系，添加相关的单元测试用例
|
2025-12-16 14:00:52 +08:00 |
|
wencai he
|
59ddd41590
|
Merge branch 'dev' into 'test'
update：数据同步分发机构岗位绑定关系
See merge request jygk/dsc!9
|
2025-12-16 04:03:41 +00:00 |
|
hewencai
|
ba1bc1fb6f
|
update：数据同步分发机构岗位绑定关系
|
2025-12-16 12:03:15 +08:00 |
|
chenbowen
|
d62d06a45e
|
Merge branch 'dev' into test
|
2025-12-15 21:15:03 +08:00 |
|
chenbowen
|
df3e80d907
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-15 21:14:45 +08:00 |
|
chenbowen
|
69d3dbc61f
|
1. 新增生成自有组织 CODE，同步其他系统额外生成编码映射关系
|
2025-12-15 21:14:06 +08:00 |
|
wencai he
|
fffea61d51
|
Merge branch 'dev' into 'test'
update：数据同步统一使用枚举类
See merge request jygk/dsc!8
|
2025-12-15 12:05:35 +00:00 |
|
hewencai
|
b7ec17694d
|
update：数据同步统一使用枚举类
|
2025-12-15 20:04:43 +08:00 |
|
chenbowen
|
6fc1dface2
|
1. 测试 iwork 临时调整
|
2025-12-15 19:48:26 +08:00 |
|
chenbowen
|
b8406a907b
|
Merge branch 'dev' into test
|
2025-12-15 19:26:27 +08:00 |
|
chenbowen
|
951b9bf67d
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-15 19:26:14 +08:00 |
|
chenbowen
|
2323ee5c3b
|
1. 新增生成自有组织 CODE，同步其他系统额外生成编码映射关系
|
2025-12-15 19:25:19 +08:00 |
|
chenbowen
|
27bf25fdb0
|
Merge branch 'dev' into test
|
2025-12-14 13:53:20 +08:00 |
|
chenbowen
|
8254bb4536
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-14 13:52:57 +08:00 |
|
chenbowen
|
8d25f4224b
|
1. 临时去除掉硬性的 databus 签名校验
|
2025-12-14 13:52:14 +08:00 |
|
chenbowen
|
ec12664688
|
Merge branch 'dev' into test
|
2025-12-12 16:12:18 +08:00 |
|
chenbowen
|
5ad6886880
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-12 16:11:56 +08:00 |
|
chenbowen
|
b0838b6ae0
|
1. 新增 95 短信渠道回调接口
|
2025-12-12 16:09:22 +08:00 |
|
chenbowen
|
4d963f0f0c
|
1. 所有服务追加 dns 服务解析
|
2025-12-12 15:42:03 +08:00 |
|
chenbowen
|
ca82c9def3
|
Merge branch 'dev' into test
|
2025-12-12 14:46:15 +08:00 |
|
chenbowen
|
ce7b18997b
|
1. 修复注释移动云 mas 短信枚举导致启动失败
|
2025-12-12 14:45:53 +08:00 |
|
chenbowen
|
4fc05fc094
|
Merge branch 'dev' into test
|
2025-12-12 10:14:18 +08:00 |
|
chenbowen
|
1991863573
|
注释移动云 mas 短信相关的实现
|
2025-12-12 10:13:58 +08:00 |
|
chenbowen
|
1706a70499
|
Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
# zt-framework/zt-spring-boot-starter-test/src/main/java/com/zt/plat/framework/test/core/ut/BaseDbUnitTest.java
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/enums/SmsChannelEnum.java
|
2025-12-12 10:05:36 +08:00 |
|
chenbowen
|
cae0b9e4af
|
1. 新增 api 绑定客户凭证进行权限校验
2. 去除 api 定义的缓存策略
3. 新增短信渠道
4. 新增用户信息模糊查询
5. 修复全局的单元测试
|
2025-12-12 10:03:10 +08:00 |
|
chenbowen
|
0f10bd2289
|
Merge branch 'dev' into test
|
2025-12-09 19:13:16 +08:00 |
|
chenbowen
|
3609cb2e18
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-09 19:13:01 +08:00 |
|
chenbowen
|
99645c5ac8
|
1. 修复 iwork api 与 controller 中的 vo dto 不对应的问题
|
2025-12-09 19:12:03 +08:00 |
|
chenbowen
|
39a82b6537
|
Merge branch 'dev' into test
# Conflicts:
# zt-module-databus/zt-module-databus-server/src/main/resources/application-dev.yml
|
2025-12-09 16:25:53 +08:00 |
|
chenbowen
|
577df1c6e7
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-09 16:25:18 +08:00 |
|
chenbowen
|
29e0c7da14
|
1. 新增 api 绑定客户凭证进行权限校验
|
2025-12-09 16:24:17 +08:00 |
|