diff --git a/assembly/bin/appconn-refresh.sh b/assembly/bin/appconn-refresh.sh index d177456fc5..1a648adabb 100644 --- a/assembly/bin/appconn-refresh.sh +++ b/assembly/bin/appconn-refresh.sh @@ -22,7 +22,7 @@ function isSuccess(){ function refresh() { while true; do - response=$(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) + response=$(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) if [[ $response == *"not appconn manager node"* ]]; then echo 'not appconn manager node, we will try again 5 seconds later' sleep 5 diff --git a/assembly/config/config.sh b/assembly/config/config.sh index d92769b5d4..3196618a62 100644 --- a/assembly/config/config.sh +++ b/assembly/config/config.sh @@ -25,7 +25,7 @@ GATEWAY_INSTALL_IP=127.0.0.1 GATEWAY_PORT=9001 ### Linkis BML Token -BML_AUTH=BML-AUTH +BML_AUTH= ################### The install Configuration of all Micro-Services start ##################### # diff --git a/conf/dss.properties b/conf/dss.properties index d8ee513ced..674e0bf403 100644 --- a/conf/dss.properties +++ b/conf/dss.properties @@ -23,10 +23,10 @@ wds.linkis.mysql.is.encrypt=false wds.linkis.server.mybatis.datasource.url= wds.linkis.server.mybatis.datasource.username= ***REMOVED*** -wds.linkis.bml.auth.token.value=BML-AUTH -linkis.configuration.linkisclient.auth.token.value=BML-AUTH -wds.linkis.context.client.auth.value=BML-AUTH -wds.linkis.errorcode.auth.token=BML-AUTH +wds.linkis.bml.auth.token.value= +linkis.configuration.linkisclient.auth.token.value= +wds.linkis.context.client.auth.value= +wds.linkis.errorcode.auth.token= wds.dss.check.server.active.period=30 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 f057f3a8f4..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","admin-kmsnd"); + 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 95c824289b..7fbbe893af 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 @@ -126,7 +126,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(); protected Sender getOrchestratorSender() { return DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender(); diff --git a/next-web/README.md b/next-web/README.md index 3e6e4de7e4..99b647603c 100644 --- a/next-web/README.md +++ b/next-web/README.md @@ -20,7 +20,7 @@ wnpm run dev 浏览器插件 SwitchyOmega 配置规则,非接口的资源转发至 http://localhost:5173,开发时访问目标域名即可 网址正则示例: -^http://sit.dss.bdap.weoa.com(?!/api)._ +^http://***REMOVED***(?!/api)._ ^http://***REMOVED***:8088(?!/api)._ ## 代码提交规范 diff --git a/next-web/vite.config.ts b/next-web/vite.config.ts index 2f32f9377c..ddc9c42448 100644 --- a/next-web/vite.config.ts +++ b/next-web/vite.config.ts @@ -41,7 +41,7 @@ export default defineConfig(({ command, mode }: ConfigEnv): UserConfig => { cookie: '', // cookie: // 'linkis_user_session_ticket_id_v1=FmzyJmP2DGUzEo5Hy/D0OqyinoWZ4+L52vOV55MqIl4=; workspaceId=104; workspaceName=bdapWorkspace_move', - TokenCode: 'admin-kmsnd', + TokenCode: '', TokenUser: 'stacyyan', TokenAlive: 'true', }, diff --git a/plugins/azkaban/linkis-jobtype/src/main/resources/plugin.properties b/plugins/azkaban/linkis-jobtype/src/main/resources/plugin.properties index 182163d532..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=admin-kmsnd +wds.linkis.client.flow.author.user.token= wds.linkis.flow.job.creator=scheduler wds.linkis.flow.job.creator.v1=schedulis