Skip to content

Commit

Permalink
fix info
Browse files Browse the repository at this point in the history
  • Loading branch information
xlinliu committed Nov 28, 2024
1 parent f9e6d76 commit 4bcfcc1
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion assembly/bin/appconn-install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ executeSQL
echo ""

echo "step4:refresh appconn load"
curl -H "Token-Code:BML-AUTH" -H "Token-User:hadoop" -X GET http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}/api/rest_j/v1/dss/framework/project/appconn/${APPCONN_NAME}/load
curl -H "Token-Code:" -H "Token-User:hadoop" -X GET http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}/api/rest_j/v1/dss/framework/project/appconn/${APPCONN_NAME}/load
echo ""

echo ""
Expand Down
2 changes: 1 addition & 1 deletion conf/dss-flow-execution-server.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ wds.linkis.server.version=v1
wds.linkis.server.socket.mode=true

wds.linkis.client.flow.adminuser=ws
wds.linkis.client.flow.author.user.token=WS-AUTH
wds.linkis.client.flow.author.user.token=

wds.linkis.server.component.exclude.classes=org.apache.linkis.entranceclient.conf.ClientForEntranceSpringConfiguration,org.apache.linkis.entranceclient.conf.ClientSpringConfiguration

Expand Down
2 changes: 1 addition & 1 deletion conf/dss-framework-orchestrator-server.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ wds.linkis.server.mybatis.typeAliasesPackage=com.webank.wedatasphere.dss.server.
wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.dss.framework.appconn.dao,com.webank.wedatasphere.dss.orchestrator.core.dao,com.webank.wedatasphere.dss.server.dao,com.webank.wedatasphere.dss.application.dao,com.webank.wedatasphere.dss.workspace.mapper,com.webank.wedatasphere.dss.workspace.common.dao,com.webank.wedatasphere.dss.workspace.common.dao,com.webank.wedatasphere.dss.orchestrator.db.dao

wds.dss.appconn.scheduler.project.store.dir=file:///appcom/tmp/wds/scheduler
wds.dss.appconn.scheduler.azkaban.login.passwd=userpwd
wds.dss.appconn.scheduler.azkaban.login.passwd=
##export file dir
wds.dss.server.export.url=/appcom/tmp/dss
2 changes: 1 addition & 1 deletion ...appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/conf/AzkabanConf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

public class AzkabanConf {
public static final CommonVars<String> DEFAULT_STORE_PATH = CommonVars.apply("wds.dss.appconn.scheduler.project.store.dir", "/appcom/tmp/wds/dss");
public static final CommonVars<String> AZKABAN_LOGIN_PWD = CommonVars.apply("wds.dss.appconn.scheduler.azkaban.login.passwd", "userpwd");
public static final CommonVars<String> AZKABAN_LOGIN_PWD = CommonVars.apply("wds.dss.appconn.scheduler.azkaban.login.passwd", "");
public static final CommonVars<String> LINKIS_VERSION = CommonVars.apply("wds.dss.appconn.scheduler.linkis.version", "1.0.0");
public static final CommonVars<String> JOB_LABEL = CommonVars.apply("wds.dss.appconn.scheduler.job.label", "prod");

Expand Down
6 changes: 3 additions & 3 deletions ...s-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/visualis/utils/HttpUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static String sendPostReq(String url, String params,
HttpPost httpPost = new HttpPost(url);
httpPost.addHeader(HTTP.CONTENT_ENCODING, "UTF-8");
httpPost.addHeader("Token-User",user);
httpPost.addHeader("Token-Code", "WS-AUTH");
httpPost.addHeader("Token-Code", "");
CookieStore cookieStore = new BasicCookieStore();
logger.info("Http request params is :"+params);
StringEntity entity = entity = new StringEntity(params);
Expand Down Expand Up @@ -73,7 +73,7 @@ public static String sendHttpDelete(String url,String user) throws Exception {
logger.info("sendDeleteReq url is: "+url);
httpdelete.addHeader(HTTP.CONTENT_ENCODING, "UTF-8");
httpdelete.addHeader("Token-User",user);
httpdelete.addHeader("Token-Code","WS-AUTH");
httpdelete.addHeader("Token-Code","");
CookieStore cookieStore = new BasicCookieStore();
CloseableHttpClient httpClient = null;
CloseableHttpResponse response = null;
Expand All @@ -100,7 +100,7 @@ public static String sendHttpPut(String url, String params,
HttpPut httpPut = new HttpPut(url);
httpPut.addHeader(HTTP.CONTENT_ENCODING, "UTF-8");
httpPut.addHeader("Token-User",user);
httpPut.addHeader("Token-Code","WS-AUTH");
httpPut.addHeader("Token-Code","");
CookieStore cookieStore = new BasicCookieStore();
logger.info("Http put params is :"+params);
StringEntity entity = null;
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/webank/wedatasphere/dss/appconn/manager/conf/AppConnManagerClientConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

public class AppConnManagerClientConfiguration {

public final static CommonVars<String> DSS_APPCONN_CLIENT_TOKEN = CommonVars.apply("wds.dss.appconn.client.user.token","WS-AUTH");
public final static CommonVars<String> DSS_APPCONN_CLIENT_TOKEN = CommonVars.apply("wds.dss.appconn.client.user.token","");
public final static CommonVars<String> LINKIS_ADMIN_USER = CommonVars.apply("wds.dss.appconn.client.user","ws");


Expand Down
2 changes: 1 addition & 1 deletion ...main/java/com/webank/wedatasphere/dss/apiservice/core/config/ApiServiceConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


public class ApiServiceConfiguration {
public final static CommonVars<String> LINKIS_AUTHOR_USER_TOKEN = CommonVars.apply("wds.linkis.client.api.service.author.user.token","WS-AUTH");
public final static CommonVars<String> LINKIS_AUTHOR_USER_TOKEN = CommonVars.apply("wds.linkis.client.api.service.author.user.token","");
public final static CommonVars<String> LINKIS_ADMIN_USER = CommonVars.apply("wds.linkis.client.api.service.adminuser","ws");

public final static CommonVars<Integer> LINKIS_CONNECTION_TIMEOUT = CommonVars.apply("wds.linkis.flow.connection.timeout",30000);
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/com/webank/wedatasphere/dss/datapipe/config/DataPipeServiceConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


public class DataPipeServiceConfiguration {
public final static CommonVars<String> LINKIS_AUTHOR_USER_TOKEN = CommonVars.apply("wds.linkis.client.api.service.author.user.token","WS-AUTH");
public final static CommonVars<String> LINKIS_AUTHOR_USER_TOKEN = CommonVars.apply("wds.linkis.client.api.service.author.user.token","");
public final static CommonVars<String> LINKIS_ADMIN_USER = CommonVars.apply("wds.linkis.client.api.service.adminuser","ws");

public final static CommonVars<Integer> LINKIS_CONNECTION_TIMEOUT = CommonVars.apply("wds.linkis.flow.connection.timeout",30000);
Expand Down
2 changes: 1 addition & 1 deletion ...m/webank/wedatasphere/dss/linkis/node/execution/conf/LinkisJobExecutionConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class LinkisJobExecutionConfiguration {
public final static CommonVars<String> LINKIS_ADMIN_USER = CommonVars.apply("wds.linkis.client.flow.adminuser","ws");


public final static CommonVars<String> LINKIS_AUTHOR_USER_TOKEN = CommonVars.apply("wds.linkis.client.flow.author.user.token","WS-AUTH");
public final static CommonVars<String> LINKIS_AUTHOR_USER_TOKEN = CommonVars.apply("wds.linkis.client.flow.author.user.token","");

public final static CommonVars<String> LINKIS_JOB_CREATOR = CommonVars.apply("wds.linkis.flow.job.creator","nodeexecution");

Expand Down
4 changes: 2 additions & 2 deletions plugins/azkaban/linkis-jobtype/bin/config.sh
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
##Linkis gateway url
LINKIS_GATEWAY_URL=http://127.0.0.1:9001

##Linkis gateway token default WS-AUTH
LINKIS_GATEWAY_TOKEN=WS-AUTH
##Linkis gateway token default
LINKIS_GATEWAY_TOKEN=


##Azkaban executor host
Expand Down
2 changes: 1 addition & 1 deletion plugins/azkaban/linkis-jobtype/src/main/resources/plugin.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@

wds.linkis.gateway.url.v1=http://127.0.0.1:9001
wds.linkis.gateway.url.v0=http://127.0.0.1:9001
wds.linkis.client.flow.author.user.token=WS-AUTH
wds.linkis.client.flow.author.user.token=
wds.linkis.flow.job.creator=scheduler

0 comments on commit 4bcfcc1

Please sign in to comment.