Merge branch 'refs/heads/zt-test' into test

Merge branch 'dev' into test
* dev: 修改私服地址
2026-01-19 10:56:11 +08:00 · 2026-01-15 10:05:37 +08:00 · 2026-01-15 10:05:31 +08:00 · 2026-01-15 09:07:59 +08:00 · 2026-01-15 09:07:49 +08:00 · 2026-01-14 14:08:27 +08:00
127 changed files with 4365 additions and 187 deletions
--- a/deployment.yaml
+++ b/deployment.yaml
@@ -27,6 +27,13 @@ spec:
          env:
            - name: TZ
              value: Asia/Shanghai
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - "/bin/sh"
+                  - "-c"
+                  - "sleep 35"
          readinessProbe:
            httpGet:
              path: /actuator/health
@@ -48,7 +55,7 @@ spec:
            limits:
              cpu: "1"
              memory: "2048Mi"
-      terminationGracePeriodSeconds: 30
+      terminationGracePeriodSeconds: 40
  strategy:
    type: RollingUpdate
    rollingUpdate:
--- a/pom.xml
+++ b/pom.xml
@@ -12,19 +12,18 @@
    </modules>

    <name>${project.artifactId}</name>
-    <description>芋道项目基础脚手架</description>
-    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
+    <description>项目基础脚手架</description>

    <properties>
-        <revision>3.0.45</revision>
-        <business.supply.version>3.0.44</business.supply.version>
-        <business.base.version>3.0.44</business.base.version>
-        <business.logistic.version>3.0.44</business.logistic.version>
-        <business.manage.version>3.0.44</business.manage.version>
-        <business.qms.version>3.0.44</business.qms.version>
-        <business.mes.version>3.0.44</business.mes.version>
-        <business.capital.version>3.0.44</business.capital.version>
-        <business.product.version>3.0.44</business.product.version>
+        <revision>3.0.47-SNAPSHOT</revision>
+        <business.supply.version>3.0.47-SNAPSHOT</business.supply.version>
+        <business.base.version>3.0.47-SNAPSHOT</business.base.version>
+        <business.logistic.version>3.0.47-SNAPSHOT</business.logistic.version>
+        <business.manage.version>3.0.47-SNAPSHOT</business.manage.version>
+        <business.qms.version>3.0.47-SNAPSHOT</business.qms.version>
+        <business.mes.version>3.0.47-SNAPSHOT</business.mes.version>
+        <business.capital.version>3.0.47-SNAPSHOT</business.capital.version>
+        <business.product.version>3.0.47-SNAPSHOT</business.product.version>
        <!-- Maven 相关 -->
        <java.version>17</java.version>
        <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -195,7 +194,7 @@
        <repository>
            <id>ZT</id>
            <name>中铜 ZStack 私服</name>
-            <url>http://172.16.46.63:30708/repository/test/</url>
+            <url>http://172.16.46.63:30708/repository/zt-cloud/</url>
            <releases>
                <updatePolicy>always</updatePolicy>
                <checksumPolicy>warn</checksumPolicy>
@@ -213,11 +212,11 @@
            <name>中铜 ZStack 私服</name>
            <url>http://172.16.46.63:30708/repository/test/</url>
        </repository>
-<!--    <snapshotRepository>-->
-<!--        <id>ZT</id>-->
-<!--        <name>中铜 ZStack 私服</name>-->
-<!--        <url>https://your-nexus.example.com/repository/maven-snapshots/</url>-->
-<!--    </snapshotRepository>-->
+        <snapshotRepository>
+            <id>ZT-snap</id>
+            <name>中铜 ZStack 私服</name>
+            <url>http://172.16.46.63:30708/repository/test-snap/</url>
+        </snapshotRepository>
    </distributionManagement>

    <profiles>
@@ -269,7 +268,14 @@
        <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>
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/dto/BpmFormPageReqDTO.java
+++ b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/dto/BpmFormPageReqDTO.java
@@ -12,7 +12,7 @@ import lombok.ToString;
@ToString(callSuper = true)
 public class BpmFormPageReqDTO extends PageParam {

-    @Schema(description = "表单名称", example = "芋道")
+    @Schema(description = "表单名称", example = "ZT")
    private String name;

 }
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/dto/BpmFormRespDTO.java
+++ b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/dto/BpmFormRespDTO.java
@@ -12,7 +12,7 @@ public class BpmFormRespDTO {
    @Schema(description = "表单编号", example = "1024")
    private Long id;

-    @Schema(description = "表单名", example = "芋艿")
+    @Schema(description = "表单名", example = "ZT")
    private String name;

    @Schema(description = "表单状态", example = "1")
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/dto/BpmFormSaveReqDTO.java
+++ b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/dto/BpmFormSaveReqDTO.java
@@ -11,7 +11,7 @@ public class BpmFormSaveReqDTO {
    @Schema(description = "表单编号", example = "1024")
    private Long id;

-    @Schema(description = "表单名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @Schema(description = "表单名", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
    @NotEmpty(message = "表单名不能为空")
    private String name;

--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/dto/BpmUserGroupRespDTO.java
+++ b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/definition/dto/BpmUserGroupRespDTO.java
@@ -13,10 +13,10 @@ public class BpmUserGroupRespDTO {
    @Schema(description = "编号", example = "1024")
    private Long id;

-    @Schema(description = "组名", example = "芋艿")
+    @Schema(description = "组名", example = "ZT")
    private String name;

-    @Schema(description = "描述", example = "芋艿")
+    @Schema(description = "描述", example = "ZT")
    private String description;

    @Schema(description = "成员用户编号数组", example = "1,2,3")
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/task/BpmProcessInstanceApi.java
+++ b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/task/BpmProcessInstanceApi.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;

 import java.util.List;

-@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+@FeignClient(name = ApiConstants.NAME) // TODO ZT：fallbackFactory =
@Tag(name = "RPC 服务 - 流程实例")
 public interface BpmProcessInstanceApi {

--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/task/dto/BpmApprovalDetailReqDTO.java
+++ b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/task/dto/BpmApprovalDetailReqDTO.java
@@ -24,7 +24,7 @@ public class BpmApprovalDetailReqDTO {
    @Schema(description = "流程实例的编号", example = "1024")
    private String processInstanceId;  // 使用场景：流程已发起时候传流程实例 ID

-    // TODO @芋艿：如果未来 BPMN 增加流程图，它没有发起人节点，会有问题。
+    // TODO @ZT：如果未来 BPMN 增加流程图，它没有发起人节点，会有问题。
    @Schema(description = "流程活动编号", example = "StartUserNode")
    private String activityId; // 用于获取表单权限。1）发起流程时，传"发起人节点" activityId 可获取发起人的表单权限；2）从抄送列表界面进来时，传抄送的 activityId 可获取抄送人的表单权限；

--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/task/dto/BpmProcessInstancePageReqDTO.java
+++ b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/task/dto/BpmProcessInstancePageReqDTO.java
@@ -16,7 +16,7 @@ public class BpmProcessInstancePageReqDTO extends PageParam {
    @Schema(description = "流程实例的编号", example = "1024")
    private String id;

-    @Schema(description = "流程实例的名字", example = "芋艿")
+    @Schema(description = "流程实例的名字", example = "ZT")
    private String name;

    @Schema(description = "流程定义的编号", example = "2048")
--- a/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/task/dto/BpmProcessInstanceRespDTO.java
+++ b/zt-module-bpm/zt-module-bpm-api/src/main/java/com/zt/plat/module/bpm/api/task/dto/BpmProcessInstanceRespDTO.java
@@ -16,7 +16,7 @@ public class BpmProcessInstanceRespDTO {
    @Schema(description = "流程实例的编号", example = "1024")
    private String id;

-    @Schema(description = "流程实例的名字", example = "芋艿")
+    @Schema(description = "流程实例的名字", example = "ZT")
    private String name;

    @Schema(description = "流程摘要")
@@ -49,7 +49,7 @@ public class BpmProcessInstanceRespDTO {
    @Schema(description = "持续时间", example = "1000")
    private Long durationInMillis;

-    @Schema(description = "提交的表单值", example = "{\"name\": \"芋艿\"}")
+    @Schema(description = "提交的表单值", example = "{\"name\": \"ZT\"}")
    private Map<String, Object> formVariables;

    @Schema(description = "业务的唯一标识", example = "1")
@@ -77,7 +77,7 @@ public class BpmProcessInstanceRespDTO {
        @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
        private String id;

-        @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+        @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
        private String name;

        @Schema(description = "任务分配人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048")
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
FCL	85ef3b75fe	Merge branch 'refs/heads/zt-test' into test	2026-01-19 10:56:11 +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	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
FCL	5cbc445cf7	代码合并	2026-01-09 13:54:33 +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
FCL	f06e0a4d5c	feat:报告流程回调优化；转pdf；发起iwork流程；	2025-12-16 16:11:09 +08:00
FCL	39ff226c9b	Merge branch 'refs/heads/zt-test' into test	2025-12-11 10:17:55 +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	cea6ff4a52	1. 新增业务系统日志收集	2025-11-06 00:49:53 +08:00
chenbowen	f7af0cad09	1. 新增业务系统日志收集	2025-11-06 00:41:57 +08:00
chenbowen	947c867526	1. 新增业务系统日志收集	2025-11-06 00:37:48 +08:00
chenbowen	8e43f3e2a3	1. 新增业务系统日志收集	2025-11-06 00:28:14 +08:00
chenbowen	bac1c4d322	Merge remote-tracking branch 'base-version/main' into dev	2025-10-17 17:45:33 +08:00
chenbowen	10df09b9bb	1. 新增外部系统编码部门编码关联管理 2. 新增统一的 api 对外门户管理 3. 修正各个模块的 api 命名	2025-10-17 17:40:46 +08:00
chenbowen	606186aadc	Merge remote-tracking branch 'base-version/main' into dev	2025-09-28 16:37:38 +08:00
qianshijiang	7ac2e4dcbd	1. 流程枚举状态补充方法返回对应枚举 2. 新增获得指定用户的公司部门信息携带 Code	2025-09-28 16:19:48 +08:00
qianshijiang	bd6ffa6217	流程枚举状态补充方法返回对应枚举	2025-09-28 11:48:25 +08:00
qianshijiang	edb686174d	流程枚举状态补充方法返回对应枚举	2025-09-28 11:43:54 +08:00
chenbowen	703414ef8c	Merge remote-tracking branch 'base-version/main' into test # Conflicts: # zt-module-bpm/zt-module-bpm-server/src/main/java/com/zt/plat/module/bpm/api/task/BpmProcessInstanceApiImpl.java # zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/auth/AdminAuthServiceImpl.java	2025-09-28 00:41:22 +08:00
chenbowen	00e445c80d	1. 升级 3.0.40 新增 bpm api 新增登录页面区分内外部用户以及 e 办统一认证逻辑	2025-09-28 00:08:55 +08:00
chenbowen	2f73f98c7c	Merge remote-tracking branch 'base-version/main' into test # Conflicts: # pom.xml # zt-dependencies/pom.xml	2025-09-25 19:25:47 +08:00
chenbowen	e43e5f5caf	1. 升级 3.0.38 补全业务附件表缺失的 api 支持 api 获取附件二进制数据新增业务附件表状态信息补全部分存在嵌套结构的 bpm api 缺失数据	2025-09-25 19:24:06 +08:00
chenbowen	95b775a16d	Merge remote-tracking branch 'base-version/main' into dev # Conflicts: # zt-framework/zt-spring-boot-starter-job/src/main/java/com/zt/plat/framework/quartz/config/ZtXxlJobAutoConfiguration.java	2025-09-25 12:06:26 +08:00
qianshijiang	285e0ab17d	流程任务feign接口添加	2025-09-25 12:04:09 +08:00
chenbowen	c53b24be05	Merge remote-tracking branch 'base-version/main' into dev # Conflicts: # zt-gateway/src/main/resources/application.yaml	2025-09-24 15:36:43 +08:00
chenbowen	af60a8c020	1. 升级 3.0.35 补全 bpm api	2025-09-24 15:28:40 +08:00
chenbowen	a8780089f1	1. bpm 接入业务回调 openfeign	2025-09-23 15:57:36 +08:00
qianshijiang	b4b538365c	流程任务feign接口添加	2025-09-23 15:11:09 +08:00
qianshijiang	5b3b1e4f66	流程服务添加-资金授信模块的流程状态监听器进行业务回调	2025-09-23 11:41:32 +08:00
qianshijiang	fc24ab91fa	流程服务添加-资金授信模块的流程状态监听器进行业务回调	2025-09-23 11:40:26 +08:00
qianshijiang	3b8fb98eeb	流程服务添加-资金授信模块的流程状态监听器进行业务回调	2025-09-23 11:38:29 +08:00
chenbowen	6e90e8168b	1. 合并base改包代码	2025-09-22 15:10:53 +08:00
chenbowen	7cbcd15399	1. 统一包名修改	2025-09-22 14:53:45 +08:00
chenbowen	8ca9ac7ce8	1. 统一包名修改	2025-09-22 11:55:27 +08:00
chenbowen	ce7c25f6a2	1. 手动合并存在重复被合并的文件，并统一包名	2025-09-22 03:27:28 +08:00