From 8157a9127a15fd5bf3f4e51af1839d870405e1df Mon Sep 17 00:00:00 2001 From: xlinliu Date: Wed, 27 Nov 2024 11:44:56 +0800 Subject: [PATCH] fix sensitive info --- assembly/bin/appconn-refresh.sh | 2 +- assembly/config/config.sh | 2 +- conf/dss.properties | 8 ++++---- .../src/main/svgs/eventreceiver.svg | 2 +- .../dss-scriptis-appconn/src/main/svgs/eventchecker.svg | 2 +- .../dss-scriptis-appconn/src/main/svgs/exchangis.svg | 2 +- .../execution/conf/LinkisJobExecutionConfiguration.java | 2 +- .../dss/workflow/service/impl/DSSFlowServiceImpl.java | 2 +- .../linkis-jobtype/src/main/resources/plugin.properties | 2 +- web/packages/exts/scriptisGuide/i18n/en.json | 2 +- web/packages/exts/scriptisGuide/i18n/zh.json | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) 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 59c4019e8e..76633b44b6 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-appconn/appconns/dss-eventchecker-appconn/src/main/svgs/eventreceiver.svg b/dss-appconn/appconns/dss-eventchecker-appconn/src/main/svgs/eventreceiver.svg index f78d7f3a80..2e4122ff0c 100644 --- a/dss-appconn/appconns/dss-eventchecker-appconn/src/main/svgs/eventreceiver.svg +++ b/dss-appconn/appconns/dss-eventchecker-appconn/src/main/svgs/eventreceiver.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/dss-appconn/appconns/dss-scriptis-appconn/src/main/svgs/eventchecker.svg b/dss-appconn/appconns/dss-scriptis-appconn/src/main/svgs/eventchecker.svg index f78d7f3a80..2e4122ff0c 100644 --- a/dss-appconn/appconns/dss-scriptis-appconn/src/main/svgs/eventchecker.svg +++ b/dss-appconn/appconns/dss-scriptis-appconn/src/main/svgs/eventchecker.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/dss-appconn/appconns/dss-scriptis-appconn/src/main/svgs/exchangis.svg b/dss-appconn/appconns/dss-scriptis-appconn/src/main/svgs/exchangis.svg index 1869b78aeb..b5c1d90b0d 100644 --- a/dss-appconn/appconns/dss-scriptis-appconn/src/main/svgs/exchangis.svg +++ b/dss-appconn/appconns/dss-scriptis-appconn/src/main/svgs/exchangis.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file 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 0c2c3ff4fe..07c78ae627 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 @@ -110,7 +110,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/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 diff --git a/web/packages/exts/scriptisGuide/i18n/en.json b/web/packages/exts/scriptisGuide/i18n/en.json index 39bff69c76..b430f7d63f 100644 --- a/web/packages/exts/scriptisGuide/i18n/en.json +++ b/web/packages/exts/scriptisGuide/i18n/en.json @@ -3,7 +3,7 @@ "ext": { "scriptisGuide": { "uninitTitle": "User initialization not completed", - "uninitContent": "Please go to the data map ***REMOVED*** to submit the relevant service ticket application.
If you have already submitted the application, please make sure that your approval ticket status is completed.", + "uninitContent": "Please go to the data map to submit the relevant service ticket application.
If you have already submitted the application, please make sure that your approval ticket status is completed.", "gotit": "I got it", "viewGuide": "View Application Guide", "setParams": "Set parameters", diff --git a/web/packages/exts/scriptisGuide/i18n/zh.json b/web/packages/exts/scriptisGuide/i18n/zh.json index 6c8a1b5a73..0d9cf2c0d7 100644 --- a/web/packages/exts/scriptisGuide/i18n/zh.json +++ b/web/packages/exts/scriptisGuide/i18n/zh.json @@ -3,7 +3,7 @@ "ext": { "scriptisGuide": { "uninitTitle": "用户初始化未完成", - "uninitContent": "请前往数据地图（***REMOVED***）提交相关服务单申请。
若您已提交申请，请确保您的审批单状态为已完成。", + "uninitContent": "请前往数据地图提交相关服务单申请。
若您已提交申请，请确保您的审批单状态为已完成。", "gotit": "我知道了", "viewGuide": "查看申请指引", "setParams": "设置参数",