zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
904 Commits 2 Branches 0 Tags
35d42d4d7561632a8ba8d3cba8fa9bdc6a88ea32
Commit Graph

108 Commits

Author SHA1 Message Date
ranke
378a9e7bcb Merge branch 'test' into test-dsc 
* test:
  修复BUG710，添加文件下载次数统计
  修改私服地址,把 seata-dm 项目从 dsc挪过来
  feat(gateway): 添加API客户端凭证加密功能支持
  bmp 已挪到 ztcloud-dist 仓库
  修改发布信息
  增加快照仓库
  恢复 erp 模块数据权限
  从maven模块中移除 zt-server
  修改版本号
  feat:登陆用户的部门数据权限接口增加角色参数；获取当前用户可访问的顶级部门列表不校验数据权限
  no message
 2026-01-15 14:51:00 +08:00
lenovo
a44e7e835e 修复BUG710，添加文件下载次数统计 2026-01-15 14:45:43 +08:00
wuzongyong
287d24fc7f feat(gateway): 添加API客户端凭证加密功能支持 
- 在ApiClientCredentialDO实体类中新增enableEncryption字段
- 在ApiClientCredentialRespVO响应对象中添加加密启用状态字段
- 在ApiClientCredentialSaveReqVO请求对象中添加加密启用状态字段
- 在GatewaySecurityFilter中实现加密启用状态检查逻辑
- 添加数据库表结构变更脚本支持加密字段
 2026-01-14 18:11:02 +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
maimaishu
22b449f7d5 Merge branch 'test' of http://172.16.46.63:30001/gitlab/base-version/ztcloud into test 2026-01-12 11:06:07 +08:00
maimaishu
2489a7f73e [+]增加国密SM4加解密工具包 2026-01-12 11:05:28 +08:00
chenbowen
817329e509 Merge branch 'dev' into test 2026-01-07 16:51:37 +08:00
chenbowen
e338de722f Merge remote-tracking branch 'base-version/main' into dev 2026-01-07 16:51:19 +08:00
chenbowen
b3b691a7e3 1.初始化日志时并没有有效的用户信息，设置为空字符串占位 2026-01-07 16:49:47 +08:00
chenbowen
b245bed7da Merge branch 'dev' into test 2026-01-06 15:24:46 +08:00
chenbowen
b86a9a2811 Merge remote-tracking branch 'base-version/main' into dev 2026-01-06 15:24:13 +08:00
chenbowen
797cd2abd9 1. 修复 deptignore 注解会导致的空指针问题 
2. 延长 databus 默认的请求超时时间
3. 调整初始化脚本部分字段的长度
 2026-01-06 09:18:47 +08:00
chenbowen
5d547acfea Merge remote-tracking branch 'refs/remotes/base-version/test' into dev 2025-12-30 18:28:57 +08:00
ranke
5f90e7e417 Merge branch 'test' into test-dsc 
* test:
  新增根据流程管控按钮是否可用配置功能. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=551
  1. 补全基准的菜单 sql 语句
 2025-12-30 18:18:18 +08:00
ranke
b81e8c6df2 新增根据流程管控按钮是否可用配置功能. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=551 2025-12-30 18:07:58 +08:00
chenbowen
580d1d9047 1. 补全基准的菜单 sql 语句 2025-12-29 11:13:29 +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
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
chenbowen
2a16656b7d Merge branch 'dev' into test 2025-12-22 13:47:37 +08:00
chenbowen
2efa78ed74 Merge remote-tracking branch 'base-version/main' into dev 2025-12-22 13:47:15 +08:00
chenbowen
633772f8b1 1. 修正初始化 sql 简化内容 2025-12-18 14:46:12 +08:00
chenbowen
b96d40b8d1 Merge branch 'dev' into test 2025-12-18 13:21:54 +08:00
chenbowen
c86a765b73 Merge remote-tracking branch 'base-version/main' into dev 2025-12-18 13:21:03 +08:00
chenbowen
870c6a5f88 1. 统一 iwork 的同步组织代码生成逻辑 2025-12-18 13:19:39 +08:00
chenbowen
660e0cf401 Merge branch 'dev' into test 2025-12-17 20:18:58 +08:00
chenbowen
9bc519aa0d Merge remote-tracking branch 'base-version/main' into dev 2025-12-17 20:18:42 +08:00
chenbowen
4082e61874 1. 调整初始化脚本 2025-12-17 20:18:13 +08:00
chenbowen
4fc05fc094 Merge branch 'dev' into test 2025-12-12 10:14:18 +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
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
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
f4211f0011 新增公司部门切换菜单权限 2025-12-05 11:52:58 +08:00
chenbowen
97abbd1db2 Merge branch 'dev' into test 2025-12-02 15:11:41 +08:00
chenbowen
4f95272ca8 Merge remote-tracking branch 'base-version/main' into dev 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
 2025-12-02 15:10:24 +08:00
chenbowen
ee9bc438b5 1. 剔除外域 url 2025-12-02 14:10:47 +08:00
chenbowen
ecf1b5f1e7 Merge branch 'dev' into test 2025-12-02 11:16:57 +08:00
chenbowen
e2c3702ae5 Merge remote-tracking branch 'base-version/main' into dev 2025-12-02 11:16:34 +08:00
chenbowen
a689a3ffe4 1. 修复用户信息未同步人力资源编号的问题 2025-12-02 11:13:33 +08:00
chenbowen
fc0428e7b5 Merge branch 'dev' into test 2025-12-01 10:21:55 +08:00
chenbowen
7fae3203bc Merge remote-tracking branch 'base-version/main' into dev 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	zt-module-infra/zt-module-infra-api/src/main/java/com/zt/plat/module/infra/api/websocket/WebSocketSenderApi.java
#	zt-module-infra/zt-module-infra-server/src/main/resources/application-dev.yaml
 2025-12-01 10:21:34 +08:00
chenbowen
0c22975df0 1. 剔除掉多余的文档以及标记 2025-11-28 18:12:00 +08:00
chenbowen
837e09941a Merge branch 'dev' into test 2025-11-26 20:14:04 +08:00