更改_查看用户参数为空,则默认hadoop用户

Author: SunPengWan

dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java

@@ -803,10 +803,12 @@ public Message encryptCopyOrchestrator(@RequestBody EncryptCopyOrchestratorReque
         String username = SecurityFilter.getLoginUsername(httpServletRequest);
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         encryptCopyOrchestratorRequest.setUsername(username);
-        encryptCopyOrchestratorRequest.setAccessUser("hadoop");
-        encryptCopyOrchestratorRequest.setWorkspaceId(workspace.getWorkspaceId());
 
+        if(StringUtils.isEmpty(encryptCopyOrchestratorRequest.getAccessUser())){
+            encryptCopyOrchestratorRequest.setAccessUser("hadoop");
+        }
 
+        encryptCopyOrchestratorRequest.setWorkspaceId(workspace.getWorkspaceId());
 
         LOGGER.info("request encryptCopyOrchestrator body is {}",encryptCopyOrchestratorRequest);
 

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java

@@ -1222,12 +1222,10 @@ private String updateFlowProxyUser(String flowJson,String flowProxyUser,Long orc
 
             // 获取原工作流的代理用户
             String proxyUser = "";
-            if (CollectionUtils.isNotEmpty(props)) {
-                for (Map<String, Object> prop : props) {
-                    if (prop.containsKey("user.to.proxy") && prop.get("user.to.proxy") != null) {
-                        proxyUser = prop.get("user.to.proxy").toString();
-                        break;
-                    }
+            for (Map<String, Object> prop : props) {
+                if (prop.containsKey("user.to.proxy") && prop.get("user.to.proxy") != null) {
+                    proxyUser = prop.get("user.to.proxy").toString();
+                    break;
                 }
             }