FCL
|
c0794fb12e
|
Merge branch 'refs/heads/zt-test' into test
|
2026-01-29 10:21:46 +08:00 |
|
|
|
d46b2a3691
|
打包脚本迁移
|
2026-01-26 10:55:01 +08:00 |
|
朝锦 杨
|
22b87fdabf
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc!23
|
2026-01-23 09:59:01 +00:00 |
|
qianshijiang
|
d6ef89b70d
|
优化
|
2026-01-23 15:52:53 +08:00 |
|
chenbowen
|
3b099925b6
|
Merge remote-tracking branch 'base-version/test' into dev
|
2026-01-17 10:36:51 +08:00 |
|
ranke
|
7541cb4d6f
|
Merge branch 'test' into test-dsc
* test:
取消sql的日志输出
授权菜单权限可选不展示菜单选项. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=707
1. 调整 username 同步逻辑 2. 调整 eban 回调登录逻辑
|
2026-01-16 16:18:53 +08:00 |
|
ranke
|
00cdf5bc0c
|
取消sql的日志输出
|
2026-01-16 16:18:27 +08:00 |
|
ranke
|
c71ac5dbd3
|
授权菜单权限可选不展示菜单选项. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=707
|
2026-01-16 16:17:52 +08:00 |
|
lenovo
|
ec99f49c93
|
Merge remote-tracking branch 'refs/remotes/ztcloud/test' into dev
|
2026-01-15 16:26:57 +08:00 |
|
ranke
|
09c5c5fde5
|
Merge branch 'test' into test-dsc
* test:
修改docker配置
|
2026-01-15 15:54:32 +08:00 |
|
ranke
|
8a7c74bfb5
|
修改docker配置
|
2026-01-15 15:54:18 +08:00 |
|
chenbowen
|
479d6c6c2a
|
Merge remote-tracking branch 'base-version/test' into dev
# Conflicts:
# zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/util/security/CryptoSignatureUtils.java
# zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusDeptProviderApiImpl.java
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/sms/SmsCallbackController.java
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/enums/SmsChannelEnum.java
|
2026-01-13 11:00:28 +08:00 |
|
ranke
|
a0673022fa
|
Merge branch 'test' into test-dsc
* test:
把-server项目改为jar包,新增 server-app项目作为启动器 http://172.16.46.63:31560/index.php?m=task&f=view&taskID=699
[+]增加国密SM4加解密工具包
fix(user-dept): 修改用户来源筛选条件
fix(databus): 修复部门数据查询中缺少数据源过滤条件
fix(databus): 修改用户同步的数据源过滤条件
fix(databus): 修改用户同步的数据源过滤条件
[+]增加国密SM4接口加解密
[#]修改部门推送消息逻辑
# Conflicts:
# zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/util/security/CryptoSignatureUtils.java
# zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusDeptProviderApiImpl.java
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/sms/SmsCallbackController.java
# zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/enums/SmsChannelEnum.java
|
2026-01-12 18:49:36 +08:00 |
|
ranke
|
6644710fe0
|
把-server项目改为jar包,新增 server-app项目作为启动器 http://172.16.46.63:31560/index.php?m=task&f=view&taskID=699
|
2026-01-12 18:36:39 +08:00 |
|
