Skip to content

Commit

Permalink
Merge pull request #297 from kingsGlory/dev-0.9.1
Browse files Browse the repository at this point in the history
Modify test and project name
  • Loading branch information
wushengyeyouya authored Mar 26, 2021
2 parents 92f1fb7 + e057de0 commit d75b85f
Show file tree
Hide file tree
Showing 17 changed files with 23 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@
import javax.ws.rs.core.Response;

/**
* @program: luban-authorization
* @program: user-authorization
* @description: 鲁班对外交互的接口 包括施工 注册用户
* @author: [email protected]
* @create: 2020-08-12 14:24
**/

Expand Down
2 changes: 1 addition & 1 deletion dss-server/src/main/resources/linkis.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
wds.dss.scheduler.url=/schedule/system
4 changes: 2 additions & 2 deletions dss-server/src/main/test/com/webank/TestUnit.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
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 {

@Test
public void test() throws Exception {

LubanAuthorizationClient lubanAuthorizationClient = new LubanAuthorizationClient();
UserAuthorizationClient UserAuthorizationClient = new UserAuthorizationClient();

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/**
* @program: dss-appjoint-auth
* @description: 用户模块配置文件
* @author: [email protected]
*
* @create: 2020-12-30 16:26
**/

Expand Down Expand Up @@ -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();



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/**
* @program: user-manager
* @description: 施工单数据结构
* @author: [email protected]
*
* @create: 2020-08-12 14:29
**/
public class AuthorizationBody {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@


/**
* @program: luban-authorization
* @program: user-authorization
* @description: 开通命令接口
* @author: [email protected]
*
* @create: 2020-08-10 14:24
**/
public interface MacroCommand extends Command {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
/**
* @program: dss-appjoint-auth
* @description: 开通azkaban账号
* @author: [email protected]
*
* @create: 2021-01-08 15:53
**/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import java.net.InetAddress;

/**
* @author anlexander
* @date 2021/1/5
*/
public class KerberosCommand extends AbsCommand {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
import java.util.List;

/**
* @program: luban-authorization
* @program: user-authorization
* @description: 创建用户空间
* @author: [email protected]
*
* @create: 2020-08-13 13:39
**/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
import java.util.ArrayList;

/**
* @program: luban-authorization
* @program: user-authorization
* @description: 创建用户空间
* @author: [email protected]
*
* @create: 2020-08-13 13:39
**/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.slf4j.LoggerFactory;

/**
* @author anlexander
* @date 2021/1/5
*/
public class MetastoreCommand extends AbsCommand {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import org.springframework.web.util.UriComponentsBuilder;

/**
* @author litongtong
* @date 2021/1/11
*/
public class SchedulisCommand extends AbsCommand {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import org.slf4j.LoggerFactory;

/**
* @program: luban-authorization
* @program: user-authorization
* @description:
* @author: [email protected]
*
* @create: 2020-08-10 14:24
**/
public class UserAuthorizationClient {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
import java.util.concurrent.ExecutionException;

/**
* @program: luban-authorization
* @program: user-authorization
* @description: 开通命令实现
* @author: [email protected]
*
* @create: 2020-08-10 14:24
**/
public class UserMacroCommand implements MacroCommand {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import java.util.List;

/**
* @program: luban-authorization
* @program: user-authorization
* @description: 创建用户空间
* @author: [email protected]
*
* @create: 2020-08-13 13:39
**/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import com.webank.wedatasphpere.dss.user.service.Command;

/**
* @program: luban-authorization
* @program: user-authorization
* @description: 开通yarn权限的实现
* @author: [email protected]
*
* @create: 2020-08-10 14:24
**/
public class YarnCommand extends AbsCommand {
Expand Down
2 changes: 1 addition & 1 deletion dss-user-manager/src/main/resources/read_anlexander.txt
Original file line number Diff line number Diff line change
@@ -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功能使用说明
Expand Down

0 comments on commit d75b85f

Please sign in to comment.