Skip to content

Commit d75b85f

Browse files
Merge pull request #297 from kingsGlory/dev-0.9.1
Modify test and project name
2 parents 92f1fb7 + e057de0 commit d75b85f

File tree

17 files changed

+23
-27
lines changed

17 files changed

+23
-27
lines changed

dss-server/src/main/java/com/webank/wedatasphere/dss/server/restful/UserManagerApi.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222
import javax.ws.rs.core.Response;
2323

2424
/**
25-
* @program: luban-authorization
25+
* @program: user-authorization
2626
* @description: 鲁班对外交互的接口 包括施工 注册用户
27-
* @author: luxl@chinatelecom.cn
2827
* @create: 2020-08-12 14:24
2928
**/
3029

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ wds.linkis.kerberos.kdc.user.password=
6868
wds.linkis.kerberos.ssh.port=22
6969
wds.dss.deploy.path=/usr/local/dss_linkis
7070
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
71-
wds.dss.scheduler.url=/luban/schedule/system
71+
wds.dss.scheduler.url=/schedule/system
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.webank;
22

3-
import com.webank.wedatasphpere.dss.user.service.impl.LubanAuthorizationClient;
3+
import com.webank.wedatasphpere.dss.user.service.impl.UserAuthorizationClient;
44
import org.junit.Test;
55

66
public class TestUnit {
77

88
@Test
99
public void test() throws Exception {
1010

11-
LubanAuthorizationClient lubanAuthorizationClient = new LubanAuthorizationClient();
11+
UserAuthorizationClient UserAuthorizationClient = new UserAuthorizationClient();
1212

1313
}
1414
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* @program: dss-appjoint-auth
2727
* @description: 用户模块配置文件
28-
* @author: luxl@chinatelecom.cn
28+
*
2929
* @create: 2020-12-30 16:26
3030
**/
3131

@@ -53,7 +53,7 @@ public class DSSUserManagerConfig {
5353
public static final String KERBEROS_KDC_USER_PASSWORD = CommonVars.apply("wds.linkis.kerberos.kdc.user.password", "null").getValue().trim();
5454
public static final String KERBEROS_ENABLE_SWITCH = CommonVars.apply("wds.linkis.kerberos.enable.switch", "null").getValue().trim();
5555
public static final String DSS_DEPLOY_PATH = CommonVars.apply("wds.dss.deploy.path", "null").getValue().trim();
56-
public static final String DSS_SCHEDULER_URL = CommonVars.apply("wds.dss.scheduler.url", "/luban/schedule/system").getValue().trim();
56+
public static final String DSS_SCHEDULER_URL = CommonVars.apply("wds.dss.scheduler.url", "/schedule/system").getValue().trim();
5757

5858

5959

dss-user-manager/src/main/java/com/webank/wedatasphpere/dss/user/dto/request/AuthorizationBody.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* @program: user-manager
2727
* @description: 施工单数据结构
28-
* @author: luxl@chinatelecom.cn
28+
*
2929
* @create: 2020-08-12 14:29
3030
**/
3131
public class AuthorizationBody {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121

2222
/**
23-
* @program: luban-authorization
23+
* @program: user-authorization
2424
* @description: 开通命令接口
25-
* @author: luxl@chinatelecom.cn
25+
*
2626
* @create: 2020-08-10 14:24
2727
**/
2828
public interface MacroCommand extends Command {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/**
3838
* @program: dss-appjoint-auth
3939
* @description: 开通azkaban账号
40-
* @author: luxl@chinatelecom.cn
40+
*
4141
* @create: 2021-01-08 15:53
4242
**/
4343

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.net.InetAddress;
3131

3232
/**
33-
* @author anlexander
3433
* @date 2021/1/5
3534
*/
3635
public class KerberosCommand extends AbsCommand {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import java.util.List;
3131

3232
/**
33-
* @program: luban-authorization
33+
* @program: user-authorization
3434
* @description: 创建用户空间
35-
* @author: luxl@chinatelecom.cn
35+
*
3636
* @create: 2020-08-13 13:39
3737
**/
3838

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import java.util.ArrayList;
2626

2727
/**
28-
* @program: luban-authorization
28+
* @program: user-authorization
2929
* @description: 创建用户空间
30-
* @author: luxl@chinatelecom.cn
30+
*
3131
* @create: 2020-08-13 13:39
3232
**/
3333

0 commit comments

Comments
 (0)