完善代码

src/main/java/com/ruoyi/project/activiti/domain/MyProcessDefinition.java

@@ -1,6 +1,8 @@
 package com.ruoyi.project.activiti.domain;
 
 
+import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -9,6 +11,10 @@ public class MyProcessDefinition implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private String id;
+    /**
+     * 流程id
+     */
+    private String processId;
     /**
      * 流程名称
      */
@@ -36,6 +42,14 @@ public class MyProcessDefinition implements Serializable {
      */
     private Date deploymentTime;
 
+    public String getProcessId() {
+        return processId;
+    }
+
+    public void setProcessId(String processId) {
+        this.processId = processId;
+    }
+
     public String getId() {
         return id;
     }

src/main/java/com/ruoyi/project/activiti/service/impl/ProcessDefinitionServiceImpl.java

@@ -129,6 +129,7 @@ public class ProcessDefinitionServiceImpl  {
         List<MyProcessDefinition> collect = list.stream().map(x -> {
             MyProcessDefinition myProcessDefinition = new MyProcessDefinition();
             myProcessDefinition.setId(x.getDeploymentId());
+            myProcessDefinition.setProcessId(x.getId());
             myProcessDefinition.setKey(x.getKey());
             myProcessDefinition.setName(x.getName());
             myProcessDefinition.setVersion(x.getVersion());

src/main/resources/application-druid.yml

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://49.235.127.212:3306/ry_activiti?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+                url: jdbc:mysql://47.108.115.128:13306/ry_activiti?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                 username: root
-                password: 123456
+                password: zdd755
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,7 +35,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -43,8 +43,8 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
+                login-username:
+                login-password:
             filter:
                 stat:
                     enabled: true
@@ -54,4 +54,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true

src/main/resources/application.yml

@@ -58,10 +58,10 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 49.235.127.212
+    host: 172.16.90.64
     # 端口，默认为6379
     port: 6379
-    password: zdd755
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce: