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 |
|
chenbowen
|
d8b2c4d7b1
|
Merge branch 'dev' into test
|
2025-12-08 19:01:17 +08:00 |
|
chenbowen
|
7a1cbabcad
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-08 19:00:52 +08:00 |
|
chenbowen
|
91c0cbc5d7
|
1. 新增 OA Token 获取与校验接口，更新相关配置
2. 设置组织可以设置为顶层组织
|
2025-12-08 18:56:06 +08:00 |
|
chenbowen
|
30b5db0617
|
发布时，网关不在同步进行发布
|
2025-12-08 09:34:46 +08:00 |
|
chenbowen
|
efd1e8a19e
|
Merge branch 'dev' into test
|
2025-12-08 09:17:24 +08:00 |
|
chenbowen
|
d053d1396a
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-08 09:17:11 +08:00 |
|
chenbowen
|
8ea3757105
|
定时调度请求 databus 的时间调整为 25 分钟一次
|
2025-12-08 09:16:31 +08:00 |
|
chenbowen
|
7bef916e95
|
Merge branch 'dev' into test
|
2025-12-05 18:18:21 +08:00 |
|
chenbowen
|
35bb96b701
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-05 18:18:06 +08:00 |
|
chenbowen
|
66a43c74f2
|
1. 精简 iwork 相关的集成配置与接口
|
2025-12-05 18:16:23 +08:00 |
|
chenbowen
|
7d8e4f2e67
|
Merge branch 'dev' into test
|
2025-12-05 18:13:19 +08:00 |
|
chenbowen
|
89ceac450e
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-05 18:12:54 +08:00 |
|
hewencai
|
8b7e7da6c2
|
update：增加门户管理允许匿名访问
|
2025-12-05 18:12:13 +08:00 |
|
wencai he
|
1c17c6539b
|
Merge branch 'dev' into 'test'
update：增加门户管理允许匿名访问
See merge request jygk/dsc!7
|
2025-12-05 07:48:18 +00:00 |
|
hewencai
|
2715799922
|
update：增加门户管理允许匿名访问
|
2025-12-05 15:46:38 +08:00 |
|
chenbowen
|
d1a85c7653
|
新增定时调度携带具体 IP
|
2025-12-05 15:33:29 +08:00 |
|
wencai he
|
ee7b974c1a
|
Merge branch 'dev' into 'test'
update：增加门户管理允许匿名访问
See merge request jygk/dsc!6
|
2025-12-05 07:25:06 +00:00 |
|
hewencai
|
9199e6e5aa
|
update：增加门户管理允许匿名访问
(cherry picked from commit ba737a6a28)
|
2025-12-05 15:23:10 +08:00 |
|
hewencai
|
ba737a6a28
|
update：增加门户管理允许匿名访问
|
2025-12-05 15:19:40 +08:00 |
|
hewencai
|
774734033c
|
Merge remote-tracking branch 'ztcloud/main' into main-ztcloud
|
2025-12-05 12:20:54 +08:00 |
|
hewencai
|
b11ffb4782
|
修改门户管理图片显示逻辑
|
2025-12-05 12:20:25 +08:00 |
|
hewencai
|
5e24c5a509
|
feat:新增门户管理功能
|
2025-12-05 12:20:24 +08:00 |
|
hewencai
|
427c0bd6b1
|
add:增加seata和doc4j依赖
|
2025-12-05 12:20:21 +08:00 |
|
chenbowen
|
5915f652ed
|
Merge branch 'dev' into test
|
2025-12-05 11:54:06 +08:00 |
|
chenbowen
|
5ce3724798
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-05 11:53:50 +08:00 |
|
chenbowen
|
d2e4c593c8
|
新增公司部门切换菜单权限
|
2025-12-05 11:53:11 +08:00 |
|
chenbowen
|
f4211f0011
|
新增公司部门切换菜单权限
|
2025-12-05 11:52:58 +08:00 |
|
chenbowen
|
b368a4e6d5
|
Merge branch 'dev' into test
|
2025-12-05 09:05:08 +08:00 |
|
chenbowen
|
a361dbaaba
|
Merge remote-tracking branch 'base-version/main' into dev
|
2025-12-05 09:04:46 +08:00 |
|
chenbowen
|
52a0109960
|
临时关闭签名校验
|
2025-12-05 09:04:02 +08:00 |
|
chenbowen
|
4f8a2f2e2d
|
Merge branch 'dev' into test
|
2025-12-04 19:24:06 +08:00 |
|