Merge remote-tracking branch 'origin/main'

flowable/src/main/java/com/sdm/flowable/controller/ProcessController.java

@@ -41,8 +41,7 @@ public class ProcessController {
     // 验证流程模型
     @GetMapping("/testHpc")
     public String testHpc() {
-        hpcHandler.mockinit();
-        return "ok" ;
+        return hpcHandler.mockinit();
     }
 
     // 验证流程模型

flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java

@@ -55,15 +55,16 @@ public class HpcHandler implements ExecutionHandler {
     }
 
 
-    public void mockinit(){
+    public String mockinit(){
         SubmitHpcTaskReq mockReq = mockSubmitHpcTaskReq();
         SdmResponse<String> submitResp = taskFeignClient.submitHpcJob(mockReq);
         if(!submitResp.isSuccess()|| StringUtils.isBlank(submitResp.getData())){
             log.error("HpcHandler submit failed,jobName:{}",mockReq.getJobName());
             System.out.println("失败");
+            return "失败";
         }
         String hpcTaskId = submitResp.getData();
-        System.out.println("成功："+hpcTaskId);
+        return hpcTaskId;
     }
 
     private SubmitHpcTaskReq mockSubmitHpcTaskReq() {

flowable/src/main/resources/application-dev.yml

@@ -0,0 +1,36 @@
+server:
+  port: 7106
+spring:
+  application:
+    name: flowable
+  datasource:
+    url: jdbc:mysql://192.168.65.161:3306/flowable?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: mysql
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  flowable:
+    # ?????????
+    database-schema-update: true
+    # ??????JOB
+    async-executor-activate: true
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.65.161:8848
+        group: DEV_GROUP
+        enabled: true
+
+logging:
+  level:
+    org:
+      flowable: INFO
+
+mybatis-plus:
+  mapper-locations: classpath*:/mapper/**/*.xml
+  type-aliases-package: com.sdm.flowable.model.entity
+  configuration:
+    map-underscore-to-camel-case: true
+  global-config:
+    db-config:
+      id-type: auto
+

flowable/src/main/resources/application-local.yml

@@ -0,0 +1,36 @@
+server:
+  port: 7106
+spring:
+  application:
+    name: flowable
+  datasource:
+    url: jdbc:mysql://192.168.65.161:3306/flowable?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: mysql
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  flowable:
+    # ?????????
+    database-schema-update: true
+    # ??????JOB
+    async-executor-activate: true
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.65.161:8848
+        group: LOCAL_GROUP
+        enabled: true
+
+logging:
+  level:
+    org:
+      flowable: INFO
+
+mybatis-plus:
+  mapper-locations: classpath*:/mapper/**/*.xml
+  type-aliases-package: com.sdm.flowable.model.entity
+  configuration:
+    map-underscore-to-camel-case: true
+  global-config:
+    db-config:
+      id-type: auto
+

flowable/src/main/resources/application.yml

@@ -1,36 +1,3 @@
-server:
-  port: 7106
 spring:
-  application:
-    name: flowable
-  datasource:
-    url: jdbc:mysql://192.168.65.161:3306/flowable?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-    username: root
-    password: mysql
-    driver-class-name: com.mysql.cj.jdbc.Driver
-  flowable:
-    # ?????????
-    database-schema-update: true
-    # ??????JOB
-    async-executor-activate: true
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.65.161:8848
-        group: LOCAL_GROUP
-        enabled: true
-
-logging:
-  level:
-    org:
-      flowable: INFO
-
-mybatis-plus:
-  mapper-locations: classpath*:/mapper/**/*.xml
-  type-aliases-package: com.sdm.flowable.model.entity
-  configuration:
-    map-underscore-to-camel-case: true
-  global-config:
-    db-config:
-      id-type: auto
-
+  profiles:
+    active: local

project/src/main/java/com/sdm/project/model/po/RunNodePo.java

@@ -37,7 +37,7 @@ public class RunNodePo extends NodeAllBase {
     /**
      * 流程模板名称
      */
-    private String templateName;
+    private String flowTemplate;
 
     /**
      * Run状态 0:未执行 1：执行中 2：完成 3：失败