From 5ceb09890c67dc44abd8951946ac0b65e06bc016 Mon Sep 17 00:00:00 2001 From: xlinliu Date: Thu, 28 Nov 2024 18:44:18 +0800 Subject: [PATCH] fix info --- assembly/bin/appconn-install.sh | 2 +- conf/dss-flow-execution-server.properties | 2 +- conf/dss-framework-orchestrator-server.properties | 2 +- docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md | 4 ++-- docs/zh_CN/ch2/Azkaban_LinkisJobType_Deployment_Manual.md | 4 ++-- ...346\216\245\345\205\245DSS\346\214\207\345\215\227.md" | 2 +- .../dss/appconn/schedulis/conf/AzkabanConf.java | 2 +- .../dss/appconn/visualis/utils/HttpUtils.java | 6 +++--- .../manager/conf/AppConnManagerClientConfiguration.java | 2 +- .../apiservice/core/config/ApiServiceConfiguration.java | 2 +- .../dss/data/governance/TestDataAssetsRemoteClient.scala | 2 +- .../src/main/resources/linkis.properties | 2 +- .../src/main/resources/linkis.properties | 8 ++++---- .../dss/datapipe/config/DataPipeServiceConfiguration.java | 2 +- .../src/main/resources/linkis.properties | 2 +- .../execution/conf/LinkisJobExecutionConfiguration.java | 2 +- plugins/azkaban/linkis-jobtype/bin/config.sh | 4 ++-- .../linkis-jobtype/src/main/resources/plugin.properties | 2 +- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assembly/bin/appconn-install.sh b/assembly/bin/appconn-install.sh index 491feba49..d8b9157c0 100644 --- a/assembly/bin/appconn-install.sh +++ b/assembly/bin/appconn-install.sh @@ -105,7 +105,7 @@ executeSQL echo "" echo "step4:refresh appconn load" -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 echo "" echo "" diff --git a/conf/dss-flow-execution-server.properties b/conf/dss-flow-execution-server.properties index 5f0d84039..8c94d95a7 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/conf/dss-framework-orchestrator-server.properties b/conf/dss-framework-orchestrator-server.properties index c1f80dc56..eff93e609 100644 --- a/conf/dss-framework-orchestrator-server.properties +++ b/conf/dss-framework-orchestrator-server.properties @@ -37,6 +37,6 @@ wds.linkis.server.mybatis.typeAliasesPackage=com.webank.wedatasphere.dss.server. wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.dss.framework.appconn.dao,com.webank.wedatasphere.dss.orchestrator.core.dao,com.webank.wedatasphere.dss.server.dao,com.webank.wedatasphere.dss.application.dao,com.webank.wedatasphere.dss.workspace.mapper,com.webank.wedatasphere.dss.workspace.common.dao,com.webank.wedatasphere.dss.workspace.common.dao,com.webank.wedatasphere.dss.orchestrator.db.dao wds.dss.appconn.scheduler.project.store.dir=file:///appcom/tmp/wds/scheduler -wds.dss.appconn.scheduler.azkaban.login.passwd=userpwd +wds.dss.appconn.scheduler.azkaban.login.passwd= ##export file dir wds.dss.server.export.url=/appcom/tmp/dss diff --git a/docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md b/docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md index 33cb3808c..554ce76ef 100644 --- a/docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md +++ b/docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md @@ -21,8 +21,8 @@ cd linkis/bin/ ##Linkis gateway url LINKIS_GATEWAY_URL=http://127.0.0.1:9001 ## Linkis' GateWay address -##Linkis gateway token defaultWS-AUTH -LINKIS_GATEWAY_TOKEN=WS-AUTH ## Linkis proxy token, this parameter can use the default +##Linkis gateway token default +LINKIS_GATEWAY_TOKEN= ## Linkis proxy token, this parameter can use the default ##Azkaban executor host AZKABAN_EXECUTOR_HOST=127.0.0.1 ## AZKABAN actuator machine IP diff --git a/docs/zh_CN/ch2/Azkaban_LinkisJobType_Deployment_Manual.md b/docs/zh_CN/ch2/Azkaban_LinkisJobType_Deployment_Manual.md index adc075174..ea7283593 100644 --- a/docs/zh_CN/ch2/Azkaban_LinkisJobType_Deployment_Manual.md +++ b/docs/zh_CN/ch2/Azkaban_LinkisJobType_Deployment_Manual.md @@ -21,8 +21,8 @@ cd linkis/bin/ ##Linkis gateway url LINKIS_GATEWAY_URL=http://127.0.0.1:9001 ## linkis的GateWay地址 -##Linkis gateway token defaultWS-AUTH -LINKIS_GATEWAY_TOKEN=WS-AUTH ## Linkis的代理Token，该参数可以用默认值 +##Linkis gateway token default +LINKIS_GATEWAY_TOKEN= ## Linkis的代理Token，该参数可以用默认值 ##Azkaban executor host AZKABAN_EXECUTOR_HOST=127.0.0.1 ## 如果Azkaban是单机安装则该IP就是机器IP，如果是分布式安装为Azkaban执行器机器IP， diff --git "a/docs/zh_CN/ch4/\347\254\254\344\270\211\346\226\271\347\263\273\347\273\237\346\216\245\345\205\245DSS\346\214\207\345\215\227.md" "b/docs/zh_CN/ch4/\347\254\254\344\270\211\346\226\271\347\263\273\347\273\237\346\216\245\345\205\245DSS\346\214\207\345\215\227.md" index 690682aab..7c7e76c00 100644 --- "a/docs/zh_CN/ch4/\347\254\254\344\270\211\346\226\271\347\263\273\347\273\237\346\216\245\345\205\245DSS\346\214\207\345\215\227.md" +++ "b/docs/zh_CN/ch4/\347\254\254\344\270\211\346\226\271\347\263\273\347\273\237\346\216\245\345\205\245DSS\346\214\207\345\215\227.md" @@ -67,7 +67,7 @@ public class VisualisSecurityService extends AppJointUrlImpl implements Security VisualisSession visualisSession = new VisualisSession(); visualisSession.setUser(user); visualisSession.getParameters().put("Token-User",user); - visualisSession.getParameters().put("Token-Code","WS-AUTH"); + visualisSession.getParameters().put("Token-Code",""); return visualisSession; } diff --git a/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/conf/AzkabanConf.java b/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/conf/AzkabanConf.java index 3eada3bec..5e1cd9ee3 100644 --- a/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/conf/AzkabanConf.java +++ b/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/conf/AzkabanConf.java @@ -21,7 +21,7 @@ public class AzkabanConf { public static final CommonVars DEFAULT_STORE_PATH = CommonVars.apply("wds.dss.appconn.scheduler.project.store.dir", "/appcom/tmp/wds/dss"); - public static final CommonVars AZKABAN_LOGIN_PWD = CommonVars.apply("wds.dss.appconn.scheduler.azkaban.login.passwd", "userpwd"); + public static final CommonVars AZKABAN_LOGIN_PWD = CommonVars.apply("wds.dss.appconn.scheduler.azkaban.login.passwd", ""); public static final CommonVars LINKIS_VERSION = CommonVars.apply("wds.dss.appconn.scheduler.linkis.version", "1.0.0"); public static final CommonVars JOB_LABEL = CommonVars.apply("wds.dss.appconn.scheduler.job.label", "prod"); diff --git a/dss-appconn/appconns/dss-visualis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/visualis/utils/HttpUtils.java b/dss-appconn/appconns/dss-visualis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/visualis/utils/HttpUtils.java index 11db0ae6c..6a19e863b 100644 --- a/dss-appconn/appconns/dss-visualis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/visualis/utils/HttpUtils.java +++ b/dss-appconn/appconns/dss-visualis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/visualis/utils/HttpUtils.java @@ -42,7 +42,7 @@ public static String sendPostReq(String url, String params, HttpPost httpPost = new HttpPost(url); httpPost.addHeader(HTTP.CONTENT_ENCODING, "UTF-8"); httpPost.addHeader("Token-User",user); - httpPost.addHeader("Token-Code", "WS-AUTH"); + httpPost.addHeader("Token-Code", ""); CookieStore cookieStore = new BasicCookieStore(); logger.info("Http request params is :"+params); StringEntity entity = entity = new StringEntity(params); @@ -73,7 +73,7 @@ public static String sendHttpDelete(String url,String user) throws Exception { logger.info("sendDeleteReq url is: "+url); httpdelete.addHeader(HTTP.CONTENT_ENCODING, "UTF-8"); httpdelete.addHeader("Token-User",user); - httpdelete.addHeader("Token-Code","WS-AUTH"); + httpdelete.addHeader("Token-Code",""); CookieStore cookieStore = new BasicCookieStore(); CloseableHttpClient httpClient = null; CloseableHttpResponse response = null; @@ -100,7 +100,7 @@ public static String sendHttpPut(String url, String params, HttpPut httpPut = new HttpPut(url); httpPut.addHeader(HTTP.CONTENT_ENCODING, "UTF-8"); httpPut.addHeader("Token-User",user); - httpPut.addHeader("Token-Code","WS-AUTH"); + httpPut.addHeader("Token-Code",""); CookieStore cookieStore = new BasicCookieStore(); logger.info("Http put params is :"+params); StringEntity entity = null; 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 c95e3ed53..43e0ed86e 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 36244363f..a4d4c9ac2 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-dataasset-management/data-assets-client/src/test/scala/com/webank/wedatasphere/dss/data/governance/TestDataAssetsRemoteClient.scala b/dss-apps/dss-dataasset-management/data-assets-client/src/test/scala/com/webank/wedatasphere/dss/data/governance/TestDataAssetsRemoteClient.scala index f259f590c..df4c62827 100644 --- a/dss-apps/dss-dataasset-management/data-assets-client/src/test/scala/com/webank/wedatasphere/dss/data/governance/TestDataAssetsRemoteClient.scala +++ b/dss-apps/dss-dataasset-management/data-assets-client/src/test/scala/com/webank/wedatasphere/dss/data/governance/TestDataAssetsRemoteClient.scala @@ -22,7 +22,7 @@ object TestDataAssetsRemoteClient { .readTimeout(30000) .setAuthenticationStrategy(new TokenAuthenticationStrategy()) .setAuthTokenKey("hdfs") - .setAuthTokenValue("BML-AUTH") + .setAuthTokenValue("") .setDWSVersion("v1") .build() diff --git a/dss-apps/dss-dataasset-management/data-assets-server/src/main/resources/linkis.properties b/dss-apps/dss-dataasset-management/data-assets-server/src/main/resources/linkis.properties index 6fde4b494..bf3d5abc8 100644 --- a/dss-apps/dss-dataasset-management/data-assets-server/src/main/resources/linkis.properties +++ b/dss-apps/dss-dataasset-management/data-assets-server/src/main/resources/linkis.properties @@ -69,7 +69,7 @@ wds.workspace.client.authenticationStrategy=org.apache.linkis.httpclient.dws.aut wds.workspace.client.discovery.enabled=false -wds.workspace.client.authtoken.value=BML-AUTH +wds.workspace.client.authtoken.value= wds.workspace.client.dws.version=v1 diff --git a/dss-apps/dss-datamodel-center/dss-datamodel-center-server/src/main/resources/linkis.properties b/dss-apps/dss-datamodel-center/dss-datamodel-center-server/src/main/resources/linkis.properties index db79f2bf5..3be5fcb4b 100644 --- a/dss-apps/dss-datamodel-center/dss-datamodel-center-server/src/main/resources/linkis.properties +++ b/dss-apps/dss-datamodel-center/dss-datamodel-center-server/src/main/resources/linkis.properties @@ -39,7 +39,7 @@ wds.wedatasphere.linkis.discovery.enabled=false wds.wedatasphere.linkis.authenticationStrategy=org.apache.linkis.httpclient.dws.authentication.TokenAuthenticationStrategy -wds.wedatasphere.linkis.authtoken.value=BML-AUTH +wds.wedatasphere.linkis.authtoken.value= wds.wedatasphere.linkis.dws.version=v1 @@ -66,7 +66,7 @@ wds.wedatasphere.warehouse.client.authtoken.key=hdfs wds.wedatasphere.warehouse.client.authenticationStrategy=org.apache.linkis.httpclient.dws.authentication.TokenAuthenticationStrategy -wds.wedatasphere.warehouse.client.authtoken.value=BML-AUTH +wds.wedatasphere.warehouse.client.authtoken.value= wds.wedatasphere.warehouse.client.discovery.enabled=false @@ -81,7 +81,7 @@ wds.wedatasphere.assets.client.authenticationStrategy=org.apache.linkis.httpclie wds.wedatasphere.assets.client.discovery.enabled=false -wds.wedatasphere.assets.client.authtoken.value=BML-AUTH +wds.wedatasphere.assets.client.authtoken.value= wds.wedatasphere.assets.client.dws.version=v1 @@ -95,7 +95,7 @@ wds.workspace.client.authenticationStrategy=org.apache.linkis.httpclient.dws.aut wds.workspace.client.discovery.enabled=false -wds.workspace.client.authtoken.value=BML-AUTH +wds.workspace.client.authtoken.value= wds.workspace.client.dws.version=v1 diff --git a/dss-apps/dss-datapipe-server/src/main/java/com/webank/wedatasphere/dss/datapipe/config/DataPipeServiceConfiguration.java b/dss-apps/dss-datapipe-server/src/main/java/com/webank/wedatasphere/dss/datapipe/config/DataPipeServiceConfiguration.java index 1e09b9da6..8c587622e 100644 --- a/dss-apps/dss-datapipe-server/src/main/java/com/webank/wedatasphere/dss/datapipe/config/DataPipeServiceConfiguration.java +++ b/dss-apps/dss-datapipe-server/src/main/java/com/webank/wedatasphere/dss/datapipe/config/DataPipeServiceConfiguration.java @@ -20,7 +20,7 @@ public class DataPipeServiceConfiguration { - 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-datawarehouse-design/data-warehouse-server/src/main/resources/linkis.properties b/dss-apps/dss-datawarehouse-design/data-warehouse-server/src/main/resources/linkis.properties index 2f120fc63..be3f31a9b 100644 --- a/dss-apps/dss-datawarehouse-design/data-warehouse-server/src/main/resources/linkis.properties +++ b/dss-apps/dss-datawarehouse-design/data-warehouse-server/src/main/resources/linkis.properties @@ -31,7 +31,7 @@ wds.linkis.server.version=v1 ## datasource client wds.datawarehouse.datasource.client.serverurl=http://dss.shineweng.com:8088 wds.datawarehouse.datasource.client.authtoken.key=hdfs -wds.datawarehouse.datasource.client.authtoken.value=BML-AUTH +wds.datawarehouse.datasource.client.authtoken.value= wds.datawarehouse.datasource.client.dws.version=v1 ##restful 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 8c5b1f701..71c14ccb4 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 @@ -64,7 +64,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/plugins/azkaban/linkis-jobtype/bin/config.sh b/plugins/azkaban/linkis-jobtype/bin/config.sh index 3216a8328..bb91ee760 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 7389fb22e..a8785aa20 100644 --- a/plugins/azkaban/linkis-jobtype/src/main/resources/plugin.properties +++ b/plugins/azkaban/linkis-jobtype/src/main/resources/plugin.properties @@ -16,5 +16,5 @@ 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