FCL
|
8ce0a52046
|
Merge branch 'refs/heads/zt-test' into test
|
2026-02-04 11:25:07 +08:00 |
|
ranke
|
4d997d9b86
|
清理与ztcloud中重复的代码,改为 jar 包方式引用 ztcloud
|
2026-02-03 15:23:43 +08:00 |
|
|
|
d46b2a3691
|
打包脚本迁移
|
2026-01-26 10:55:01 +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 |
|
