Merge pull request #963 from peacewong/dev-1.0.2

Optimize BML default download user default jvm user
apache · Aug 17, 2021 · 0850689 · 0850689
2 parents b3f0ef8 + f404402
commit 0850689
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...ml-server/src/main/java/com/webank/wedatasphere/linkis/bml/restful/BmlProjectRestful.java b/...ml-server/src/main/java/com/webank/wedatasphere/linkis/bml/restful/BmlProjectRestful.java
@@ -21,6 +21,7 @@
 import com.webank.wedatasphere.linkis.bml.common.BmlProjectNoEditException;
 import com.webank.wedatasphere.linkis.bml.common.BmlResourceExpiredException;
 import com.webank.wedatasphere.linkis.bml.common.BmlServerParaErrorException;
+import com.webank.wedatasphere.linkis.bml.conf.BmlServerConfiguration;
 import com.webank.wedatasphere.linkis.bml.service.*;
 import com.webank.wedatasphere.linkis.bml.util.HttpRequestHelper;
 import com.webank.wedatasphere.linkis.common.exception.ErrorException;
@@ -58,7 +59,7 @@ public class BmlProjectRestful {
     private static final String PROJECT_NAME_STR = "projectName";
     private static final String EDIT_USERS_STR = "editUsers";
     private static final String ACCESS_USERS_STR = "accessUsers";
-    public static final String DEFAULT_PROXY_USER = "hadoop";
+    public static final String DEFAULT_PROXY_USER = BmlServerConfiguration.BML_DEFAULT_PROXY_USER().getValue();
 
     @Autowired
     private BmlProjectService bmlProjectService;

diff --git a/...erver/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlServerConfiguration.scala b/...erver/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlServerConfiguration.scala
@@ -18,6 +18,7 @@ package com.webank.wedatasphere.linkis.bml.conf
 import java.util.concurrent.TimeUnit
 
 import com.webank.wedatasphere.linkis.common.conf.CommonVars
+import com.webank.wedatasphere.linkis.common.utils.Utils
 
 object BmlServerConfiguration {
   val BML_HDFS_PREFIX = CommonVars("wds.linkis.bml.hdfs.prefix", "/apps-data")
@@ -32,4 +33,7 @@ object BmlServerConfiguration {
 
   val BML_MAX_THREAD_SIZE:CommonVars[Int] = CommonVars[Int]("wds.linkis.server.maxThreadSize", 30)
 
+
+  val BML_DEFAULT_PROXY_USER = CommonVars("wds.linkis.bml.default.proxy.user", Utils.getJvmUser)
+
 }