Compare commits

...

197 Commits

Author SHA1 Message Date
chenbowen
7f7c4210ac Merge branch 'dev' into test 2025-11-28 14:01:14 +08:00
chenbowen
db3afb5b64 Merge remote-tracking branch 'base-version/main' into dev 2025-11-28 11:07:42 +08:00
chenbowen
542466270a 1. 修复自定义 sql 中大写表名无法匹配到 mybatis 中的缓存表信息,导致表被忽略租户的问题
2. 新增 iwork feign api 调用
2025-11-28 11:05:09 +08:00
chenbowen
03ebe21670 1. 清理 iwork 无用的接口。
2. 整合 iwork 用户的密码管理策略。
2025-11-27 20:25:02 +08:00
chenbowen
64d0d4e55e 1. iwork 统一用印发起接口 2025-11-27 20:19:27 +08:00
chenbowen
22599bbc65 Merge branch 'dev' into test 2025-11-27 16:46:27 +08:00
chenbowen
240a531ee1 Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/src/main/java/liquibase/database/core/DmDatabase.java
2025-11-27 16:35:49 +08:00
chenbowen
00b2f6312d 修复 flowable 无法通过 dm 数据库驱动正常获取 schema 的bug 2025-11-27 16:01:05 +08:00
chenbowen
446b5ca7a4 剔除掉 swagger 不能请求的 rpc-api 2025-11-27 13:48:55 +08:00
chenbowen
28a49ce45a 修复 dm jdbc 不兼容 flowable 转义 sql 的错误 2025-11-27 13:26:30 +08:00
chenbowen
4bd0402dde 禁止事件引擎重复自动建表 2025-11-27 11:16:49 +08:00
chenbowen
0ab550123f 关闭 databus web 请求连接池 2025-11-27 10:27:30 +08:00
chenbowen
cd21239ff2 flowable 达梦迁移 2025-11-27 09:58:44 +08:00
chenbowen
837e09941a Merge branch 'dev' into test 2025-11-26 20:14:04 +08:00
chenbowen
256bf22a10 Merge remote-tracking branch 'base-version/main' into dev 2025-11-26 20:12:46 +08:00
chenbowen
76eabb6db0 修复 system 模块编译错误 2025-11-26 20:12:07 +08:00
chenbowen
06909fafea 当前登录用户新增公司编码与部门编码属性 2025-11-26 20:01:34 +08:00
qianshijiang
00956030a4 错误信息未记录到日志文件 2025-11-26 15:52:00 +08:00
chenbowen
2dac28d3b3 Merge branch 'dev' into test 2025-11-26 13:46:23 +08:00
chenbowen
dbb1d1905e Merge remote-tracking branch 'base-version/main' into dev 2025-11-26 13:46:02 +08:00
chenbowen
08232eb3cb iwork 人员组织同步相关 2025-11-26 13:45:06 +08:00
chenbowen
5de2801fc9 Merge branch 'dev' into test 2025-11-26 12:40:05 +08:00
chenbowen
e9994a24c2 Merge remote-tracking branch 'base-version/main' into dev 2025-11-26 12:39:44 +08:00
chenbowen
a10732119b iwork 人员组织同步相关 2025-11-26 12:38:38 +08:00
qianshijiang
e7efddf976 配置mybais-plus打印sql 2025-11-26 11:57:17 +08:00
chenbowen
13ec805c20 Merge branch 'dev' into test 2025-11-26 11:34:59 +08:00
chenbowen
61e61d08b6 Merge remote-tracking branch 'base-version/main' into dev 2025-11-26 11:34:41 +08:00
chenbowen
5698c34185 iwork 人员组织同步相关 2025-11-26 11:34:04 +08:00
qianshijiang
96058e29c2 Merge remote-tracking branch 'origin/dev' into dev 2025-11-26 10:44:28 +08:00
qianshijiang
27d22de4e0 日志配置修改 2025-11-26 10:44:13 +08:00
chenbowen
f1242e74fc Merge branch 'dev' into test 2025-11-26 10:43:25 +08:00
chenbowen
0c0d82f465 Merge remote-tracking branch 'base-version/main' into dev 2025-11-26 10:43:04 +08:00
chenbowen
12ba2cf756 iwork 人员组织同步相关 2025-11-26 10:42:24 +08:00
qianshijiang
b1bd193f50 nacos配置。 2025-11-26 08:57:00 +08:00
chenbowen
0b4b87845c Merge branch 'dev' into test 2025-11-26 01:48:49 +08:00
chenbowen
a2f2325119 Merge remote-tracking branch 'base-version/main' into dev 2025-11-26 01:48:31 +08:00
chenbowen
4c79ac8a6d iwork 人员组织同步相关 2025-11-26 01:48:10 +08:00
chenbowen
0c0cb27c15 Merge branch 'dev' into test 2025-11-26 01:35:09 +08:00
chenbowen
a263632e49 Merge remote-tracking branch 'base-version/main' into dev 2025-11-26 01:34:50 +08:00
chenbowen
2e2b7ac6fa iwork 人员组织同步相关 2025-11-26 01:34:08 +08:00
chenbowen
9730573546 Merge branch 'dev' into test 2025-11-26 01:06:13 +08:00
chenbowen
299132943c Merge remote-tracking branch 'base-version/main' into dev 2025-11-26 01:05:55 +08:00
chenbowen
76ba994b50 iwork 人员组织同步相关 2025-11-26 01:04:35 +08:00
chenbowen
dd284728b4 Merge branch 'dev' into test 2025-11-25 23:27:22 +08:00
chenbowen
685ed6b504 Merge remote-tracking branch 'base-version/main' into dev 2025-11-25 23:27:01 +08:00
chenbowen
f754b1c694 iwork 人员组织同步相关 2025-11-25 23:26:26 +08:00
chenbowen
dc1db47d07 iwork 人员组织同步相关 2025-11-25 20:31:56 +08:00
chenbowen
dd38e65972 Merge branch 'dev' into test 2025-11-25 20:09:31 +08:00
chenbowen
02e0c81446 Merge remote-tracking branch 'base-version/main' into dev 2025-11-25 20:09:06 +08:00
chenbowen
6c8c479984 同步 nacos 配置到基础系统 2025-11-25 20:08:31 +08:00
chenbowen
829229a355 Merge branch 'dev' into test 2025-11-25 19:15:29 +08:00
chenbowen
067f7226f4 Merge remote-tracking branch 'base-version/main' into dev 2025-11-25 19:14:59 +08:00
chenbowen
b35df8493c 同步 nacos 配置到基础系统 2025-11-25 19:13:27 +08:00
hewencai
518aa2a773 Merge remote-tracking branch 'origin/dev' into dev 2025-11-25 19:09:13 +08:00
hewencai
4003388740 feat:集成移动云mas短信平台 2025-11-25 19:08:55 +08:00
chenbowen
f16509c107 Merge branch 'dev' into test 2025-11-25 18:58:07 +08:00
chenbowen
565a625df7 Merge remote-tracking branch 'base-version/main' into dev 2025-11-25 18:57:47 +08:00
chenbowen
adcea87bbf 同步 nacos 配置到基础系统 2025-11-25 18:56:12 +08:00
chenbowen
a79806690d Merge branch 'dev' into test 2025-11-25 17:43:28 +08:00
chenbowen
8689c5e844 Merge remote-tracking branch 'base-version/main' into dev 2025-11-25 17:42:26 +08:00
chenbowen
5be1b75be8 iwork 人员组织同步相关,兼容 iwork 返回 2025-11-25 17:41:39 +08:00
chenbowen
06d9ae2688 Merge branch 'dev' into test 2025-11-25 17:22:53 +08:00
chenbowen
547b1d9afb Merge remote-tracking branch 'base-version/main' into dev 2025-11-25 17:22:36 +08:00
chenbowen
2f9c28f166 iwork 人员组织同步相关,兼容 iwork 返回 2025-11-25 17:22:11 +08:00
chenbowen
9a0e60ad84 Merge branch 'dev' into test 2025-11-25 17:19:06 +08:00
chenbowen
c24ae5bad8 Merge remote-tracking branch 'base-version/main' into dev 2025-11-25 17:18:43 +08:00
chenbowen
64eb031486 iwork 人员组织同步相关,兼容 iwork 返回 2025-11-25 17:18:04 +08:00
chenbowen
30b22698e8 Merge branch 'dev' into test 2025-11-25 16:50:11 +08:00
chenbowen
95fab27556 Merge remote-tracking branch 'base-version/main' into dev 2025-11-25 16:49:43 +08:00
chenbowen
2efb815d59 iwork 人员组织同步相关,兼容 iwork 返回 2025-11-25 16:41:29 +08:00
chenbowen
3d5f07b7a5 Merge branch 'dev' into test 2025-11-25 16:08:41 +08:00
chenbowen
77b4e62def Merge remote-tracking branch 'base-version/main' into dev 2025-11-25 16:06:41 +08:00
chenbowen
e2dbaf12a4 iwork 人员组织同步相关 2025-11-25 16:05:52 +08:00
chenbowen
f8d95218f5 Merge branch 'dev' into test 2025-11-25 15:55:44 +08:00
chenbowen
e0d5c0221e Merge remote-tracking branch 'base-version/main' into dev 2025-11-25 15:55:13 +08:00
chenbowen
59afa893b0 修复编译错误 2025-11-25 15:54:50 +08:00
chenbowen
d4d80ce86a iwork 人员组织同步相关 2025-11-25 15:48:47 +08:00
chenbowen
70868a77c0 Merge branch 'dev' into test 2025-11-25 09:15:54 +08:00
chenbowen
eab968da72 Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
#	pom.xml
2025-11-25 09:15:32 +08:00
chenbowen
e212ba4d2f 升级版本 2025-11-25 09:14:36 +08:00
chenbowen
4ddd38c3b6 1. 升级 3.0.45 2025-11-24 19:45:47 +08:00
chenbowen
54f763c15e Merge branch 'dev' into test 2025-11-24 19:35:37 +08:00
chenbowen
65f62fddd6 Merge remote-tracking branch 'base-version/main' into dev 2025-11-24 19:19:09 +08:00
chenbowen
65b99740c1 新增 long 集合类型的 string 转换 2025-11-24 19:18:23 +08:00
chenbowen
f7ee073617 Merge branch 'dev' into test 2025-11-24 15:54:06 +08:00
chenbowen
4b17c1d833 Merge remote-tracking branch 'base-version/main' into dev 2025-11-24 15:53:49 +08:00
chenbowen
77c46acf9e 1. 修改请求 iwork 的传参方式 2025-11-24 15:51:45 +08:00
qianshijiang
3d3808be48 编译报错修改。 2025-11-24 09:52:28 +08:00
qianshijiang
6b266e3211 编译报错修改。 2025-11-24 09:49:44 +08:00
chenbowen
491f8c8b1f Merge branch 'dev' into test 2025-11-21 18:30:32 +08:00
chenbowen
e57f649e72 Merge remote-tracking branch 'base-version/main' into dev 2025-11-21 18:30:15 +08:00
chenbowen
ce39dc6d4b 1. iwork 二次适配 2025-11-21 18:20:11 +08:00
chenbowen
8dd7ccaf5f Merge branch 'dev' into test 2025-11-21 17:25:09 +08:00
chenbowen
14c81350bd Merge remote-tracking branch 'base-version/main' into dev 2025-11-21 17:24:41 +08:00
chenbowen
7e3baeba46 修复 nacos 刷新配置后,ignoreurl 失效的bug 2025-11-21 17:23:36 +08:00
chenbowen
4106cfced2 Merge branch 'dev' into test
# Conflicts:
#	zt-dependencies/pom.xml
2025-11-20 18:36:13 +08:00
chenbowen
985b429f6f Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
#	zt-dependencies/pom.xml
2025-11-20 18:35:03 +08:00
chenbowen
0b646295da 1. 新增 iwork 同步用户组织信息接口
2. 修复错误设置版本信息在 zt-dependencies 的 bug
2025-11-20 18:27:01 +08:00
qianshijiang
5374b0567b 封装树形数据操作工具类 2025-11-20 15:09:08 +08:00
qianshijiang
47f710648b 新增业务附件查询权限标识 2025-11-20 10:25:57 +08:00
chenbowen
4c9b1c616e Merge branch 'dev' into test 2025-11-18 19:03:09 +08:00
chenbowen
88fb1652e6 Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
#	zt-dependencies/pom.xml
#	zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/sso/ExternalSsoServiceImpl.java
2025-11-18 18:51:57 +08:00
chenbowen
52a0b561f9 1. 新增针对外部的自定义 sso 菜单外链 2025-11-18 18:47:50 +08:00
chenbowen
74d2a1a236 1. 升级 3.0.44 2025-11-18 14:13:47 +08:00
chenbowen
585dd3449f Merge branch 'dev' into test 2025-11-18 11:39:28 +08:00
chenbowen
8dc3e81d4f 1. 升级 3.0.44 2025-11-18 11:39:01 +08:00
chenbowen
6b3453e4ee Merge branch 'dev' into test 2025-11-18 10:59:55 +08:00
chenbowen
633e430f46 1. 新增分页接口聚合查询注解支持
2. 优化 databus api 日志记录的字段缺失问题
3. 新增 eplat sso 页面登录校验
4. 用户、部门编辑新增 seata 事务支持
5. 新增 iwork 流程发起接口
6. 新增 eban 同步用户时的岗位处理逻辑
7. 新增无 skywalking 时的 traceId 支持
2025-11-18 10:59:29 +08:00
qianshijiang
8b3d93dc17 新增业务附件查询权限标识 2025-11-18 10:57:42 +08:00
chenbowen
266eb45e00 1. 新增分页接口聚合查询注解支持
2. 优化 databus api 日志记录的字段缺失问题
3. 新增 eplat sso 页面登录校验
4. 用户、部门编辑新增 seata 事务支持
5. 新增 iwork 流程发起接口
6. 新增 eban 同步用户时的岗位处理逻辑
7. 新增无 skywalking 时的 traceId 支持
2025-11-18 10:03:34 +08:00
qianshijiang
c4482af144 新增业务附件查询权限标识 2025-11-17 18:01:00 +08:00
chenbowen
d5a1e5c157 Merge branch 'dev' into test 2025-11-13 21:41:13 +08:00
chenbowen
53a0293b7c Merge remote-tracking branch 'base-version/main' into dev 2025-11-13 21:40:08 +08:00
chenbowen
af7f103a38 调整后台返回部门id与公司id类型为 string 2025-11-13 21:39:27 +08:00
chenbowen
2280d29fb6 调整后台返回部门id与公司id类型为 string 2025-11-13 21:16:08 +08:00
chenbowen
71e63519ae 调整后台返回部门id与公司id类型为 string 2025-11-13 21:10:38 +08:00
chenbowen
c8dca75943 Merge branch 'dev' into test 2025-11-13 18:45:33 +08:00
chenbowen
2eb09ff35d Merge remote-tracking branch 'base-version/main' into dev 2025-11-13 18:45:11 +08:00
chenbowen
c1f12dfe5e 1. 修复 userinfo 过多导致的用户登录失败错误 2025-11-13 18:44:28 +08:00
wencai he
428c9a60b1 Merge branch 'dev' into 'test'
Dev

See merge request jygk/dsc!3
2025-11-13 09:44:31 +00:00
hewencai
4efa894c8f Merge remote-tracking branch 'origin/dev' into dev 2025-11-13 17:32:31 +08:00
hewencai
f02745454d 修改门户管理图片显示逻辑 2025-11-13 17:32:30 +08:00
qianshijiang
d9fa921fda 添加异步任务工具类 2025-11-13 14:59:11 +08:00
chenbowen
b6951a4c6b 1. infra 模块扩展为两个实例 2025-11-13 11:22:18 +08:00
chenbowen
3e5a0a4845 1. 缩减 dsc 服务占用资源 2025-11-13 11:11:22 +08:00
wencai he
49a54e2199 Merge branch 'dev' into 'test'
feat:新增门户管理功能

See merge request jygk/dsc!2
2025-11-13 02:29:50 +00:00
hewencai
e00086c6e8 feat:新增门户管理功能 2025-11-13 10:28:19 +08:00
chenbowen
9c99750dd8 1. zt-module-report 不在进行部署 2025-11-13 09:14:50 +08:00
chenbowen
bd56cb0405 Merge branch 'dev' into test 2025-11-12 22:26:02 +08:00
chenbowen
c399bdf720 Merge remote-tracking branch 'base-version/main' into dev 2025-11-12 22:25:46 +08:00
chenbowen
1a34cbc678 1. 验证码接口 url 不校验租户 2025-11-12 22:23:58 +08:00
chenbowen
81fb8eea8f Merge branch 'dev' into test 2025-11-11 17:16:15 +08:00
chenbowen
8423775582 Merge remote-tracking branch 'base-version/main' into dev 2025-11-11 17:15:55 +08:00
chenbowen
aa159638b9 1. 只要标记了业务接口,就需要全量的拦截,不再区分 url 2025-11-11 17:14:31 +08:00
wencai he
2c4f46b6de Merge branch 'dev' into 'test'
Dev

See merge request jygk/dsc!1
2025-11-10 08:06:35 +00:00
hewencai
03c76b071a Merge remote-tracking branch 'origin/dev' into dev 2025-11-10 10:41:48 +08:00
hewencai
a6b87f01a7 add:增加seata和doc4j依赖 2025-11-10 10:41:08 +08:00
chenbowen
3312ed328d 1. dsc bpm deploy 单独进行发布 2025-11-07 12:58:59 +08:00
chenbowen
7d74ff7acc Merge branch 'dev' into test 2025-11-07 12:46:18 +08:00
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
chenbowen
f72835c608 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/tenant/vo/tenant/TenantSaveReqVO.java
2025-10-24 17:05:16 +08:00
chenbowen
6e4cc4d55e 1. 修复界面bug
2. 新增 api 可配置匿名访问固定用户配置
3. 新增密码弱口令校验规则
4. e 办使用 loginName 确认唯一用户逻辑
2025-10-24 17:02:10 +08:00
chenbowen
b244743276 移除当前系统不存在的模块 2025-10-22 16:11:29 +08:00
chenbowen
ba88e00052 修复 supply 模式的接口被过滤的错误 2025-10-22 09:32:27 +08:00
chenbowen
7d1721c147 修复 supply 模式的接口被过滤的错误 2025-10-21 18:50:26 +08:00
chenbowen
fa2dc54aee 修复 supply 模式的接口被过滤的错误 2025-10-21 18:16:44 +08:00
chenbowen
b50524aa45 Merge branch 'dev' into test 2025-10-21 17:56:34 +08:00
chenbowen
4ba865b165 修复 supply 模式的接口被过滤的错误 2025-10-21 17:56:15 +08:00
341 changed files with 21399 additions and 856 deletions

File diff suppressed because it is too large Load Diff

340
docs/iWork集成说明.md Normal file

File diff suppressed because it is too large Load Diff

View File

File diff suppressed because it is too large Load Diff

194
docs/外部单点登录.md Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

36
pom.xml
View File

@@ -20,7 +20,7 @@
<module>zt-module-report</module>
<!--<module>zt-module-mp</module>-->
<!-- <module>zt-module-ai</module>-->
<module>zt-module-template</module>
<!-- <module>zt-module-template</module>-->
<!-- <module>zt-module-iot</module>-->
<module>zt-module-databus</module>
<!-- <module>zt-module-rule</module>-->
@@ -32,7 +32,7 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties>
<revision>3.0.42</revision>
<revision>3.0.45</revision>
<!-- Maven 相关 -->
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
@@ -205,8 +205,13 @@
<name>中铜 ZStack 私服</name>
<url>http://172.16.46.63:30708/repository/test/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
@@ -232,8 +237,8 @@
<config.server-addr>172.16.46.63:30848</config.server-addr>
<config.namespace>dev</config.namespace>
<config.group>DEFAULT_GROUP</config.group>
<config.username/>
<config.password/>
<config.username>nacos</config.username>
<config.password>P@ssword25</config.password>
<config.version>1.0.0</config.version>
</properties>
</profile>
@@ -245,8 +250,8 @@
<config.server-addr>172.16.46.63:30848</config.server-addr>
<config.namespace>prod</config.namespace>
<config.group>DEFAULT_GROUP</config.group>
<config.username/>
<config.password/>
<config.username>nacos</config.username>
<config.password>P@ssword25</config.password>
<config.version>1.0.0</config.version>
</properties>
</profile>
@@ -258,8 +263,8 @@
<config.server-addr>172.16.46.63:30848</config.server-addr>
<config.namespace>local</config.namespace>
<config.group>DEFAULT_GROUP</config.group>
<config.username/>
<config.password/>
<config.username>nacos</config.username>
<config.password>P@ssword25</config.password>
<config.version>1.0.0</config.version>
</properties>
</profile>
@@ -269,6 +274,19 @@
<config.namespace>chenbowen</config.namespace>
</properties>
</profile>
<profile>
<id>qsj</id>
<properties>
<env.name>dev</env.name>
<!--Nacos 配置-->
<config.server-addr>172.16.46.63:30848</config.server-addr>
<config.namespace>qsj</config.namespace>
<config.group>DEFAULT_GROUP</config.group>
<config.username>nacos</config.username>
<config.password>P@ssword25</config.password>
<config.version>1.0.0</config.version>
</properties>
</profile>
</profiles>
</project>

581
sql/dm/bpm.sql Normal file

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,10 @@
-- 同步接口日志菜单权限 SQL 脚本
-- 为同步接口日志查询界面创建相应的菜单和权限
-- 在审计日志(108)下新增同步日志菜单
INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
VALUES (502, '同步日志', '', 2, 3, 108, 'sync-log', 'ep:data-line', 'system/synclog/index', 'SystemSyncLog', 0, '1', '1', '1', 'admin', '2024-08-28 00:00:00', 'admin', '2024-08-28 00:00:00', '0');
-- 同步日志查询权限按钮
INSERT INTO system_menu (id, name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
VALUES (5020, '同步日志查询', 'system:sync-log:query', 3, 1, 502, '', '', '', '', 0, '1', '1', '1', 'admin', '2024-08-28 00:00:00', 'admin', '2024-08-28 00:00:00', '0');

View File

@@ -7,6 +7,12 @@ ALTER TABLE infra_file ADD aes_iv VARCHAR(128);
COMMENT ON COLUMN infra_file.aes_iv IS 'AES加密时的随机IVBase64编码';
-- 3. Databus 客户端凭证新增匿名访问配置DM8
ALTER TABLE databus_api_client_credential ADD allow_anonymous BIT DEFAULT '0' NOT NULL;
ALTER TABLE databus_api_client_credential ADD anonymous_user_id BIGINT;
COMMENT ON COLUMN databus_api_client_credential.allow_anonymous IS '是否允许匿名访问';
COMMENT ON COLUMN databus_api_client_credential.anonymous_user_id IS '匿名访问固定用户';
-- 3 业务附件统一管理
DROP TABLE IF EXISTS infra_bsn_file;
CREATE TABLE infra_bsn_file (

Some files were not shown because too many files have changed in this diff Show More