From 7435f9177f3957f3faf7540e3c103f57fe1ceb7c Mon Sep 17 00:00:00 2001 From: "luxl@chinatelecom.cn" Date: Fri, 26 Mar 2021 08:50:12 +0800 Subject: [PATCH 1/2] Modify test and project name --- .../wedatasphere/dss/server/restful/UserManagerApi.java | 2 +- dss-server/src/main/resources/linkis.properties | 2 +- dss-server/src/main/test/com/webank/TestUnit.java | 4 ++-- .../wedatasphpere/dss/user/conf/DSSUserManagerConfig.java | 2 +- .../webank/wedatasphpere/dss/user/service/MacroCommand.java | 2 +- .../wedatasphpere/dss/user/service/impl/LdapCommand.java | 2 +- .../wedatasphpere/dss/user/service/impl/LinuxUserCommand.java | 2 +- .../dss/user/service/impl/UserAuthorizationClient.java | 2 +- .../wedatasphpere/dss/user/service/impl/UserMacroCommand.java | 2 +- .../wedatasphpere/dss/user/service/impl/WorkspaceCommand.java | 2 +- .../wedatasphpere/dss/user/service/impl/YarnCommand.java | 2 +- dss-user-manager/src/main/resources/read_anlexander.txt | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/UserManagerApi.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/UserManagerApi.java index 72a853c318..eefc62e1aa 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/UserManagerApi.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/UserManagerApi.java @@ -22,7 +22,7 @@ import javax.ws.rs.core.Response; /** - * @program: luban-authorization + * @program: user-authorization * @description: 鲁班对外交互的接口 包括施工 注册用户 * @author: luxl@chinatelecom.cn * @create: 2020-08-12 14:24 diff --git a/dss-server/src/main/resources/linkis.properties b/dss-server/src/main/resources/linkis.properties index 29d756063c..97be7db018 100644 --- a/dss-server/src/main/resources/linkis.properties +++ b/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 \ No newline at end of file +wds.dss.scheduler.url=/schedule/system \ No newline at end of file diff --git a/dss-server/src/main/test/com/webank/TestUnit.java b/dss-server/src/main/test/com/webank/TestUnit.java index 995c4738ea..07c619ae98 100644 --- a/dss-server/src/main/test/com/webank/TestUnit.java +++ b/dss-server/src/main/test/com/webank/TestUnit.java @@ -1,6 +1,6 @@ package com.webank; -import com.webank.wedatasphpere.dss.user.service.impl.LubanAuthorizationClient; +import com.webank.wedatasphpere.dss.user.service.impl.UserAuthorizationClient; import org.junit.Test; public class TestUnit { @@ -8,7 +8,7 @@ public class TestUnit { @Test public void test() throws Exception { - LubanAuthorizationClient lubanAuthorizationClient = new LubanAuthorizationClient(); + UserAuthorizationClient UserAuthorizationClient = new UserAuthorizationClient(); } } diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/conf/DSSUserManagerConfig.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/conf/DSSUserManagerConfig.java index 1baa320f8c..69d59c9e0b 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/conf/DSSUserManagerConfig.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/conf/DSSUserManagerConfig.java @@ -53,7 +53,7 @@ public class DSSUserManagerConfig { public static final String KERBEROS_KDC_USER_PASSWORD = CommonVars.apply("wds.linkis.kerberos.kdc.user.password", "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(); + public static final String DSS_SCHEDULER_URL = CommonVars.apply("wds.dss.scheduler.url", "/schedule/system").getValue().trim(); diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/MacroCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/MacroCommand.java index 3451d57f45..092b585231 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/MacroCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/MacroCommand.java @@ -20,7 +20,7 @@ /** - * @program: luban-authorization + * @program: user-authorization * @description: 开通命令接口 * @author: luxl@chinatelecom.cn * @create: 2020-08-10 14:24 diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LdapCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LdapCommand.java index 41baa43616..0c44c96de6 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LdapCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LdapCommand.java @@ -30,7 +30,7 @@ import java.util.List; /** - * @program: luban-authorization + * @program: user-authorization * @description: 创建用户空间 * @author: luxl@chinatelecom.cn * @create: 2020-08-13 13:39 diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LinuxUserCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LinuxUserCommand.java index 33310ba9ff..cf9f73ca25 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LinuxUserCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LinuxUserCommand.java @@ -25,7 +25,7 @@ import java.util.ArrayList; /** - * @program: luban-authorization + * @program: user-authorization * @description: 创建用户空间 * @author: luxl@chinatelecom.cn * @create: 2020-08-13 13:39 diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserAuthorizationClient.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserAuthorizationClient.java index a7c0f385d8..c26575268e 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserAuthorizationClient.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserAuthorizationClient.java @@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory; /** - * @program: luban-authorization + * @program: user-authorization * @description: * @author: luxl@chinatelecom.cn * @create: 2020-08-10 14:24 diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserMacroCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserMacroCommand.java index 2893183aaf..620d28c71d 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserMacroCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserMacroCommand.java @@ -35,7 +35,7 @@ import java.util.concurrent.ExecutionException; /** - * @program: luban-authorization + * @program: user-authorization * @description: 开通命令实现 * @author: luxl@chinatelecom.cn * @create: 2020-08-10 14:24 diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/WorkspaceCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/WorkspaceCommand.java index 6b2810b4ea..214b80d1c0 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/WorkspaceCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/WorkspaceCommand.java @@ -26,7 +26,7 @@ import java.util.List; /** - * @program: luban-authorization + * @program: user-authorization * @description: 创建用户空间 * @author: luxl@chinatelecom.cn * @create: 2020-08-13 13:39 diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/YarnCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/YarnCommand.java index 0bd9d687b7..6a21299a11 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/YarnCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/YarnCommand.java @@ -24,7 +24,7 @@ import com.webank.wedatasphpere.dss.user.service.Command; /** - * @program: luban-authorization + * @program: user-authorization * @description: 开通yarn权限的实现 * @author: luxl@chinatelecom.cn * @create: 2020-08-10 14:24 diff --git a/dss-user-manager/src/main/resources/read_anlexander.txt b/dss-user-manager/src/main/resources/read_anlexander.txt index ba5b3d9399..fc60487e09 100644 --- a/dss-user-manager/src/main/resources/read_anlexander.txt +++ b/dss-user-manager/src/main/resources/read_anlexander.txt @@ -1,7 +1,7 @@ 一键化开通账户 服务目录结构： 进入口调用： - 入口调用：dss-user-manager\src\main\java\com\webank\wedatasphpere\dss\user\service\impl\LubanAuthorizationClient.java + 入口调用：dss-user-manager\src\main\java\com\webank\wedatasphpere\dss\user\service\impl\UserAuthorizationClient.java #参考配置文件resource/config/properties.conf #metastore功能使用说明 From e057de03ca9bc1691de485d0283d655d85464908 Mon Sep 17 00:00:00 2001 From: "luxl@chinatelecom.cn" Date: Fri, 26 Mar 2021 14:56:07 +0800 Subject: [PATCH 2/2] delete author info --- .../webank/wedatasphere/dss/server/restful/UserManagerApi.java | 1 - .../wedatasphpere/dss/user/conf/DSSUserManagerConfig.java | 2 +- .../wedatasphpere/dss/user/dto/request/AuthorizationBody.java | 2 +- .../com/webank/wedatasphpere/dss/user/service/MacroCommand.java | 2 +- .../wedatasphpere/dss/user/service/impl/AzkabanCommand.java | 2 +- .../wedatasphpere/dss/user/service/impl/KerberosCommand.java | 1 - .../webank/wedatasphpere/dss/user/service/impl/LdapCommand.java | 2 +- .../wedatasphpere/dss/user/service/impl/LinuxUserCommand.java | 2 +- .../wedatasphpere/dss/user/service/impl/MetastoreCommand.java | 1 - .../wedatasphpere/dss/user/service/impl/SchedulisCommand.java | 1 - .../dss/user/service/impl/UserAuthorizationClient.java | 2 +- .../wedatasphpere/dss/user/service/impl/UserMacroCommand.java | 2 +- .../wedatasphpere/dss/user/service/impl/WorkspaceCommand.java | 2 +- .../webank/wedatasphpere/dss/user/service/impl/YarnCommand.java | 2 +- 14 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/UserManagerApi.java b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/UserManagerApi.java index eefc62e1aa..a249e7ae3b 100644 --- a/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/UserManagerApi.java +++ b/dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/UserManagerApi.java @@ -24,7 +24,6 @@ /** * @program: user-authorization * @description: 鲁班对外交互的接口 包括施工 注册用户 - * @author: luxl@chinatelecom.cn * @create: 2020-08-12 14:24 **/ diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/conf/DSSUserManagerConfig.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/conf/DSSUserManagerConfig.java index 69d59c9e0b..731194cc49 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/conf/DSSUserManagerConfig.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/conf/DSSUserManagerConfig.java @@ -25,7 +25,7 @@ /** * @program: dss-appjoint-auth * @description: 用户模块配置文件 - * @author: luxl@chinatelecom.cn + * * @create: 2020-12-30 16:26 **/ diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/dto/request/AuthorizationBody.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/dto/request/AuthorizationBody.java index 4301410e6b..250f66f169 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/dto/request/AuthorizationBody.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/dto/request/AuthorizationBody.java @@ -25,7 +25,7 @@ /** * @program: user-manager * @description: 施工单数据结构 - * @author: luxl@chinatelecom.cn + * * @create: 2020-08-12 14:29 **/ public class AuthorizationBody { diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/MacroCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/MacroCommand.java index 092b585231..0d2d3431cf 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/MacroCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/MacroCommand.java @@ -22,7 +22,7 @@ /** * @program: user-authorization * @description: 开通命令接口 - * @author: luxl@chinatelecom.cn + * * @create: 2020-08-10 14:24 **/ public interface MacroCommand extends Command { diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/AzkabanCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/AzkabanCommand.java index 49e81215fd..2f85ae38b3 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/AzkabanCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/AzkabanCommand.java @@ -37,7 +37,7 @@ /** * @program: dss-appjoint-auth * @description: 开通azkaban账号 - * @author: luxl@chinatelecom.cn + * * @create: 2021-01-08 15:53 **/ diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/KerberosCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/KerberosCommand.java index ff4f483f13..ef120f19e7 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/KerberosCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/KerberosCommand.java @@ -30,7 +30,6 @@ import java.net.InetAddress; /** - * @author anlexander * @date 2021/1/5 */ public class KerberosCommand extends AbsCommand { diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LdapCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LdapCommand.java index 0c44c96de6..31c2ecdbbf 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LdapCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LdapCommand.java @@ -32,7 +32,7 @@ /** * @program: user-authorization * @description: 创建用户空间 - * @author: luxl@chinatelecom.cn + * * @create: 2020-08-13 13:39 **/ diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LinuxUserCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LinuxUserCommand.java index cf9f73ca25..10a567e216 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LinuxUserCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/LinuxUserCommand.java @@ -27,7 +27,7 @@ /** * @program: user-authorization * @description: 创建用户空间 - * @author: luxl@chinatelecom.cn + * * @create: 2020-08-13 13:39 **/ diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/MetastoreCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/MetastoreCommand.java index 3a002bd8fe..6076919192 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/MetastoreCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/MetastoreCommand.java @@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory; /** - * @author anlexander * @date 2021/1/5 */ public class MetastoreCommand extends AbsCommand { diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/SchedulisCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/SchedulisCommand.java index 3a45acd6ba..73351943b9 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/SchedulisCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/SchedulisCommand.java @@ -45,7 +45,6 @@ import org.springframework.web.util.UriComponentsBuilder; /** - * @author litongtong * @date 2021/1/11 */ public class SchedulisCommand extends AbsCommand { diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserAuthorizationClient.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserAuthorizationClient.java index c26575268e..fd275a0e4b 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserAuthorizationClient.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserAuthorizationClient.java @@ -28,7 +28,7 @@ /** * @program: user-authorization * @description: - * @author: luxl@chinatelecom.cn + * * @create: 2020-08-10 14:24 **/ public class UserAuthorizationClient { diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserMacroCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserMacroCommand.java index 620d28c71d..c842e666c3 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserMacroCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/UserMacroCommand.java @@ -37,7 +37,7 @@ /** * @program: user-authorization * @description: 开通命令实现 - * @author: luxl@chinatelecom.cn + * * @create: 2020-08-10 14:24 **/ public class UserMacroCommand implements MacroCommand { diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/WorkspaceCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/WorkspaceCommand.java index 214b80d1c0..37b9f95972 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/WorkspaceCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/WorkspaceCommand.java @@ -28,7 +28,7 @@ /** * @program: user-authorization * @description: 创建用户空间 - * @author: luxl@chinatelecom.cn + * * @create: 2020-08-13 13:39 **/ diff --git a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/YarnCommand.java b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/YarnCommand.java index 6a21299a11..a4d854780a 100644 --- a/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/YarnCommand.java +++ b/dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/service/impl/YarnCommand.java @@ -26,7 +26,7 @@ /** * @program: user-authorization * @description: 开通yarn权限的实现 - * @author: luxl@chinatelecom.cn + * * @create: 2020-08-10 14:24 **/ public class YarnCommand extends AbsCommand {