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

# Conflicts:
#	deployment.yaml
#	pom.xml

deployment.yaml

@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  namespace: ns-d6a0e78ebd674c279614498e4c57b133
+  namespace: ns-766b45fbd7464ccb86d5fd046054cf0a
   name: zt-module-bpm
   labels:
     app: zt-module-bpm
@@ -22,11 +22,18 @@ spec:
     spec:
       containers:
         - name: zt-module-bpm
-          image: 172.16.46.66:10043/zt/dsc-bpm:VERSION_PLACEHOLDER
+          image: 172.17.19.16:10043/zt-jygk/dsc-bpm:VERSION_PLACEHOLDER
           imagePullPolicy: Always
           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:
@@ -58,7 +65,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: ns-d6a0e78ebd674c279614498e4c57b133
+  namespace: ns-766b45fbd7464ccb86d5fd046054cf0a
   name: zt-module-bpm
 spec:
   type: NodePort

pom.xml

@@ -12,19 +12,18 @@
     </modules>
 
     <name>${project.artifactId}</name>
-    <description>芋道项目基础脚手架</description>
+    <description>项目基础脚手架</description>
-    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.45</revision>
+        <revision>3.0.47-SNAPSHOT</revision>
-        <business.supply.version>3.0.44</business.supply.version>
+        <business.supply.version>3.0.47-SNAPSHOT</business.supply.version>
-        <business.base.version>3.0.44</business.base.version>
+        <business.base.version>3.0.47-SNAPSHOT</business.base.version>
-        <business.logistic.version>3.0.44</business.logistic.version>
+        <business.logistic.version>3.0.47-SNAPSHOT</business.logistic.version>
-        <business.manage.version>3.0.44</business.manage.version>
+        <business.manage.version>3.0.47-SNAPSHOT</business.manage.version>
-        <business.qms.version>3.0.44</business.qms.version>
+        <business.qms.version>3.0.47-SNAPSHOT</business.qms.version>
-        <business.mes.version>3.0.44</business.mes.version>
+        <business.mes.version>3.0.47-SNAPSHOT</business.mes.version>
-        <business.capital.version>3.0.44</business.capital.version>
+        <business.capital.version>3.0.47-SNAPSHOT</business.capital.version>
-        <business.product.version>3.0.44</business.product.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/prod/</url>
             <releases>
                 <updatePolicy>always</updatePolicy>
                 <checksumPolicy>warn</checksumPolicy>
@@ -211,7 +210,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/prod/</url>
         </repository>
 <!--    <snapshotRepository>-->
 <!--        <id>ZT</id>-->
@@ -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>

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;
 
 }

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")

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;
 

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")

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 {
 

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 可获取抄送人的表单权限；
 

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")

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")