From 60ef75243bf12543e002fc07463199ab5747edaa Mon Sep 17 00:00:00 2001 From: xlinliu Date: Thu, 28 Nov 2024 18:23:09 +0800 Subject: [PATCH] fix info --- assembly/bin/appconn-refresh.sh | 4 ++-- conf/dss-flow-execution-server.properties | 2 +- .../manager/conf/AppConnManagerClientConfiguration.java | 2 +- .../dss/apiservice/core/config/ApiServiceConfiguration.java | 2 +- .../dss/scriptis/config/DSSScriptisConfiguration.java | 2 +- .../node/execution/conf/LinkisJobExecutionConfiguration.java | 2 +- .../dss/workflow/service/impl/DSSFlowServiceImpl.java | 2 +- plugins/azkaban/linkis-jobtype/bin/config.sh | 4 ++-- .../linkis-jobtype/src/main/resources/plugin.properties | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/assembly/bin/appconn-refresh.sh b/assembly/bin/appconn-refresh.sh index 7f455a3eea..369a3e3878 100644 --- a/assembly/bin/appconn-refresh.sh +++ b/assembly/bin/appconn-refresh.sh @@ -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 "" @@ -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 "" diff --git a/conf/dss-flow-execution-server.properties b/conf/dss-flow-execution-server.properties index 1d8eb8d285..7cc8211a10 100644 --- a/conf/dss-flow-execution-server.properties +++ b/conf/dss-flow-execution-server.properties @@ -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 diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/conf/AppConnManagerClientConfiguration.java b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/conf/AppConnManagerClientConfiguration.java index c95e3ed53f..43e0ed86eb 100644 --- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/conf/AppConnManagerClientConfiguration.java +++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/conf/AppConnManagerClientConfiguration.java @@ -20,7 +20,7 @@ public class AppConnManagerClientConfiguration { - public final static CommonVars DSS_APPCONN_CLIENT_TOKEN = CommonVars.apply("wds.dss.appconn.client.user.token","WS-AUTH"); + public final static CommonVars DSS_APPCONN_CLIENT_TOKEN = CommonVars.apply("wds.dss.appconn.client.user.token",""); public final static CommonVars LINKIS_ADMIN_USER = CommonVars.apply("wds.dss.appconn.client.user","ws"); diff --git a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/config/ApiServiceConfiguration.java b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/config/ApiServiceConfiguration.java index 36244363ff..a4d4c9ac21 100644 --- a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/config/ApiServiceConfiguration.java +++ b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/config/ApiServiceConfiguration.java @@ -20,7 +20,7 @@ public class ApiServiceConfiguration { - public final static CommonVars LINKIS_AUTHOR_USER_TOKEN = CommonVars.apply("wds.linkis.client.api.service.author.user.token","WS-AUTH"); + public final static CommonVars LINKIS_AUTHOR_USER_TOKEN = CommonVars.apply("wds.linkis.client.api.service.author.user.token",""); public final static CommonVars LINKIS_ADMIN_USER = CommonVars.apply("wds.linkis.client.api.service.adminuser","ws"); public final static CommonVars LINKIS_CONNECTION_TIMEOUT = CommonVars.apply("wds.linkis.flow.connection.timeout",30000); diff --git a/dss-apps/dss-scriptis-server/src/main/java/com/webank/wedatasphere/dss/scriptis/config/DSSScriptisConfiguration.java b/dss-apps/dss-scriptis-server/src/main/java/com/webank/wedatasphere/dss/scriptis/config/DSSScriptisConfiguration.java index 86bae03e15..0b0fd99fab 100644 --- a/dss-apps/dss-scriptis-server/src/main/java/com/webank/wedatasphere/dss/scriptis/config/DSSScriptisConfiguration.java +++ b/dss-apps/dss-scriptis-server/src/main/java/com/webank/wedatasphere/dss/scriptis/config/DSSScriptisConfiguration.java @@ -20,7 +20,7 @@ public class DSSScriptisConfiguration { - public final static CommonVars LINKIS_AUTHOR_USER_TOKEN = CommonVars.apply("wds.linkis.client.api.service.author.user.token","WS-AUTH"); + public final static CommonVars LINKIS_AUTHOR_USER_TOKEN = CommonVars.apply("wds.linkis.client.api.service.author.user.token",""); public final static CommonVars LINKIS_ADMIN_USER = CommonVars.apply("wds.linkis.client.api.service.adminuser","ws"); public final static CommonVars LINKIS_CONNECTION_TIMEOUT = CommonVars.apply("wds.linkis.client.connection.timeout",45000L); diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/conf/LinkisJobExecutionConfiguration.java b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/conf/LinkisJobExecutionConfiguration.java index d8b1254ed2..1f84b160d9 100644 --- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/conf/LinkisJobExecutionConfiguration.java +++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/conf/LinkisJobExecutionConfiguration.java @@ -61,7 +61,7 @@ public class LinkisJobExecutionConfiguration { public final static CommonVars LINKIS_ADMIN_USER = CommonVars.apply("wds.linkis.client.flow.adminuser","ws"); - public final static CommonVars LINKIS_AUTHOR_USER_TOKEN = CommonVars.apply("wds.linkis.client.flow.author.user.token","WS-AUTH"); + public final static CommonVars LINKIS_AUTHOR_USER_TOKEN = CommonVars.apply("wds.linkis.client.flow.author.user.token",""); public final static CommonVars LINKIS_JOB_CREATOR = CommonVars.apply("wds.linkis.flow.job.creator","nodeexecution"); diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java index 16d4c7d8f7..e7f880a826 100644 --- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java +++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java @@ -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) { diff --git a/plugins/azkaban/linkis-jobtype/bin/config.sh b/plugins/azkaban/linkis-jobtype/bin/config.sh index 3216a83286..bb91ee7601 100644 --- a/plugins/azkaban/linkis-jobtype/bin/config.sh +++ b/plugins/azkaban/linkis-jobtype/bin/config.sh @@ -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 diff --git a/plugins/azkaban/linkis-jobtype/src/main/resources/plugin.properties b/plugins/azkaban/linkis-jobtype/src/main/resources/plugin.properties index e5d15ce7bd..67b5ed0659 100644 --- a/plugins/azkaban/linkis-jobtype/src/main/resources/plugin.properties +++ b/plugins/azkaban/linkis-jobtype/src/main/resources/plugin.properties @@ -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