Merge pull request #95 from codingapi/dev

fix import workflow

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/service/WorkflowService.java

@@ -1,6 +1,7 @@
 package com.codingapi.flow.service;
 
 import com.codingapi.flow.exception.FlowExecutionException;
+import com.codingapi.flow.operator.IFlowOperator;
 import com.codingapi.flow.repository.WorkflowRepository;
 import com.codingapi.flow.repository.WorkflowRuntimeRepository;
 import com.codingapi.flow.repository.WorkflowVersionRepository;
@@ -171,10 +172,10 @@ public WorkflowRuntime getWorkflowRuntime(String workId, long workVersion) {
      * @param body base64
      * @return 流程id
      */
-    public String importWorkflow(String body) {
+    public String importWorkflow(String body, IFlowOperator createOperator) {
         String json = Base64Utils.toJson(body);
         Workflow workflow = Workflow.formJson(json);
-        workflow.resetWorkflow();
+        workflow.resetWorkflow(createOperator);
         this.saveWorkflow(workflow);
         return workflow.getId();
     }

flow-engine-framework/src/main/java/com/codingapi/flow/workflow/Workflow.java

@@ -374,10 +374,11 @@ public void updateTime() {
         this.updatedTime = System.currentTimeMillis();
     }
 
-    public void resetWorkflow() {
+    public void resetWorkflow(IFlowOperator createdOperator) {
         this.id = RandomUtils.generateStringId();
         this.code = RandomUtils.generateWorkflowCode();
         this.createdTime = System.currentTimeMillis();
+        this.createdOperator = createdOperator;
         this.updateTime();
     }
 }

flow-engine-starter-api/src/main/java/com/codingapi/flow/api/controller/WorkflowController.java

@@ -120,7 +120,8 @@ public SingleResponse<JSONObject> create() {
 
     @PostMapping("/import")
     public SingleResponse<String> importWorkflow(@RequestBody JSONObject body) {
-        String workId = workflowService.importWorkflow(body.getString("file"));
+        IFlowOperator current = (IFlowOperator) UserContext.getInstance().current();
+        String workId = workflowService.importWorkflow(body.getString("file"),current);
         return SingleResponse.of(workId);
     }