Commit Graph

114 Commits

Author SHA1 Message Date
ranke
0943dbbe05 Merge branch 'dev' into test
* dev:
  修改私服地址
2026-01-15 10:05:37 +08:00
ranke
ae26e14aa2 修改私服地址 2026-01-15 10:05:31 +08:00
ranke
af6553698b Merge branch 'dev' into test
* dev:
  修改版本号,增加快照发布设置
2026-01-15 09:07:59 +08:00
ranke
631189d538 修改版本号,增加快照发布设置 2026-01-15 09:07:49 +08:00
chenbowen
faa6de5965 Merge branch 'dev' into test
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/framework/rpc/config/RpcConfiguration.java
2026-01-14 14:08:27 +08:00
chenbowen
98d585a9ae 1. 合并 bpm 版本 2026-01-14 14:07:45 +08:00
chenbowen
234ab78ba9 1. 合并 达梦数据库兼容改动 2026-01-12 17:11:30 +08:00
chenbowen
8d23ba8504 Merge branch 'dev' into test
# Conflicts:
#	zt-module-bpm/zt-module-bpm-server/Dockerfile
2026-01-12 16:39:02 +08:00
chenbowen
a693c2d91e 1. bpm 模块整合合并 2026-01-12 16:38:14 +08:00
chenbowen
9ad0b03b6b 1. 提出私服 skywalking 的依赖,使用 ZStack 自带链路追踪 2026-01-12 15:36:37 +08:00
chenbowen
1e404a9ef2 1. 移除合并失败的内容 2026-01-12 15:03:02 +08:00
chenbowen
09cb51bcdf Merge branch 'dev' into test 2026-01-12 13:57:24 +08:00
chenbowen
1697575bf5 Merge branch 'bpm-from-dsc-main' into bpm-merge 2026-01-12 11:08:38 +08:00
chenbowen
3e3cc502e3 Merge branch 'dev' into test 2026-01-08 11:57:35 +08:00
chenbowen
c4968d1aea 1. 升级 bpm api 版本 2026-01-08 11:57:12 +08:00
chenbowen
5aa83d739e 1. 添加 prestop 切换流量 2026-01-07 19:49:11 +08:00
chenbowen
5ba7f5753c Merge branch 'refs/heads/test' 2026-01-07 08:49:32 +08:00
chenbowen
dd1e1790db Merge branch 'dev' into test 2026-01-06 15:24:46 +08:00
chenbowen
85e5bae08e Merge remote-tracking branch 'base-version/main' into dev 2026-01-06 15:24:13 +08:00
ranke
28df5a8896 Merge branch 'test' into test-dsc
* test:
  新增根据流程实例ID获取抄送记录的接口,用于待办详情中展示
  [+]增加部门推动消息功能
  新增忽略公司以及部门数据权限的注解
2025-12-31 17:07:09 +08:00
ranke
ea9474895c 新增根据流程实例ID获取抄送记录的接口,用于待办详情中展示 2025-12-31 17:06:51 +08:00
chenbowen
46e42cf41d Merge branch 'refs/heads/dev' into test 2025-12-30 18:29:32 +08:00
chenbowen
d6fe76db44 Merge remote-tracking branch 'refs/remotes/base-version/test' into dev 2025-12-30 18:28:57 +08:00
ranke
3211dbe2b5 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
0eff938f9e 新增根据流程管控按钮是否可用配置功能. http://172.16.46.63:31560/index.php?m=task&f=view&taskID=551 2025-12-30 18:07:58 +08:00
chenbowen
f87a7af8e4 Merge branch 'test' 2025-12-29 08:50:58 +08:00
chenbowen
30f182828a Revert "1. 临时切换集群配合测试"
This reverts commit 3c3ac230080104fffbcfe32f53b3dde9fe12991e.
2025-12-27 13:12:22 +08:00
chenbowen
92f60e7132 1. 临时切换集群配合测试 2025-12-27 12:48:56 +08:00
chenbowen
c44d798e68 Merge branch 'dev' into test 2025-12-23 10:52:47 +08:00
chenbowen
6ecfcf2a09 1. 升级版本 2025-12-23 10:50:24 +08:00
FCL
32bb22d6b6 Merge branch 'dev' into test 2025-12-23 09:35:22 +08:00
FCL
f16243441e fix:qms模块监听 2025-12-23 09:34:58 +08:00
chenbowen
0740da8559 1. 调整新环境的命名空间和 harbo 地址 2025-12-17 20:30:33 +08:00
chenbowen
b4805414c5 1. 提出私服 skywalking 的依赖,使用 ZStack 自带链路追踪 2025-12-03 20:32:06 +08:00
chenbowen
aa918d5cc0 Merge remote-tracking branch 'base-version/main' into dev
# Conflicts:
#	zt-gateway/Dockerfile
#	zt-module-ai/zt-module-ai-server/Dockerfile
#	zt-module-bpm/zt-module-bpm-server/Dockerfile
#	zt-module-infra/zt-module-infra-server/Dockerfile
#	zt-module-mp/zt-module-mp-server/Dockerfile
#	zt-module-report/zt-module-report-server/Dockerfile
#	zt-module-system/zt-module-system-server/Dockerfile
#	zt-module-template/zt-module-template-server/Dockerfile
#	zt-server/Dockerfile
2025-12-03 18:01:51 +08:00
chenbowen
bd602cb3cd 提升相关服务的 xmx 至 1024mb 2025-12-03 17:59:56 +08:00
chenbowen
d8882188ef 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
6dace51774 1. 剔除掉多余的文档以及标记 2025-11-28 18:12:00 +08:00
chenbowen
23b716a843 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
ae451f9062 修复 flowable 无法通过 dm 数据库驱动正常获取 schema 的bug 2025-11-27 16:01:05 +08:00
chenbowen
224a83f7e7 修复 dm jdbc 不兼容 flowable 转义 sql 的错误 2025-11-27 13:26:30 +08:00
chenbowen
e909649eac 禁止事件引擎重复自动建表 2025-11-27 11:16:49 +08:00
chenbowen
f5f06f503b flowable 达梦迁移 2025-11-27 09:58:44 +08:00
qianshijiang
b3b324e0d9 错误信息未记录日志文件 2025-11-26 15:45:14 +08:00
qianshijiang
c327678aa4 错误信息未记录日志文件 2025-11-26 15:35:26 +08:00
qianshijiang
3e88f2a647 日志配置修改 2025-11-26 10:36:46 +08:00
qianshijiang
b1920b7b47 nacos配置 2025-11-26 08:58:10 +08:00
chenbowen
05967b855b 1. 同步 nacos 配置到业务系统 2025-11-25 18:54:39 +08:00
chenbowen
aa688680d3 1. 修复升级私有包版本错误 2025-11-25 09:54:36 +08:00
chenbowen
4029beca5b 1. 升级私有包版本 2025-11-25 09:37:44 +08:00