zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,077 Commits 2 Branches 0 Tags
8ce0a520464735cec5e54f0dd1c10929585f2e95
Commit Graph

96 Commits

Author SHA1 Message Date
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
yangchaojin
b689dd7741 Merge remote-tracking branch 'ztcloud/test' into dev 
# Conflicts:
#	zt-framework/zt-spring-boot-starter-biz-data-permission/src/main/java/com/zt/plat/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java
 2026-02-02 16:34:03 +08:00
yangchaojin
8a27141edc 添加前端加密文件预览支持 2026-02-02 16:00:07 +08:00
yangchaojin
ee4645dce3 Merge remote-tracking branch 'ztcloud/test' into dev 2026-01-29 17:27:14 +08:00
yangchaojin
4da9bd6cc5 修复kkfile预览加密文件问题、修改文件下载验证码发送模板 2026-01-29 17:26:35 +08:00
yangchaojin
c852d9f111 Merge remote-tracking branch 'ztcloud/test' into dev 2026-01-29 15:38:43 +08:00
yangchaojin
cabd6e3297 修复测试环境多级代理路劲拼接问题 2026-01-29 15:38:07 +08:00
yangchaojin
e2a3280b70 Merge remote-tracking branch 'ztcloud/test' into dev 2026-01-29 15:09:44 +08:00
yangchaojin
9f622d460f 添加测试环境调试信息 2026-01-29 15:08:08 +08:00
yangchaojin
b2d29a1423 Merge remote-tracking branch 'ztcloud/test' into dev 2026-01-29 10:43:20 +08:00
yangchaojin
58df702cef 日志输出预览地址 2026-01-29 10:42:37 +08:00
FCL
c0794fb12e Merge branch 'refs/heads/zt-test' into test 2026-01-29 10:21:46 +08:00
yangchaojin
039c143891 Merge remote-tracking branch 'ztcloud/test' into dev 2026-01-29 08:37:26 +08:00
yangchaojin
65ae5e99c7 恢复默认参数 2026-01-29 08:36:23 +08:00
yangchaojin
d6eb1962ca Merge remote-tracking branch 'ztcloud/test' into dev 2026-01-28 19:00:36 +08:00
yangchaojin
1fa8296385 新增文件可下载标识、加密短信验证支持等 2026-01-28 18:57:50 +08:00
wxr
d46b2a3691 打包脚本迁移 2026-01-26 10:55:01 +08:00
yangchaojin
6919fc3e7f Merge remote-tracking branch 'ztcloud/test' into dev 2026-01-20 14:22:25 +08:00
yangchaojin
a5d3afaf9b BUG710，添加文件下载次数统计 2026-01-20 14:19:12 +08:00
FCL
c333395b6c Merge branch 'refs/heads/zt-test' into test 
# Conflicts:
#	zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/biz/system/permission/PermissionCommonApi.java
#	zt-framework/zt-spring-boot-starter-biz-tenant/src/main/java/com/zt/plat/framework/tenant/core/context/DeptContextHolder.java
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/PermissionServiceImpl.java
 2026-01-19 10:59:08 +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
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
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
chenbowen
cf540e12be Merge remote-tracking branch 'base-version/test' into dev 2026-01-09 13:56:51 +08:00
FCL
d3eafc259b Merge branch 'refs/heads/zt-test' into test 2026-01-09 11:05:00 +08:00
wuzongyong
caf524d4e4 Merge jygk/dsc/test into local test, re-implement file presigned URL cache 2026-01-08 10:02:01 +08:00
wuzongyong
2d2b62ed9f Revert "feat(file): 为S3文件客户端添加预签名URL缓存功能" 
This reverts commit 2b6f4df326.
 2026-01-08 09:49:34 +08:00
wuzongyong
2b6f4df326 feat(file): 为S3文件客户端添加预签名URL缓存功能 
- 引入RedisTemplate依赖用于缓存预签名URL
- 添加Redis缓存配置，设置缓存前缀和50分钟过期时间
- 实现预签名URL的缓存读取和存储逻辑
- 添加延迟加载RedisTemplate的方法避免循环依赖
- 在文件删除时同步清除对应的缓存项
- 优化预签名URL生成流程，优先从缓存获取
 2026-01-08 09:36:16 +08:00
wuzongyong
b2c2cca798 feat(file): 为S3文件客户端添加预签名URL缓存功能 
- 引入RedisTemplate依赖用于缓存预签名URL
- 添加Redis缓存配置，设置缓存前缀和50分钟过期时间
- 实现预签名URL的缓存读取和存储逻辑
- 添加延迟加载RedisTemplate的方法避免循环依赖
- 在文件删除时同步清除对应的缓存项
- 优化预签名URL生成流程，优先从缓存获取
 2026-01-08 09:16:44 +08:00
FCL
e4c8d308f3 Merge branch 'refs/heads/zt-test' into test 2026-01-07 11:19:40 +08:00
FCL
0072234893 Merge branch 'refs/heads/zt-test' into test 
# Conflicts:
#	zt-module-infra/zt-module-infra-server/src/main/resources/application.yaml
 2026-01-04 15:19:35 +08:00
qianshijiang
b155b1a00a 数据库配置修改 2025-12-31 16:36:01 +08:00
chenbowen
4d4912db5e Revert "1. 临时切换集群配合测试" 
This reverts commit 3c3ac23008.
 2025-12-27 13:12:22 +08:00
chenbowen
3c3ac23008 1. 临时切换集群配合测试 2025-12-27 12:48:56 +08:00
chenbowen
ab3104cff7 Merge remote-tracking branch 'base-version/main' into dev 2025-12-24 14:30:39 +08:00
chenbowen
89a047d28b 1. 提升 infra 可以上传的附件大小 2025-12-24 14:30:03 +08:00
FCL
def2956dae Merge remote-tracking branch 'origin/test' into test 2025-12-24 14:07:02 +08:00
wxr
6125fa04d8 镜像打包批处理脚本 2025-12-24 14:06:48 +08:00
FCL
b9f5a99184 fix:修改附件上传大小限制 2025-12-24 14:02:09 +08:00
chenbowen
815c595944 Merge remote-tracking branch 'base-version/main' into dev 2025-12-23 10:18:39 +08:00
chenbowen
02208869f0 1. 移除二维码默认示例查询方式 2025-12-22 14:15:22 +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
ea569a66ab Merge remote-tracking branch 'base-version/main' into dev 2025-12-04 09:42:29 +08:00