Commit Graph

594 Commits

Author SHA1 Message Date
chenbowen
b7f07ba8da Merge remote-tracking branch 'base-version/main' into dev 2025-11-07 12:45:49 +08:00
chenbowen
3c19722cbd 1. 调整附件临时 url 过期时间为 24 小时 2025-11-07 12:37:49 +08:00
chenbowen
5037c741a9 Merge branch 'dev' into test 2025-11-06 23:10:34 +08:00
chenbowen
b8b8495dfe Merge remote-tracking branch 'base-version/main' into dev 2025-11-06 23:10:12 +08:00
chenbowen
f25ee5091e 1. 调整 databus api 策略,添加每次重试新建请求的逻辑 2025-11-06 23:08:55 +08:00
chenbowen
5fb15c31ed 1. 调整 pod 资源限制 2025-11-06 18:33:25 +08:00
chenbowen
07e000ae33 Merge branch 'dev' into test
# Conflicts:
#	deployment.yaml
2025-11-06 01:09:56 +08:00
chenbowen
c1ea3c6754 1. 调整 pod 资源限制 2025-11-06 01:09:31 +08:00
chenbowen
4197bbfbf8 Merge branch 'dev' into test 2025-11-06 00:50:12 +08:00
chenbowen
a9efa1d84a 1. 新增业务系统日志收集 2025-11-06 00:49:53 +08:00
chenbowen
c67debb9cf Merge branch 'dev' into test 2025-11-06 00:42:15 +08:00
chenbowen
f64b76e703 1. 新增业务系统日志收集 2025-11-06 00:41:57 +08:00
chenbowen
3025c56495 Merge branch 'dev' into test 2025-11-06 00:38:04 +08:00
chenbowen
2a0e0da08a 1. 新增业务系统日志收集 2025-11-06 00:37:48 +08:00
chenbowen
309a3f352b Merge branch 'dev' into test 2025-11-06 00:28:45 +08:00
chenbowen
00297f65b4 1. 新增业务系统日志收集 2025-11-06 00:28:14 +08:00
chenbowen
270132b7c1 1. 组织物料状态字段补充
2. template 模块不再参与编译
2025-11-05 17:20:00 +08:00
chenbowen
b17126485c Merge branch 'dev' into test 2025-11-05 16:33:37 +08:00
chenbowen
e98615c896 Merge remote-tracking branch 'base-version/main' into dev 2025-11-05 16:32:45 +08:00
chenbowen
ec473a00d4 1. 升级 skywalking 对应依赖版本
2. 整合 eban 相关配置,新增登出时同步全局失效 eban token 接口
2025-11-05 16:29:40 +08:00
chenbowen
60d6446287 Merge branch 'dev' into test 2025-11-04 18:50:01 +08:00
chenbowen
79add68d87 Merge remote-tracking branch 'base-version/main' into dev 2025-11-04 18:49:42 +08:00
chenbowen
811270a4c5 1. 提高 databus api 的网络失败重试次数,避免复用旧链接导致的 connection reset 错误
2. 兼容顶级组织同步时的组织编码生成逻辑
2025-11-04 14:43:53 +08:00
chenbowen
0b27f9ba0b Merge branch 'dev' into test 2025-11-03 14:21:51 +08:00
chenbowen
e6fe57533e Merge remote-tracking branch 'base-version/main' into dev 2025-11-03 14:21:25 +08:00
chenbowen
b98f605dfd 1. 优化 bpm 流程中所有关于用户选择,部门选择的组件
2. 优化 api 调试提示,优化 api 调用因为链接复用导致的链接被拒绝问题
3. 新增字典数据导入功能
2025-11-03 14:20:13 +08:00
chenbowen
42f61158c6 1. 补全工艺工序页面菜单权限 2025-10-31 09:49:29 +08:00
chenbowen
46e38c4ca3 Merge branch 'dev' into test 2025-10-31 09:30:15 +08:00
chenbowen
005e119ffb Merge remote-tracking branch 'base-version/main' into dev 2025-10-31 09:29:56 +08:00
chenbowen
ddee4da72a 1. 新增 api 调用日志记录,历史版本回滚
2. 新增用户角色权限监督功能
2025-10-31 09:28:59 +08:00
chenbowen
0c9b62209e Merge branch 'dev' into test 2025-10-30 11:17:32 +08:00
chenbowen
da89f15296 Merge remote-tracking branch 'base-version/main' into dev 2025-10-30 11:16:56 +08:00
chenbowen
b618f833d1 新增 base64 编码上传附件接口 2025-10-30 11:15:38 +08:00
qianshijiang
c05fd40a06 添加异步任务工具类 2025-10-29 17:29:23 +08:00
qianshijiang
6f62c54f7a 添加异步任务工具类 2025-10-29 16:42:06 +08:00
chenbowen
93186db1f8 Merge branch 'dev' into test 2025-10-29 09:01:32 +08:00
chenbowen
529f328dd7 Merge remote-tracking branch 'base-version/main' into dev 2025-10-29 09:00:57 +08:00
chenbowen
744567d999 新增组织查询调整 ids 2025-10-29 08:51:35 +08:00
chenbowen
10e2637838 1. 修复编译错误 2025-10-28 19:05:09 +08:00
chenbowen
213b854d66 1. 新增 e 办同步信息日志菜单 2025-10-28 18:07:27 +08:00
chenbowen
04597fad6c 1. 统一网关未命中缓存时,进行兜底查询
2. loginUser 新增 mobile username 作为 userInfo 扩展内容
2025-10-28 17:32:42 +08:00
chenbowen
558092238f Merge branch 'dev' into test 2025-10-28 14:53:57 +08:00
chenbowen
02d1896ebf 1. 升级版本
2. 修复因合并版本错误导致的代码生成器 bug
2025-10-28 14:53:41 +08:00
chenbowen
520e3e47f4 Merge branch 'dev' into test 2025-10-27 19:18:25 +08:00
chenbowen
ba85f45a05 Merge remote-tracking branch 'base-version/main' into dev 2025-10-27 19:18:07 +08:00
chenbowen
7aae0d0670 临时去除统一 api 签名校验 2025-10-27 19:17:20 +08:00
chenbowen
6bb331d883 Merge branch 'dev' into test 2025-10-27 10:01:35 +08:00
chenbowen
e8e6022ccd Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java
2025-10-27 10:01:15 +08:00
chenbowen
4346299a03 1. 修复非永久地址的改动导致无法正常获取用户头像的 bug
2. 修复代码生成器执行同步时,没有依据导入进行简写匹配转化
2025-10-27 09:55:15 +08:00
chenbowen
384a6e3b07 Merge branch 'dev' into test 2025-10-24 17:05:37 +08:00