add notes in English

Author: HanTang1

dss-server/src/main/java/com/webank/wedatasphere/dss/server/constant/DSSServerConstant.java

@@ -24,10 +24,10 @@ public class DSSServerConstant {
     public static final String DSS_PROJECT_SOURCE = "create by user";
     public static final String DSS_WORKSPACE_SOURCE = "create by user";
     public static final String PROJECT_VERSION_ID = "projectVersionID";
-    public static final String PUBLISH_FLOW_REPORT_FORMATE = "工作流名:%s,版本号:%s，工作流内容为空,请自行修改或者删除";
+    public static final String PUBLISH_FLOW_REPORT_FORMATE = "the workflow name is% s, the version number is% s, and the workflow content is empty. Please modify or delete it by yourself";
     public static final String EMVEDDEDFLOWID = "\"embeddedFlowId\":";
     public static final String VERSION_FORMAT = "%06d";
     public static final String VERSION_PREFIX = "v";
-    public static final String SUPER_USER_LOGIN_ERROR = "没有创建权限，请使用超级用户登录";
+    public static final String SUPER_USER_LOGIN_ERROR = "please login with super user";
 
 }

dss-server/src/main/resources/linkis.properties

@@ -68,4 +68,4 @@ wds.linkis.kerberos.kdc.user.password=
 wds.linkis.kerberos.ssh.port=22
 wds.dss.deploy.path=/usr/local/dss_linkis
 wds.dss.user.account.command.class=com.webank.wedatasphpere.dss.user.service.impl.LinuxUserCommand,com.webank.wedatasphpere.dss.user.service.impl.KerberosCommand,com.webank.wedatasphpere.dss.user.service.impl.LdapCommand,com.webank.wedatasphpere.dss.user.service.impl.WorkspaceCommand,com.webank.wedatasphpere.dss.user.service.impl.MetastoreCommand,com.webank.wedatasphpere.dss.user.service.impl.AzkabanCommand
-
+wds.dss.scheduler.url=/luban/schedule/system

dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/conf/DSSUserManagerConfig.java

@@ -33,7 +33,10 @@ public class DSSUserManagerConfig {
     public static final String KERBEROS_KDC_NODE = CommonVars.apply("wds.linkis.kerberos.kdc.node", "null").getValue().trim();
     public static final String KERBEROS_KDC_USER_NAME = CommonVars.apply("wds.linkis.kerberos.kdc.user.name", "null").getValue().trim();
     public static final String KERBEROS_KDC_USER_PASSWORD = CommonVars.apply("wds.linkis.kerberos.kdc.user.password", "null").getValue().trim();
-    public static final String KEBBEROS_ENABLE_SWITCH = CommonVars.apply("wds.linkis.kerberos.enable.switch", "null").getValue().trim();
+    public static final String KERBEROS_ENABLE_SWITCH = CommonVars.apply("wds.linkis.kerberos.enable.switch", "null").getValue().trim();
     public static final String DSS_DEPLOY_PATH = CommonVars.apply("wds.dss.deploy.path", "null").getValue().trim();
+    public static final String DSS_SCHEDULER_URL = CommonVars.apply("wds.dss.scheduler.url", "/luban/schedule/system").getValue().trim();
+
+
 
 }

dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/AbsCommand.java

@@ -37,7 +37,7 @@ public String renew(AuthorizationBody body) {
     public String authorization(AuthorizationBody body) throws IOException, Exception { return Command.SUCCESS; }
 
     public String toMessage(String msg) {
-        return this.getClass().getSimpleName() + "模块开始执行："+ msg;
+        return this.getClass().getSimpleName() + "the module starts execution"+ msg;
     }
 
     protected String runShell(String scriptPath, String[] args){

dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/KerberosCommand.java

@@ -30,7 +30,7 @@ private String createKt(AuthorizationBody body) throws Exception {
         if(userName != null){
             res = callShell(DSSUserManagerConfig.KERBEROS_SCRIPT_PATH, userName,hostName,
                     DSSUserManagerConfig.KERBEROS_KEYTAB_PATH,DSSUserManagerConfig.KERBEROS_SSH_PORT,
-                    DSSUserManagerConfig.KERBEROS_KDC_NODE,DSSUserManagerConfig.KERBEROS_KDC_USER_NAME,DSSUserManagerConfig.KERBEROS_KDC_USER_PASSWORD,DSSUserManagerConfig.KERBEROS_REALM,DSSUserManagerConfig.KEBBEROS_ENABLE_SWITCH);
+                    DSSUserManagerConfig.KERBEROS_KDC_NODE,DSSUserManagerConfig.KERBEROS_KDC_USER_NAME,DSSUserManagerConfig.KERBEROS_KDC_USER_PASSWORD,DSSUserManagerConfig.KERBEROS_REALM,DSSUserManagerConfig.KERBEROS_ENABLE_SWITCH);
         }
         return res;
     }

dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/MetastoreCommand.java

@@ -28,11 +28,11 @@ private String createDb(AuthorizationBody body) throws Exception {
         String[] args = null;
         String userName = body.getUsername();
         if (userName != null) {
-            String dbName = userName + DSSUserManagerConfig.METASTORE_DB_TAIL;
-            String path = DSSUserManagerConfig.METASTORE_HDFS_PATH + "/"+dbName+".db";
-            bashCommand = getResource(DSSUserManagerConfig.METASTORE_SCRIPT_PAHT);
-            args = new String[]{ userName,dbName,path,
-                    DSSUserManagerConfig.KERBEROS_REALM,DSSUserManagerConfig.KERBEROS_ADMIN,DSSUserManagerConfig.KERBEROS_KEYTAB_PATH,DSSUserManagerConfig.KEBBEROS_ENABLE_SWITCH};
+                String dbName = userName + DSSUserManagerConfig.METASTORE_DB_TAIL;
+                String path = DSSUserManagerConfig.METASTORE_HDFS_PATH + "/"+dbName+".db";
+                bashCommand = getResource(DSSUserManagerConfig.METASTORE_SCRIPT_PAHT);
+                args = new String[]{ userName,dbName,path,
+                        DSSUserManagerConfig.KERBEROS_REALM,DSSUserManagerConfig.KERBEROS_ADMIN,DSSUserManagerConfig.KERBEROS_KEYTAB_PATH,DSSUserManagerConfig.KERBEROS_ENABLE_SWITCH};
         }
         return this.runShell(bashCommand, args);
     }

dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/SchedulisCommand.java

@@ -83,10 +83,11 @@ private static Connection getConnection() {
     }
 
     private boolean addSchedulisUser(String username, String password) {
+        String schedulerUrl = DSSUserManagerConfig.DSS_SCHEDULER_URL;
         RestTemplate restTemplate = new RestTemplate();
         String schedulisUrl = DSSUserManagerConfig.SCHEDULER_ADDRESS;
         String url = new StringBuilder().append(schedulisUrl)
-            .append("/luban/schedule/system")
+            .append(schedulerUrl)
             .toString();
         Map<String, String> params = new HashMap<>(4);
         params.put("userId", username);

dss-user-manager/src/main/resources/default/CreateLinuxUser.sh

@@ -15,10 +15,10 @@ do
    echo "${server_host},${server_user_name},${server_user_password}"
 
    sudo sshpass -p $server_user_password ssh -o ConnectTimeout=1  $server_user_name@$server_host "echo success"
-   [ $? -ne 0 ] && echo "登录主机${server_host}失败" && exit 254
+   [ $? -ne 0 ] && echo "logon server:${server_host} failed" && exit 254
 done
 
-echo "************服务器网络校验通过,开始创建用户*****************"
+echo "************Start creating user*****************"
 
 for server_user_str in ${server_user_array[@]}
 do
@@ -27,9 +27,8 @@ do
    server_host=${server_user_info[0]}
    server_user_name=${server_user_info[1]}
    server_user_password=${server_user_info[2]}
-
    #sshpass -p $server_user_password ssh $server_user_name@$server_host "sudo useradd $add_user_name && echo $add_user_password |sudo -i  passwd --stdin $add_user_name"
-    sshpass -p $server_user_password ssh $server_user_name@$server_host "sudo useradd $add_user_name -s /sbin/nologin"
+   sshpass -p $server_user_password ssh $server_user_name@$server_host "sudo useradd $add_user_name -s /sbin/nologin"
 
-   [ $? -ne 0 ] && echo "创建用户失败：${host}失败" && exit 254
+   [ $? -ne 0 ] && echo "create user failed:${host}" && exit 254
 done