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 6dfa05d commit 60ef752
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions assembly/bin/appconn-refresh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if [ -z $1 ];then
else
echo "You chose to wait for 5 minutes."
echo "Now try to call dss-framework-project to reload the plugin of $APPCONN_NAME AppConn."
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
isSuccess "reload the plugin of $APPCONN_NAME AppConn in dss-framework-project."
echo "Now please wait for 5 minutes, then all of the DSS micro-services will refresh the ${APPCONN_NAME} AppConn plugin."
echo ""
Expand All @@ -49,7 +49,7 @@ if [ -z $1 ];then
else
APPCONN_NAME=$1
echo "Now try to call dss-framework-project to reload the plugin of $APPCONN_NAME AppConn."
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
isSuccess "reload the plugin of $APPCONN_NAME AppConn in dss-framework-project."
echo "Now please wait for 5 minutes, then all of the DSS micro-services will refresh the ${APPCONN_NAME} AppConn plugin."
echo ""
Expand Down
2 changes: 1 addition & 1 deletion conf/dss-flow-execution-server.properties
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


public class DSSScriptisConfiguration {
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<Long> LINKIS_CONNECTION_TIMEOUT = CommonVars.apply("wds.linkis.client.connection.timeout",45000L);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,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
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public class DSSFlowServiceImpl implements DSSFlowService {

private static ContextService contextService = ContextServiceImpl.getInstance();

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

@Override
public DSSFlow getFlowByID(Long id) {
Expand Down
4 changes: 2 additions & 2 deletions plugins/azkaban/linkis-jobtype/bin/config.sh
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

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
wds.linkis.flow.job.creator.v1=schedulis

0 comments on commit 60ef752

Please sign in to comment.