finish over node

xlorne · xlorne · commit 10b24d76c591 · 2024-11-22T08:28:09.000+08:00
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.12</version>
+        <version>3.3.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.12</version>
+        <version>3.3.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.12</version>
+        <version>3.3.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.12</version>
+        <version>3.3.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.12</version>
+        <version>3.3.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.12</version>
+    <version>3.3.13</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.12</version>
+    <version>3.3.13</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.12</version>
+        <version>3.3.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.12</version>
+        <version>3.3.13</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowNodeService.java
@@ -9,10 +9,12 @@
 import com.codingapi.springboot.flow.error.ErrorResult;
 import com.codingapi.springboot.flow.error.NodeResult;
 import com.codingapi.springboot.flow.error.OperatorResult;
+import com.codingapi.springboot.flow.event.FlowApprovalEvent;
 import com.codingapi.springboot.flow.record.FlowRecord;
 import com.codingapi.springboot.flow.repository.FlowOperatorRepository;
 import com.codingapi.springboot.flow.repository.FlowRecordRepository;
 import com.codingapi.springboot.flow.user.IFlowOperator;
+import com.codingapi.springboot.framework.event.EventPusher;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -168,7 +170,37 @@ private FlowNode matcherNextNode(FlowNode flowNode, boolean back) {
      * @return 流程记录
      */
     public List<FlowRecord> createRecord() {
+        // 创建下一节点的流程记录
+        List<FlowRecord> records = this.createNextRecord();
 
+        // 检测流程是否为抄送节点
+        while (this.nextNodeIsCirculate()){
+            for (FlowRecord record : records) {
+                record.circulate();
+            }
+            flowRecordRepository.save(records);
+
+            for (FlowRecord record : records) {
+                IFlowOperator pushOperator = record.getCurrentOperator();
+
+                EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_CIRCULATE,
+                                record,
+                                pushOperator,
+                                flowWork,
+                                snapshot.toBindData()),
+                        true);
+            }
+
+            this.skipCirculate();
+
+            records = this.createNextRecord();
+        }
+        return records;
+    }
+
+
+
+    private List<FlowRecord> createNextRecord(){
         FlowSession flowSession = new FlowSession(flowWork,
                 nextNode,
                 createOperator,
diff --git a/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowService.java b/springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowService.java
@@ -327,6 +327,28 @@ public FlowResult startFlow(String workCode, IFlowOperator operator, IBindData b
             }
         }
 
+        // 检测流程是否结束
+        if(flowNodeService.nextNodeIsOver()){
+            for (FlowRecord record : records) {
+                record.submitRecord(operator, snapshot, opinion, FlowSourceDirection.PASS);
+                record.finish();
+            }
+
+            flowRecordRepository.save(records);
+
+            // 推送事件
+            for (FlowRecord record : records) {
+                EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_CREATE, record, operator, flowWork, snapshot.toBindData()), true);
+
+                EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_FINISH,
+                                record,
+                                operator,
+                                flowWork,
+                                snapshot.toBindData()),
+                        true);
+            }
+            return new FlowResult(flowWork, records);
+        }
 
         // 保存流程记录
         flowRecordRepository.save(records);
@@ -448,40 +470,16 @@ public FlowResult submitFlow(long recordId, IFlowOperator currentOperator, IBind
         } else if (flowDirectionService.isDefaultBackRecord()) {
             flowNodeService.loadDefaultBackNode(flowRecord.getPreId());
         } else {
-            flowNodeService.loadCustomBackNode(flowNode, flowRecord.getPreId());
             // 审批拒绝，并且自定了返回节点
+            flowNodeService.loadCustomBackNode(flowNode, flowRecord.getPreId());
         }
 
-        // 创建下一节点的流程记录
         List<FlowRecord> records = flowNodeService.createRecord();
 
-        // 检测流程是否为抄送节点
-        while (flowNodeService.nextNodeIsCirculate()){
-            for (FlowRecord record : records) {
-                record.circulate();
-            }
-            flowRecordRepository.save(records);
-
-            for (FlowRecord record : records) {
-                IFlowOperator pushOperator = record.getCurrentOperator();
-
-                EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_CIRCULATE,
-                        record,
-                        pushOperator,
-                        flowWork,
-                        snapshot.toBindData()),
-                        true);
-            }
-
-            flowNodeService.skipCirculate();
-
-            records = flowNodeService.createRecord();
-        }
-
         // 判断流程是否完成
         if(flowNodeService.nextNodeIsOver()){
-            flowRecord.finish();
             flowRecord.submitRecord(currentOperator, snapshot, opinion, flowSourceDirection);
+            flowRecord.finish();
             flowRecordRepository.update(flowRecord);
             flowRecordRepository.finishFlowRecordByProcessId(flowRecord.getProcessId());
 
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.12</version>
+        <version>3.3.13</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>
diff --git a/springboot-starter-security/src/main/java/com/codingapi/springboot/security/filter/MyAuthenticationFilter.java b/springboot-starter-security/src/main/java/com/codingapi/springboot/security/filter/MyAuthenticationFilter.java
@@ -53,19 +53,25 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
                     return;
                 }
 
-                Token token = tokenGateway.parser(sign);
-                if (token == null) {
-                    writeResponse(response, Response.buildFailure("token.expire", "token expire."));
-                    return;
-                }
-                if (token.canRestToken()) {
-                    Token newSign = tokenGateway.create(token.getUsername(), token.decodeIv(), token.getAuthorities(), token.getExtra());
-                    log.info("reset token ");
-                    response.setHeader(TOKEN_KEY, newSign.getToken());
-                }
+                Token token = null;
                 try {
-                    token.verify();
-                } catch (TokenExpiredException e) {
+                    token = tokenGateway.parser(sign);
+                    if (token == null) {
+                        writeResponse(response, Response.buildFailure("token.expire", "token expire."));
+                        return;
+                    }
+                    if (token.canRestToken()) {
+                        Token newSign = tokenGateway.create(token.getUsername(), token.decodeIv(), token.getAuthorities(), token.getExtra());
+                        log.info("reset token ");
+                        response.setHeader(TOKEN_KEY, newSign.getToken());
+                    }
+                    try {
+                        token.verify();
+                    } catch (TokenExpiredException e) {
+                        writeResponse(response, Response.buildFailure("token.expire", "token expire."));
+                        return;
+                    }
+                }catch (Exception e){
                     writeResponse(response, Response.buildFailure("token.expire", "token expire."));
                     return;
                 }
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.12</version>
+        <version>3.3.13</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
