企业明文复制接口跳过第三方节点复制

xlinliu · xlinliu · commit ff6a3288db33 · 2025-08-21T17:41:39.000+08:00
diff --git a/dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefCopyOperation.java b/dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefCopyOperation.java
@@ -47,6 +47,7 @@ public RefJobContentResponseRef copyRef(ThirdlyRequestRef.CopyWitContextRequestR
         String contextIdStr = workflowCopyRequestRef.getContextId();
         String projectName = workflowCopyRequestRef.getProjectName();
         List<String> enableNodeList = (List<String>) workflowCopyRequestRef.getRefJobContent().get(OrchestratorRefConstant.ORCHESTRATION_ENABLE_NODE);
+        Boolean skipThirdAppconn=(Boolean) workflowCopyRequestRef.getRefJobContent().get(OrchestratorRefConstant.ORCHESTRATION_SKIP_THIRD_NODE);
         String flowProxyUser = (String) workflowCopyRequestRef.getRefJobContent().get(OrchestratorRefConstant.FLOW_PROXY_USER);
         //插入version
         String version = workflowCopyRequestRef.getNewVersion();
@@ -58,7 +59,7 @@ public RefJobContentResponseRef copyRef(ThirdlyRequestRef.CopyWitContextRequestR
                 workflowCopyRequestRef.getWorkspace(), appId, contextIdStr,
                 projectName, version, description, workflowCopyRequestRef.getDSSLabels(),
                 targetProjectId, (String) nodeSuffix.orElse(null), (String) newFlowName.orElse(null),
-                enableNodeList,flowProxyUser);
+                enableNodeList,flowProxyUser,Boolean.TRUE.equals(skipThirdAppconn));
         List<DSSLabel> dssLabels = workflowCopyRequestRef.getDSSLabels();
         Sender tempSend = DSSSenderServiceFactory.getOrCreateServiceInstance().getWorkflowSender(dssLabels);
         ResponseCopyWorkflow responseCopyWorkflow = RpcAskUtils.processAskException(tempSend.ask(requestCopyWorkflow),
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorCopyVo.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorCopyVo.java
@@ -27,6 +27,7 @@ public class OrchestratorCopyVo implements Serializable {
     private List<String> enableNodeIdList;
 
     private String flowProxyUser;
+    private  boolean skipThirdNode;
 
     private OrchestratorCopyVo(Builder builder) {
         this.username = builder.username;
@@ -43,6 +44,7 @@ private OrchestratorCopyVo(Builder builder) {
         this.instanceName = builder.instanceName;
         this.enableNodeIdList = builder.enableNodeIdList;
         this.flowProxyUser = builder.flowProxyUser;
+        this.skipThirdNode=builder.skipThirdNode;
     }
 
 
@@ -64,6 +66,7 @@ public static class Builder {
         private List<String> enableNodeIdList;
 
         private String flowProxyUser;
+        private  boolean skipThirdNode;
 
         public Builder(String username, Long sourceProjectId, String sourceProjectName, Long targetProjectId,
                        String targetProjectName, DSSOrchestratorInfo orchestrator, String targetOrchestratorName,
@@ -85,7 +88,7 @@ public Builder(String username, Long sourceProjectId, String sourceProjectName,
         public Builder(String username, Long sourceProjectId, String sourceProjectName, Long targetProjectId,
                        String targetProjectName, DSSOrchestratorInfo orchestrator, String targetOrchestratorName,
                        String workflowNodeSuffix, DSSLabel dssLabel, Workspace workspace, String instanceName,
-                       List<String> enableNodeIdList,String flowProxyUser) {
+                       List<String> enableNodeIdList,String flowProxyUser,  boolean skipThirdNode) {
 
             this.username = username;
             this.sourceProjectId = sourceProjectId;
@@ -100,6 +103,7 @@ public Builder(String username, Long sourceProjectId, String sourceProjectName,
             this.instanceName = instanceName;
             this.enableNodeIdList = enableNodeIdList;
             this.flowProxyUser = flowProxyUser;
+            this.skipThirdNode=skipThirdNode;
         }
 
 
@@ -177,5 +181,13 @@ public String getFlowProxyUser() {
     public void setFlowProxyUser(String flowProxyUser) {
         this.flowProxyUser = flowProxyUser;
     }
+
+    public boolean getSkipThirdNode() {
+        return skipThirdNode;
+    }
+
+    public void setSkipThirdNode(boolean skipThirdNode) {
+        this.skipThirdNode = skipThirdNode;
+    }
 }
 
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/job/OrchestratorCopyJob.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/job/OrchestratorCopyJob.java
@@ -76,7 +76,7 @@ private void copyOrchestrator() {
         try {
             doOrchestratorCopy(orchestratorCopyVo.getUsername(), orchestratorCopyVo.getWorkspace(), newOrchestrator,
                     orchestratorCopyVo.getTargetProjectName(), Lists.newArrayList(orchestratorCopyVo.getDssLabel()), appId,
-                    orchestratorCopyVo.getEnableNodeIdList(),orchestratorCopyVo.getFlowProxyUser());
+                    orchestratorCopyVo.getEnableNodeIdList(),orchestratorCopyVo.getFlowProxyUser(),orchestratorCopyVo.getSkipThirdNode());
         } catch (Exception e) {
             //保存错误信息
             String errorMsg = "CopyOrcError: " + e.getMessage();
@@ -106,7 +106,8 @@ private void doOrchestratorCopy(String userName,
                                     String projectName,
                                     List<DSSLabel> dssLabels, Long appId,
                                     List<String> enableNodeIdList,
-                                    String flowProxyUser) throws Exception {
+                                    String flowProxyUser,
+                                    boolean skipThirdNode) throws Exception {
         String copyInitVersion = OrchestratorUtils.generateNewCopyVersion(orchestratorCopyVo.getWorkflowNodeSuffix());
         String contextId = orchestratorCopyEnv.getContextService().createContextID(workspace.getWorkspaceName(), projectName, dssOrchestratorInfo.getName(), copyInitVersion, userName);
         DSSOrchestratorVersion dssOrchestratorVersion = new DSSOrchestratorVersion();
@@ -134,6 +135,7 @@ private void doOrchestratorCopy(String userName,
                     refJobContent.put(OrchestratorRefConstant.ORCHESTRATION_NODE_SUFFIX, orchestratorCopyVo.getWorkflowNodeSuffix());
                     // 添加启用节点ID列表
                     refJobContent.put(OrchestratorRefConstant.ORCHESTRATION_ENABLE_NODE, enableNodeIdList);
+                    refJobContent.put(OrchestratorRefConstant.ORCHESTRATION_SKIP_THIRD_NODE, skipThirdNode);
                     // 添加copy工作流的代理用户
                     refJobContent.put(OrchestratorRefConstant.FLOW_PROXY_USER,flowProxyUser);
                     requestRef.setNewVersion(dssOrchestratorVersion.getVersion()).setRefJobContent(refJobContent);
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -230,7 +230,7 @@ public Message copyOrchestrator(@RequestBody OrchestratorCopyRequest orchestrato
             return Message.error("当前工作流正在被复制，不允许再次复制");
         }
 
-        String copyJobId = orchestratorFrameworkService.copyOrchestrator(username, orchestratorCopyRequest, workspace,null,null);
+        String copyJobId = orchestratorFrameworkService.copyOrchestrator(username, orchestratorCopyRequest, workspace,null,null,false);
         AuditLogUtils.printLog(username, workspace.getWorkspaceId(), workspace.getWorkspaceName(), TargetTypeEnum.ORCHESTRATOR,
                 orchestratorCopyRequest.getSourceOrchestratorId(), orchestratorCopyRequest.getSourceOrchestratorName(), OperateTypeEnum.COPY, orchestratorCopyRequest);
 
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
@@ -43,7 +43,7 @@ public interface OrchestratorFrameworkService {
 
     OrchestratorUnlockVo unlockOrchestrator(String username, Workspace workspace, OrchestratorUnlockRequest request) throws DSSErrorException;
 
-    String copyOrchestrator(String username, OrchestratorCopyRequest orchestratorCopyRequest, Workspace workspace,List<String> enableNodeIdList,String flowProxyUser) throws Exception;
+    String copyOrchestrator(String username, OrchestratorCopyRequest orchestratorCopyRequest, Workspace workspace,List<String> enableNodeIdList,String flowProxyUser,boolean skipThirdNode) throws Exception;
 
     Pair<Long, List<OrchestratorCopyHistory>> getOrchestratorCopyHistory(String username, Workspace workspace, Long orchestratorId, Integer currentPage, Integer pageSize) throws Exception;
 
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -409,7 +409,7 @@ public DSSOrchestratorVersion getLatestOrchestratorVersion(Long orchestratorId)
 
     @Override
     public String copyOrchestrator(String username, OrchestratorCopyRequest orchestratorCopyRequest, Workspace workspace,
-                                   List<String> enableNodeIdList,String flowProxyUser) throws Exception {
+                                   List<String> enableNodeIdList,String flowProxyUser, boolean skipThirdNode) throws Exception {
         if (orchestratorCopyRequest.getTargetOrchestratorName().length() > MAX_NAME_LENGTH) {
             DSSFrameworkErrorException.dealErrorException(60000, "编排名称过长，请限制在" + MAX_NAME_LENGTH + "以内");
         }
@@ -438,7 +438,7 @@ public String copyOrchestrator(String username, OrchestratorCopyRequest orchestr
         OrchestratorCopyVo orchestratorCopyVo = new OrchestratorCopyVo.Builder(username, sourceProject.getId(), sourceProject.getName(), targetProject.getId(),
                 targetProject.getName(), sourceOrchestratorInfo, orchestratorCopyRequest.getTargetOrchestratorName(),
                 orchestratorCopyRequest.getWorkflowNodeSuffix(), new EnvDSSLabel(dssLabel),
-                workspace, Sender.getThisInstance(), enableNodeIdList, flowProxyUser).setCopyTaskId(null).build();
+                workspace, Sender.getThisInstance(), enableNodeIdList, flowProxyUser,skipThirdNode).setCopyTaskId(null).build();
         OrchestratorCopyJob orchestratorCopyJob = new OrchestratorCopyJob();
         orchestratorCopyJob.setTargetProject(targetProject);
         orchestratorCopyJob.setOrchestratorCopyVo(orchestratorCopyVo);
@@ -1050,7 +1050,7 @@ public DSSOrchestratorCopyInfo encryptCopyOrchestrator(EncryptCopyOrchestratorRe
         orchestratorCopyRequest.setTargetProjectName(dssProject.getName());
         orchestratorCopyRequest.setWorkflowNodeSuffix(request.getCopyNodeSuffix());
 
-        String copyJobId = copyOrchestrator(username, orchestratorCopyRequest, workspace, enableNodeIdList,request.getFlowProxyUser());
+        String copyJobId = copyOrchestrator(username, orchestratorCopyRequest, workspace, enableNodeIdList,request.getFlowProxyUser(),true);
 
         DSSOrchestratorCopyInfo dssOrchestratorCopyInfo = new DSSOrchestratorCopyInfo();
         dssOrchestratorCopyInfo.setId(copyJobId);
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
@@ -62,6 +62,7 @@ public interface OrchestratorRefConstant {
     public static final String FLOW_STATUS_UNPUBLISHED = "unpublished";
 
     public static final String ORCHESTRATION_ENABLE_NODE = "autoEnableNodeId";
+    public static final String ORCHESTRATION_SKIP_THIRD_NODE = "skipthirdNode";
 
     public static final String FLOW_PROXY_USER="flowProxyUser";
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/RequestCopyWorkflow.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/RequestCopyWorkflow.java
@@ -39,6 +39,7 @@ public class RequestCopyWorkflow {
    private List<String> enableNodeList;
 
    private String flowProxyUser;
+   private boolean skipThirdAppconn;
 
     public RequestCopyWorkflow(String userName,
                                Workspace workspace,
@@ -79,7 +80,8 @@ public RequestCopyWorkflow(String userName,
                                String nodeSuffix,
                                String newFlowName,
                                List<String> enableNodeList,
-                               String flowProxyUser) {
+                               String flowProxyUser,
+                               boolean skipThirdAppconn) {
 
         this.userName = userName;
         this.workspace = workspace;
@@ -94,6 +96,7 @@ public RequestCopyWorkflow(String userName,
         this.newFlowName = newFlowName;
         this.enableNodeList = enableNodeList;
         this.flowProxyUser = flowProxyUser;
+        this.skipThirdAppconn=skipThirdAppconn;
 
     }
 
@@ -193,6 +196,14 @@ public void setEnableNodeList(List<String> enableNodeList) {
         this.enableNodeList = enableNodeList;
     }
 
+    public boolean getSkipThirdAppconn() {
+        return skipThirdAppconn;
+    }
+
+    public void setSkipThirdAppconn(boolean skipThirdAppconn) {
+        this.skipThirdAppconn = skipThirdAppconn;
+    }
+
     public String getFlowProxyUser() {
         return flowProxyUser;
     }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
@@ -165,10 +165,10 @@ public DSSFlow copyRootFlowWithSubFlows(String userName, Long rootFlowId, Worksp
                                             String projectName, String contextIdStr, String orcVersion,
                                             String description, List<DSSLabel> dssLabels, String nodeSuffix,
                                             String newFlowName, Long newProjectId,List<String> enableNodeList,
-                                            String flowProxyUser) throws DSSErrorException, IOException {
+                                            String flowProxyUser,boolean skipThirdAppconn) throws DSSErrorException, IOException {
         return flowService.copyRootFlow(rootFlowId, userName, workspace, projectName,
                 orcVersion, contextIdStr, description, dssLabels, nodeSuffix, newFlowName, newProjectId,
-                enableNodeList,flowProxyUser);
+                enableNodeList,flowProxyUser,skipThirdAppconn);
     }
 
     @Override
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
@@ -78,7 +78,8 @@ DSSFlow copyRootFlowWithSubFlows(String userName,
                                      List<DSSLabel> dssLabels,String nodeSuffix,
                                      String newFlowName, Long newProjectId,
                                      List<String> enableNodeList,
-                                     String flowProxyUser) throws DSSErrorException, IOException;
+                                     String flowProxyUser,
+                                     boolean skipThirdAppconn) throws DSSErrorException, IOException;
 
 
     DSSFlow queryWorkflow(String userName, Long rootFlowId) throws DSSErrorException;
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
@@ -79,7 +79,7 @@ DSSFlow copyRootFlow(Long rootFlowId, String userName, Workspace workspace,
                          String projectName, String version, String contextIdStr,
                          String description, List<DSSLabel> dssLabels,String nodeSuffix,
                          String newFlowName, Long newProjectId,List<String> enableNodeList,
-                         String flowProxyUser) throws DSSErrorException, IOException;
+                         String flowProxyUser,boolean skipThirdAppconn) throws DSSErrorException, IOException;
 
     Long getParentFlowID(Long id);
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -960,7 +960,7 @@ public DSSFlow copyRootFlow(Long rootFlowId, String userName, Workspace workspac
                                 String projectName, String version, String contextIdStr,
                                 String description, List<DSSLabel> dssLabels, String nodeSuffix,
                                 String newFlowName, Long newProjectId,List<String> enableNodeList,
-                                String flowProxyUser) throws DSSErrorException, IOException {
+                                String flowProxyUser,boolean skipThirdAppconn) throws DSSErrorException, IOException {
         DSSFlow dssFlow = flowMapper.selectFlowByID(rootFlowId);
         Sender orcSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender(dssLabels);
         OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(orcSender.ask(new RequestQuertByAppIdOrchestrator(dssFlow.getId())),
@@ -969,7 +969,7 @@ public DSSFlow copyRootFlow(Long rootFlowId, String userName, Workspace workspac
         deleteFlowMetaData(orchestratorId);
         DSSFlow rootFlowWithSubFlows = copyFlowAndSetSubFlowInDB(dssFlow, userName, description, nodeSuffix, newFlowName, newProjectId);
         updateFlowJson(userName, projectName, rootFlowWithSubFlows, version, null,
-                contextIdStr, workspace, dssLabels, nodeSuffix, orchestratorId,enableNodeList,flowProxyUser);
+                contextIdStr, workspace, dssLabels, nodeSuffix, orchestratorId,enableNodeList,flowProxyUser, skipThirdAppconn);
         DSSFlow copyFlow = flowMapper.selectFlowByID(rootFlowWithSubFlows.getId());
         copyFlow.setFlowIdParamConfTemplateIdTuples(rootFlowWithSubFlows.getFlowIdParamConfTemplateIdTuples());
         return copyFlow;
@@ -1084,7 +1084,7 @@ public void deleteNodeContent(List<Long> flowIdList) {
     private void updateFlowJson(String userName, String projectName, DSSFlow rootFlow,
                                 String version, Long parentFlowId, String contextIdStr,
                                 Workspace workspace, List<DSSLabel> dssLabels, String nodeSuffix,
-                                Long orchestratorId,List<String> enableNodeList,String flowProxyUser) throws DSSErrorException, IOException {
+                                Long orchestratorId,List<String> enableNodeList,String flowProxyUser,boolean skipThirdAppconn) throws DSSErrorException, IOException {
         String flowJson = bmlService.readTextFromBML(userName, rootFlow.getResourceId(), rootFlow.getBmlVersion());
         //如果包含subflow,需要一同导入subflow内容，并更新parrentflow的json内容
         // TODO: 2020/7/31 优化update方法里面的saveContent
@@ -1106,15 +1106,15 @@ private void updateFlowJson(String userName, String projectName, DSSFlow rootFlo
         updateFlowJson = uploadFlowResourceToBml(userName, updateFlowJson, projectName, rootFlow);
         //上传节点的资源或调用appconn的copyRef
         updateFlowJson = updateWorkFlowNodeJsonForMultiThread(userName, projectName, updateFlowJson, rootFlow,
-                version, workspace, dssLabels);
+                version, workspace, dssLabels,skipThirdAppconn);
         // 更新对应节点的FlowJson
         saveFlowMetaData(rootFlow.getId(), updateFlowJson, orchestratorId);
         List<? extends DSSFlow> subFlows = rootFlow.getChildren();
         List<String[]> templateIds = new ArrayList<>();
         if (subFlows != null) {
             for (DSSFlow subflow : subFlows) {
                 updateFlowJson(userName, projectName, subflow, version, rootFlow.getId(),
-                        contextIdStr, workspace, dssLabels, nodeSuffix, orchestratorId,enableNodeList,flowProxyUser);
+                        contextIdStr, workspace, dssLabels, nodeSuffix, orchestratorId,enableNodeList,flowProxyUser,skipThirdAppconn);
                 templateIds.addAll(subflow.getFlowIdParamConfTemplateIdTuples());
             }
         }
@@ -1383,7 +1383,7 @@ private String updateWorkFlowNodeJson(String userName, String projectName,
 
     private String updateWorkFlowNodeJsonForMultiThread(String userName, String projectName,
                                                         String flowJson, DSSFlow dssFlow,
-                                                        String version, Workspace workspace, List<DSSLabel> dssLabels) throws DSSErrorException, IOException{
+                                                        String version, Workspace workspace, List<DSSLabel> dssLabels,boolean skipThirdAppconn) throws DSSErrorException, IOException{
 
         if (StringUtils.isEmpty(version)) {
             logger.warn("version id is null when updateWorkFlowNodeJson");
@@ -1437,7 +1437,7 @@ private String updateWorkFlowNodeJsonForMultiThread(String userName, String proj
                         String msg = String.format("%s note type not exist,please check appconn install successfully", nodeType);
                         logger.error(msg);
                         throw new DSSRuntimeException(msg);
-                    } else if (Boolean.TRUE.equals(nodeInfo.getSupportJump()) && nodeInfo.getJumpType() == 1) {
+                    } else if (!skipThirdAppconn && Boolean.TRUE.equals(nodeInfo.getSupportJump()) && nodeInfo.getJumpType() == 1) {
                         logger.info("nodeJsonMap.jobContent is:{}", nodeJsonMap.get("jobContent"));
                         CommonAppConnNode newNode = new CommonAppConnNode();
                         CommonAppConnNode oldNode = new CommonAppConnNode();
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
@@ -126,7 +126,8 @@ class DSSWorkflowReceiver(workflowManager: WorkFlowManager)  extends Receiver {
         requestCopyWorkflow.getNewFlowName,
         requestCopyWorkflow.getTargetProjectId,
         requestCopyWorkflow.getEnableNodeList,
-        requestCopyWorkflow.getFlowProxyUser)
+        requestCopyWorkflow.getFlowProxyUser,
+        requestCopyWorkflow.getSkipThirdAppconn)
       new ResponseCopyWorkflow(copyFlow)
 
     case requestQueryWorkFlow: RequestQueryWorkFlow =>

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ public Message copyOrchestrator(@RequestBody OrchestratorCopyRequest orchestrato`
`230`	`230`	`return Message.error("当前工作流正在被复制，不允许再次复制");`
`231`	`231`	`}`
`232`	`232`
`233`		`- String copyJobId = orchestratorFrameworkService.copyOrchestrator(username, orchestratorCopyRequest, workspace,null,null);`
	`233`	`+ String copyJobId = orchestratorFrameworkService.copyOrchestrator(username, orchestratorCopyRequest, workspace,null,null,false);`
`234`	`234`	`AuditLogUtils.printLog(username, workspace.getWorkspaceId(), workspace.getWorkspaceName(), TargetTypeEnum.ORCHESTRATOR,`
`235`	`235`	`orchestratorCopyRequest.getSourceOrchestratorId(), orchestratorCopyRequest.getSourceOrchestratorName(), OperateTypeEnum.COPY, orchestratorCopyRequest);`
`236`	`236`