Skip to content

Commit 65ac102

Browse files
author
xlinliu
committed
fix info
1 parent 438d41c commit 65ac102

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

assembly/bin/appconn-refresh.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [ -z $1 ];then
4040
else
4141
echo "You chose to wait for 5 minutes."
4242
echo "Now try to call dss-framework-project to reload the plugin of $APPCONN_NAME AppConn."
43-
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
43+
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
4444
isSuccess "reload the plugin of $APPCONN_NAME AppConn in dss-framework-project."
4545
echo "Now please wait for 5 minutes, then all of the DSS micro-services will refresh the ${APPCONN_NAME} AppConn plugin."
4646
echo ""
@@ -49,7 +49,7 @@ if [ -z $1 ];then
4949
else
5050
APPCONN_NAME=$1
5151
echo "Now try to call dss-framework-project to reload the plugin of $APPCONN_NAME AppConn."
52-
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
52+
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
5353
isSuccess "reload the plugin of $APPCONN_NAME AppConn in dss-framework-project."
5454
echo "Now please wait for 5 minutes, then all of the DSS micro-services will refresh the ${APPCONN_NAME} AppConn plugin."
5555
echo ""

conf/dss-flow-execution-server.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ wds.linkis.server.version=v1
4343
wds.linkis.server.socket.mode=true
4444

4545
wds.linkis.client.flow.adminuser=ws
46-
wds.linkis.client.flow.author.user.token=WS-AUTH
46+
wds.linkis.client.flow.author.user.token=
4747

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

dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/conf/AppConnManagerClientConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
public class AppConnManagerClientConfiguration {
2222

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

2626

dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/config/ApiServiceConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

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

2626
public final static CommonVars<Integer> LINKIS_CONNECTION_TIMEOUT = CommonVars.apply("wds.linkis.flow.connection.timeout",30000);

dss-apps/dss-scriptis-server/src/main/java/com/webank/wedatasphere/dss/scriptis/config/DSSScriptisConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

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

2626
public final static CommonVars<Long> LINKIS_CONNECTION_TIMEOUT = CommonVars.apply("wds.linkis.client.connection.timeout",45000L);

dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/conf/LinkisJobExecutionConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class LinkisJobExecutionConfiguration {
6161
public final static CommonVars<String> LINKIS_ADMIN_USER = CommonVars.apply("wds.linkis.client.flow.adminuser","ws");
6262

6363

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

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

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public class DSSFlowServiceImpl implements DSSFlowService {
9090

9191
private static ContextService contextService = ContextServiceImpl.getInstance();
9292

93-
private static final String TOKEN = CommonVars.apply("wds.dss.workspace.token", "BML-AUTH").getValue();
93+
private static final String TOKEN = CommonVars.apply("wds.dss.workspace.token", "").getValue();
9494

9595
@Override
9696
public DSSFlow getFlowByID(Long id) {

plugins/azkaban/linkis-jobtype/bin/config.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
##Linkis gateway url
22
LINKIS_GATEWAY_URL=http://127.0.0.1:9001
33

4-
##Linkis gateway token default WS-AUTH
5-
LINKIS_GATEWAY_TOKEN=WS-AUTH
4+
##Linkis gateway token default
5+
LINKIS_GATEWAY_TOKEN=
66

77

88
##Azkaban executor host

plugins/azkaban/linkis-jobtype/src/main/resources/plugin.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616

1717
wds.linkis.gateway.url.v1=http://127.0.0.1:9001
1818
wds.linkis.gateway.url.v0=http://127.0.0.1:9001
19-
wds.linkis.client.flow.author.user.token=WS-AUTH
19+
wds.linkis.client.flow.author.user.token=
2020
wds.linkis.flow.job.creator=scheduler
2121
wds.linkis.flow.job.creator.v1=schedulis

0 commit comments

Comments
 (0)