chenbowen
|
c772532d3f
|
Merge branch 'dev' into test
|
2026-02-03 11:19:55 +08:00 |
|
chenbowen
|
3377c357de
|
Revert "移除多余的依赖"
This reverts commit 667ee852da.
|
2026-02-03 11:18:30 +08:00 |
|
chenbowen
|
04254e16ac
|
Merge branch 'dev' into test
# Conflicts:
# zt-module-bpm/zt-module-bpm-server/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java
# zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/framework/rpc/config/RpcConfiguration.java
# zt-module-bpm/zt-module-bpm-server/src/main/java/liquibase/datatype/core/BooleanType.java
# zt-module-bpm/zt-module-bpm-server/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java
|
2026-02-03 10:37:34 +08:00 |
|
chenbowen
|
82ceb1f18b
|
保留覆盖的源码
|
2026-02-03 10:36:45 +08:00 |
|
chenbowen
|
667ee852da
|
移除多余的依赖
|
2026-01-30 17:45:14 +08:00 |
|
ranke
|
d1cd1817a1
|
修改部署配置
|
2026-01-30 14:43:08 +08:00 |
|
ranke
|
f0df2ceec7
|
修改dockerfile
|
2026-01-30 14:26:59 +08:00 |
|
ranke
|
809c7eabd4
|
修改maven私服地址
|
2026-01-30 14:19:28 +08:00 |
|
ranke
|
1c62711f74
|
删除与 ztcloud 的 bpm 中重复的代码, 改为以jar包方式引入 ztcloud 的bpm
|
2026-01-30 11:46:25 +08:00 |
|
chenbowen
|
afc1ffa4fe
|
修正测试分支版本号
|
2026-01-29 09:02:44 +08:00 |
|
chenbowen
|
ce3e6f2577
|
Merge branch 'main' into test
# Conflicts:
# deployment.yaml
# pom.xml
|
2026-01-27 17:54:23 +08:00 |
|
chenbowen
|
603bdc7c9a
|
Merge branch 'dev' into test
|
2026-01-27 16:10:42 +08:00 |
|
chenbowen
|
bd8d9646f5
|
1. 迁移 bpm 部署集群
|
2026-01-27 16:10:23 +08:00 |
|
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
|
28284835cc
|
Merge branch 'refs/heads/test'
|
2026-01-12 18:46:29 +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
|
8633337165
|
Merge branch 'test'
|
2026-01-08 11:58:26 +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
|
350335e2f1
|
1. test 与 prod 使用不同发布库
|
2026-01-08 10:55:57 +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 |
|
chenbowen
|
270d447b33
|
1. 调整部署配置
|
2026-01-06 14:59:46 +08:00 |
|
chenbowen
|
8058f26c7b
|
1. 调整部署配置
|
2026-01-06 14:45:48 +08:00 |
|
chenbowen
|
1e9f6de7d1
|
1. 调整部署配置
|
2026-01-06 09:33:42 +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 |
|