From 923d4caafcc2c301468222355b588ec32a7c6041 Mon Sep 17 00:00:00 2001 From: peacewong Date: Mon, 4 Nov 2024 21:35:20 +0800 Subject: [PATCH] Fix build --- .../test/resources/conf/linkis-cli.properties | 2 +- .../src/test/resources/linkis-cli.properties | 2 +- .../ujes/client/JobObserveActionTest.scala | 2 +- .../manager/am/restful/EMRestfulApi.java | 2 +- linkis-dist/bin/install.sh | 24 ++++--------------- .../linkis/templates/configmap-init-sql.yaml | 12 ++-------- .../templates/configmap-linkis-config.yaml | 8 ++----- .../package/admin/configuration_helper.sh | 6 ++--- .../conf/linkis-cli/linkis-cli.properties | 2 +- linkis-dist/package/conf/linkis.properties | 18 +++++++------- linkis-dist/package/db/linkis_dml.sql | 4 +--- linkis-dist/package/db/linkis_dml_pg.sql | 6 +---- linkis-dist/package/db/module/linkis-mg.sql | 6 ++--- .../executor/TestJDBCEngineConnExecutor.scala | 2 +- linkis-extensions/linkis-et-monitor/pom.xml | 14 +++++++---- .../mapper/common/InsLabelRelationMapper.xml | 15 ++++++------ .../mapper/common/InstanceInfoMapper.xml | 13 +++++----- .../mapper/common/InstanceLabelMapper.xml | 13 +++++----- .../mapper/common/JobHistoryMapper.xml | 14 +++++------ .../src/test/resources/log4j2-console.xml | 13 +++++----- .../errorcode/client/ClientConfiguration.java | 2 +- .../authentication/dao/TokenDaoTest.java | 2 +- .../service/CachedTokenServiceTest.java | 2 +- .../src/test/resources/create.sql | 2 +- .../src/test/resources/create_pg.sql | 2 +- .../gateway/config/GatewayConfiguration.scala | 2 +- .../src/apps/URM/module/header/index.vue | 12 +++++----- .../src/apps/linkis/module/header/index.vue | 8 +++---- linkis-web/src/dss/module/header/index.vue | 8 +++---- tool/dependencies/known-dependencies.txt | 1 + 30 files changed, 97 insertions(+), 122 deletions(-) diff --git a/linkis-computation-governance/linkis-client/linkis-cli/src/test/resources/conf/linkis-cli.properties b/linkis-computation-governance/linkis-client/linkis-cli/src/test/resources/conf/linkis-cli.properties index 0259bfc6dc..a792c9ef69 100644 --- a/linkis-computation-governance/linkis-client/linkis-cli/src/test/resources/conf/linkis-cli.properties +++ b/linkis-computation-governance/linkis-client/linkis-cli/src/test/resources/conf/linkis-cli.properties @@ -17,7 +17,7 @@ wds.linkis.client.common.creator=LINKISCLI wds.linkis.client.common.gatewayUrl=http://127.0.0.1:9001 wds.linkis.client.common.authStrategy=token wds.linkis.client.common.tokenKey=Validation-Code -wds.linkis.client.common.tokenValue=BML-AUTH +wds.linkis.client.common.tokenValue=LINKIS-AUTH wds.linkis.client.noncustomizable.enable.user.specification=true #wds.linkis.client.noncustomizable.enable.proxy.user=true #wds.linkis.client.common.submitUser diff --git a/linkis-computation-governance/linkis-client/linkis-cli/src/test/resources/linkis-cli.properties b/linkis-computation-governance/linkis-client/linkis-cli/src/test/resources/linkis-cli.properties index 90208811bf..8d20858645 100644 --- a/linkis-computation-governance/linkis-client/linkis-cli/src/test/resources/linkis-cli.properties +++ b/linkis-computation-governance/linkis-client/linkis-cli/src/test/resources/linkis-cli.properties @@ -17,7 +17,7 @@ wds.linkis.client.common.gatewayUrl=http://127.0.0.1:9001 wds.linkis.client.common.authStrategy=token wds.linkis.client.common.tokenKey=Validation-Code -wds.linkis.client.common.tokenValue=BML-AUTH +wds.linkis.client.common.tokenValue=LINKIS-AUTH # #wds.linkis.client.common.submitUser #wds.linkis.client.common.submitPassword diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/src/test/java/org/apache/linkis/ujes/client/JobObserveActionTest.scala b/linkis-computation-governance/linkis-client/linkis-computation-client/src/test/java/org/apache/linkis/ujes/client/JobObserveActionTest.scala index b55f42159b..1dec59387f 100644 --- a/linkis-computation-governance/linkis-client/linkis-computation-client/src/test/java/org/apache/linkis/ujes/client/JobObserveActionTest.scala +++ b/linkis-computation-governance/linkis-client/linkis-computation-client/src/test/java/org/apache/linkis/ujes/client/JobObserveActionTest.scala @@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit @Deprecated object JobObserveActionTest extends App { - val bmlToken = CommonVars("wds.linkis.bml.auth.token.value", "BML-AUTH").getValue + val bmlToken = CommonVars("wds.linkis.bml.auth.token.value", "LINKIS-AUTH").getValue val clientConfig = DWSClientConfigBuilder.newBuilder() .addServerUrl("127.0.0.1:9001") // Change to test gateway address diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java index fbebd6813b..414a11bf13 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java @@ -586,7 +586,7 @@ public Message taskprediction( @ApiImplicitParam( name = "serviceInstance", dataType = "String", - example = "gz.bdz.bdplxxxxx.webank:9102"), + example = "gz.bdz.bdplxxxxx.apache:9102"), @ApiImplicitParam(name = "username", dataType = "String", example = "hadoop") }) @RequestMapping(path = "/reset-resource", method = RequestMethod.GET) diff --git a/linkis-dist/bin/install.sh b/linkis-dist/bin/install.sh index 24cada6657..299308f9ce 100644 --- a/linkis-dist/bin/install.sh +++ b/linkis-dist/bin/install.sh @@ -124,27 +124,16 @@ cp ${LINKIS_DB_CONFIG_PATH} $LINKIS_HOME/conf common_conf=$LINKIS_HOME/conf/linkis.properties -RANDOM_BML_TOKEN="BML-`cat /proc/sys/kernel/random/uuid | awk -F- '{print $1$2$3$4$5}'`" -RANDOM_LINKIS_CLI_TEST_TOKEN="LINKIS_CLI-`cat /proc/sys/kernel/random/uuid | awk -F- '{print $1$2$3$4$5}'`" +RANDOM_BML_TOKEN="LINKIS-`cat /proc/sys/kernel/random/uuid | awk -F- '{print $1$2$3$4$5}'`" RANDOM_WS_TOKEN="WS-`cat /proc/sys/kernel/random/uuid | awk -F- '{print $1$2$3$4$5}'`" RANDOM_DSM_TOKEN="DSM-`cat /proc/sys/kernel/random/uuid | awk -F- '{print $1$2$3$4$5}'`" -RANDOM_QML_TOKEN="QML-`cat /proc/sys/kernel/random/uuid | awk -F- '{print $1$2$3$4$5}'`" RANDOM_DSS_TOKEN="DSS-`cat /proc/sys/kernel/random/uuid | awk -F- '{print $1$2$3$4$5}'`" RANDOM_QUALITIS_TOKEN="QUALITIS-`cat /proc/sys/kernel/random/uuid | awk -F- '{print $1$2$3$4$5}'`" RANDOM_VALIDATOR_TOKEN="VALIDATOR-`cat /proc/sys/kernel/random/uuid | awk -F- '{print $1$2$3$4$5}'`" -RANDOM_LINKISCLI_TOKEN="LINKISCLI-`cat /proc/sys/kernel/random/uuid | awk -F- '{print $1$2$3$4$5}'`" if [ $DEBUG_MODE != "true" ];then - sed -i ${txt} "s#BML-AUTH#$RANDOM_BML_TOKEN#g" $LINKIS_HOME/conf/linkis-cli/linkis-cli.properties - sed -i ${txt} "s#BML-AUTH#$RANDOM_BML_TOKEN#g" $common_conf - sed -i ${txt} "s#BML-AUTH#$RANDOM_BML_TOKEN#g" $LINKIS_HOME/admin/configuration_helper.sh - sed -i ${txt} "s#LINKIS_CLI_TEST#$RANDOM_LINKIS_CLI_TEST_TOKEN#g" $common_conf - sed -i ${txt} "s#WS-AUTH#$RANDOM_WS_TOKEN#g" $common_conf - sed -i ${txt} "s#DSM-AUTH#$RANDOM_DSM_TOKEN#g" $common_conf - sed -i ${txt} "s#QML-AUTH#$RANDOM_QML_TOKEN#g" $common_conf - sed -i ${txt} "s#DSS-AUTH#$RANDOM_DSS_TOKEN#g" $common_conf - sed -i ${txt} "s#QUALITIS-AUTH#$RANDOM_QUALITIS_TOKEN#g" $common_conf - sed -i ${txt} "s#VALIDATOR-AUTH#$RANDOM_VALIDATOR_TOKEN#g" $common_conf - sed -i ${txt} "s#LINKISCLI-AUTH#$RANDOM_LINKISCLI_TOKEN#g" $common_conf + sed -i ${txt} "s#LINKIS-AUTH#$RANDOM_BML_TOKEN#g" $LINKIS_HOME/conf/linkis-cli/linkis-cli.properties + sed -i ${txt} "s#LINKIS-AUTH#$RANDOM_BML_TOKEN#g" $common_conf + sed -i ${txt} "s#LINKIS-AUTH#$RANDOM_BML_TOKEN#g" $LINKIS_HOME/admin/configuration_helper.sh fi echo "======= Step 3: Create necessary directory ==========" @@ -231,15 +220,12 @@ if [[ 'postgresql' = "$dbType" ]];then dml_file_name=linkis_dml_pg.sql fi if [ $DEBUG_MODE != "true" ];then - sed -i ${txt} "s#BML-AUTH#$RANDOM_BML_TOKEN#g" $LINKIS_HOME/db/${dml_file_name} - sed -i ${txt} "s#LINKIS_CLI_TEST#$RANDOM_LINKIS_CLI_TEST_TOKEN#g" $LINKIS_HOME/db/${dml_file_name} + sed -i ${txt} "s#LINKIS-AUTH#$RANDOM_BML_TOKEN#g" $LINKIS_HOME/db/${dml_file_name} sed -i ${txt} "s#WS-AUTH#$RANDOM_WS_TOKEN#g" $LINKIS_HOME/db/${dml_file_name} sed -i ${txt} "s#DSM-AUTH#$RANDOM_DSM_TOKEN#g" $LINKIS_HOME/db/${dml_file_name} - sed -i ${txt} "s#QML-AUTH#$RANDOM_QML_TOKEN#g" $LINKIS_HOME/db/${dml_file_name} sed -i ${txt} "s#DSS-AUTH#$RANDOM_DSS_TOKEN#g" $LINKIS_HOME/db/${dml_file_name} sed -i ${txt} "s#QUALITIS-AUTH#$RANDOM_QUALITIS_TOKEN#g" $LINKIS_HOME/db/${dml_file_name} sed -i ${txt} "s#VALIDATOR-AUTH#$RANDOM_VALIDATOR_TOKEN#g" $LINKIS_HOME/db/${dml_file_name} - sed -i ${txt} "s#LINKISCLI-AUTH#$RANDOM_LINKISCLI_TOKEN#g" $LINKIS_HOME/db/${dml_file_name} fi diff --git a/linkis-dist/helm/charts/linkis/templates/configmap-init-sql.yaml b/linkis-dist/helm/charts/linkis/templates/configmap-init-sql.yaml index 85050d4d21..df7117efeb 100644 --- a/linkis-dist/helm/charts/linkis/templates/configmap-init-sql.yaml +++ b/linkis-dist/helm/charts/linkis/templates/configmap-init-sql.yaml @@ -1424,16 +1424,8 @@ data: -- ---------------------------- -- Default Tokens -- ---------------------------- - REPLACE INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('QML-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); - REPLACE INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('BML-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); - REPLACE INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('WS-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); - REPLACE INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('dss-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); - REPLACE INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('QUALITIS-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); - REPLACE INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('VALIDATOR-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); - REPLACE INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('LINKISCLI-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); - REPLACE INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('DSM-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); - REPLACE INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('LINKIS_CLI_TEST','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); - + REPLACE INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('LINKIS-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); + INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`, `classifier`, `icon`, `layers`) VALUES ('mysql', 'mysql数据库', 'mysql数据库', '关系型数据库', '', 3); INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`, `classifier`, `icon`, `layers`) VALUES ('kafka', 'kafka', 'kafka', '消息队列', '', 2); INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`, `classifier`, `icon`, `layers`) VALUES ('presto', 'presto SQL', 'presto', '大数据存储', '', 3); diff --git a/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml b/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml index 577a31272e..5c12b9f791 100644 --- a/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml +++ b/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml @@ -69,11 +69,7 @@ data: ## Token-Code=Token-User ## eg:TEST-AUTH=hadoop,root,user01 ### http request with header { Token-Code:TEST-AUTH,Token-User:user01 } - QML-AUTH=* - BML-AUTH=* - WS-AUTH=* - dss-AUTH=* - QUALITIS-AUTH=* + LINKIS-AUTH=* application-linkis.yml: | debug: {{ .Values.linkis.featureGates.testMode }} @@ -216,7 +212,7 @@ data: wds.linkis.client.common.gatewayUrl={{- include "linkis.gateway.url" . }} wds.linkis.client.common.authStrategy=token wds.linkis.client.common.tokenKey=Validation-Code - wds.linkis.client.common.tokenValue=BML-AUTH + wds.linkis.client.common.tokenValue=LINKIS-AUTH spring.spring.mvc.pathmatch.matching-strategy=ant_path_matcher spring.spring.cloud.loadbalancer.cache.enabled=false springfox.documentation.enabled=false diff --git a/linkis-dist/package/admin/configuration_helper.sh b/linkis-dist/package/admin/configuration_helper.sh index 8c918dfe61..3ebdcc2822 100644 --- a/linkis-dist/package/admin/configuration_helper.sh +++ b/linkis-dist/package/admin/configuration_helper.sh @@ -61,21 +61,21 @@ fi get() { requestUrl="$gatewayUrl/api/rest_j/v1/configuration/keyvalue?creator=$creator&engineType=$engineType&version=$version&configKey=$configKey" - curl --location --request GET $requestUrl -H "Token-Code:BML-AUTH" -H "Token-User:$user" + curl --location --request GET $requestUrl -H "Token-Code:LINKIS-AUTH" -H "Token-User:$user" } delete() { requestUrl="$gatewayUrl/api/rest_j/v1/configuration/keyvalue" requestBody="{\"engineType\":\"$engineType\",\"version\":\"$version\",\"creator\":\"$creator\",\"configKey\":\"$configKey\"}" - curl -i -X DELETE $requestUrl -H "Accept: application/json" -H "Content-Type: application/json" -H "Token-Code:BML-AUTH" -H "Token-User:$user" -d "$requestBody" + curl -i -X DELETE $requestUrl -H "Accept: application/json" -H "Content-Type: application/json" -H "Token-Code:LINKIS-AUTH" -H "Token-User:$user" -d "$requestBody" } add() { requestUrl="$gatewayUrl/api/rest_j/v1/configuration/keyvalue" requestBody="{\"engineType\":\"$engineType\",\"version\":\"$version\",\"creator\":\"$creator\",\"configKey\":\"$configKey\",\"configValue\":\"$configValue\",\"force\":\"$force\",\"user\":\"$user\"}" - curl -i -X POST $requestUrl -H "Accept: application/json" -H "Content-Type: application/json" -H "Token-Code:BML-AUTH" -H "Token-User:hadoop" -d "$requestBody" + curl -i -X POST $requestUrl -H "Accept: application/json" -H "Content-Type: application/json" -H "Token-Code:LINKIS-AUTH" -H "Token-User:hadoop" -d "$requestBody" } case $COMMAND in diff --git a/linkis-dist/package/conf/linkis-cli/linkis-cli.properties b/linkis-dist/package/conf/linkis-cli/linkis-cli.properties index 4847d443e0..39eeccb421 100644 --- a/linkis-dist/package/conf/linkis-cli/linkis-cli.properties +++ b/linkis-dist/package/conf/linkis-cli/linkis-cli.properties @@ -17,6 +17,6 @@ wds.linkis.client.common.gatewayUrl=http://127.0.0.1:9001 wds.linkis.client.common.authStrategy=token wds.linkis.client.common.tokenKey=Validation-Code -wds.linkis.client.common.tokenValue=BML-AUTH +wds.linkis.client.common.tokenValue=LINKIS-AUTH wds.linkis.client.noncustomizable.enable.user.specification=true wds.linkis.client.noncustomizable.enable.proxy.user=true \ No newline at end of file diff --git a/linkis-dist/package/conf/linkis.properties b/linkis-dist/package/conf/linkis.properties index 65e720fc6d..ae30dce4a6 100644 --- a/linkis-dist/package/conf/linkis.properties +++ b/linkis-dist/package/conf/linkis.properties @@ -104,15 +104,15 @@ wds.linkis.workspace.filesystem.owner.check=true wds.linkis.workspace.filesystem.path.check=true #linkis token -linkis.configuration.linkisclient.auth.token.value=BML-AUTH -wds.linkis.client.common.tokenValue=BML-AUTH -wds.linkis.bml.auth.token.value=BML-AUTH -wds.linkis.context.client.auth.value=BML-AUTH -wds.linkis.errorcode.auth.token=BML-AUTH -wds.linkis.client.test.common.tokenValue=LINKIS_CLI_TEST -wds.linkis.filesystem.token.value=WS-AUTH -wds.linkis.gateway.access.token=WS-AUTH -wds.linkis.server.dsm.auth.token.value=DSM-AUTH +linkis.configuration.linkisclient.auth.token.value=LINKIS-AUTH +wds.linkis.client.common.tokenValue=LINKIS-AUTH +wds.linkis.bml.auth.token.value=LINKIS-AUTH +wds.linkis.context.client.auth.value=LINKIS-AUTH +wds.linkis.errorcode.auth.token=LINKIS-AUTH +wds.linkis.client.test.common.tokenValue=LINKIS-AUTH +wds.linkis.filesystem.token.value=LINKIS-AUTH +wds.linkis.gateway.access.token=LINKIS-AUTH +wds.linkis.server.dsm.auth.token.value=LINKIS-AUTH # s3 file system diff --git a/linkis-dist/package/db/linkis_dml.sql b/linkis-dist/package/db/linkis_dml.sql index bfccaa851a..a7e8e924dc 100644 --- a/linkis-dist/package/db/linkis_dml.sql +++ b/linkis-dist/package/db/linkis_dml.sql @@ -583,15 +583,13 @@ INSERT INTO linkis_ps_error_code (error_code,error_desc,error_regex,error_type) -- ---------------------------- -- Default Tokens -- ---------------------------- -INSERT INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('QML-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); -INSERT INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('BML-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); +INSERT INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('LINKIS-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); INSERT INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('WS-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); INSERT INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('DSS-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); INSERT INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('QUALITIS-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); INSERT INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('VALIDATOR-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); INSERT INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('LINKISCLI-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); INSERT INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('DSM-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); -INSERT INTO `linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hosts`,`business_owner`,`create_time`,`update_time`,`elapse_day`,`update_by`) VALUES ('LINKIS_CLI_TEST','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`, `classifier`, `icon`, `layers`, `description_en`, `option_en`, `classifier_en`) VALUES ('kafka', 'kafka', 'kafka', '消息队列', '', 2, 'Kafka', 'Kafka', 'Message Queue'); INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`, `classifier`, `icon`, `layers`, `description_en`, `option_en`, `classifier_en`) VALUES ('hive', 'hive数据库', 'hive', '大数据存储', '', 3, 'Hive Database', 'Hive', 'Big Data storage'); diff --git a/linkis-dist/package/db/linkis_dml_pg.sql b/linkis-dist/package/db/linkis_dml_pg.sql index 6139f1e6af..2ae838d5e3 100644 --- a/linkis-dist/package/db/linkis_dml_pg.sql +++ b/linkis-dist/package/db/linkis_dml_pg.sql @@ -482,16 +482,12 @@ alter sequence linkis_mg_gateway_auth_token_id_seq restart with 1; -- ---------------------------- -- Default Tokens -- ---------------------------- -INSERT INTO "linkis_mg_gateway_auth_token"("token_name","legal_users","legal_hosts","business_owner","create_time","update_time","elapse_day","update_by") VALUES ('QML-AUTH','*','*','BDP',now(),now(),-1,'LINKIS'); -INSERT INTO "linkis_mg_gateway_auth_token"("token_name","legal_users","legal_hosts","business_owner","create_time","update_time","elapse_day","update_by") VALUES ('BML-AUTH','*','*','BDP',now(),now(),-1,'LINKIS'); +INSERT INTO "linkis_mg_gateway_auth_token"("token_name","legal_users","legal_hosts","business_owner","create_time","update_time","elapse_day","update_by") VALUES ('LINKIS-AUTH','*','*','BDP',now(),now(),-1,'LINKIS'); INSERT INTO "linkis_mg_gateway_auth_token"("token_name","legal_users","legal_hosts","business_owner","create_time","update_time","elapse_day","update_by") VALUES ('WS-AUTH','*','*','BDP',now(),now(),-1,'LINKIS'); INSERT INTO "linkis_mg_gateway_auth_token"("token_name","legal_users","legal_hosts","business_owner","create_time","update_time","elapse_day","update_by") VALUES ('DSS-AUTH','*','*','BDP',now(),now(),-1,'LINKIS'); INSERT INTO "linkis_mg_gateway_auth_token"("token_name","legal_users","legal_hosts","business_owner","create_time","update_time","elapse_day","update_by") VALUES ('QUALITIS-AUTH','*','*','BDP',now(),now(),-1,'LINKIS'); INSERT INTO "linkis_mg_gateway_auth_token"("token_name","legal_users","legal_hosts","business_owner","create_time","update_time","elapse_day","update_by") VALUES ('VALIDATOR-AUTH','*','*','BDP',now(),now(),-1,'LINKIS'); -INSERT INTO "linkis_mg_gateway_auth_token"("token_name","legal_users","legal_hosts","business_owner","create_time","update_time","elapse_day","update_by") VALUES ('LINKISCLI-AUTH','*','*','BDP',now(),now(),-1,'LINKIS'); INSERT INTO "linkis_mg_gateway_auth_token"("token_name","legal_users","legal_hosts","business_owner","create_time","update_time","elapse_day","update_by") VALUES ('DSM-AUTH','*','*','BDP',now(),now(),-1,'LINKIS'); -INSERT INTO "linkis_mg_gateway_auth_token"("token_name","legal_users","legal_hosts","business_owner","create_time","update_time","elapse_day","update_by") VALUES ('LINKIS_CLI_TEST','*','*','BDP',now(),now(),-1,'LINKIS'); - delete from linkis_ps_dm_datasource_type; alter sequence linkis_ps_dm_datasource_type_id_seq restart with 1; INSERT INTO "linkis_ps_dm_datasource_type" ("name", "description", "option", "classifier", "icon", "layers", "description_en", "option_en", "classifier_en") VALUES ('kafka', 'kafka', 'kafka', '消息队列', '', 2, 'Kafka', 'Kafka', 'Message Queue'); diff --git a/linkis-dist/package/db/module/linkis-mg.sql b/linkis-dist/package/db/module/linkis-mg.sql index 92b6035d7e..8d48fe3e90 100644 --- a/linkis-dist/package/db/module/linkis-mg.sql +++ b/linkis-dist/package/db/module/linkis-mg.sql @@ -42,10 +42,8 @@ INSERT INTO `linkis_mg_gateway_auth_token`( `elapse_day`, `update_by` ) VALUES -('QML-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'), +('LINKIS-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'), ('BML-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'), ('WS-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'), ('dss-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'), -('QUALITIS-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'), -('VALIDATOR-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'), -('LINKISCLI-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'); \ No newline at end of file +('QUALITIS-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS')); \ No newline at end of file diff --git a/linkis-engineconn-plugins/jdbc/src/test/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/TestJDBCEngineConnExecutor.scala b/linkis-engineconn-plugins/jdbc/src/test/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/TestJDBCEngineConnExecutor.scala index 562d4b6b6c..02dca067d7 100644 --- a/linkis-engineconn-plugins/jdbc/src/test/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/TestJDBCEngineConnExecutor.scala +++ b/linkis-engineconn-plugins/jdbc/src/test/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/TestJDBCEngineConnExecutor.scala @@ -93,7 +93,7 @@ class TestJDBCEngineConnExecutor { engineconnCconf, "wds.linkis.jdbc.password=123456", engineconnCconf, - "wds.linkis.jdbc.connect.url=jdbc:mysql://10.30.23.40:3306/davinci", + "wds.linkis.jdbc.connect.url=jdbc:mysql://127.0.0.1:3306/davinci", engineconnCconf, "wds.linkis.rm.client.core.max=10", engineconnCconf, diff --git a/linkis-extensions/linkis-et-monitor/pom.xml b/linkis-extensions/linkis-et-monitor/pom.xml index bed33a17ce..565979119d 100644 --- a/linkis-extensions/linkis-et-monitor/pom.xml +++ b/linkis-extensions/linkis-et-monitor/pom.xml @@ -1,10 +1,14 @@ diff --git a/linkis-extensions/linkis-et-monitor/src/main/resources/mapper/common/InstanceInfoMapper.xml b/linkis-extensions/linkis-et-monitor/src/main/resources/mapper/common/InstanceInfoMapper.xml index d5309a5f04..f73efa4009 100644 --- a/linkis-extensions/linkis-et-monitor/src/main/resources/mapper/common/InstanceInfoMapper.xml +++ b/linkis-extensions/linkis-et-monitor/src/main/resources/mapper/common/InstanceInfoMapper.xml @@ -1,12 +1,13 @@ - diff --git a/linkis-extensions/linkis-et-monitor/src/test/resources/log4j2-console.xml b/linkis-extensions/linkis-et-monitor/src/test/resources/log4j2-console.xml index 49eabc51e6..4fce731a67 100644 --- a/linkis-extensions/linkis-et-monitor/src/test/resources/log4j2-console.xml +++ b/linkis-extensions/linkis-et-monitor/src/test/resources/log4j2-console.xml @@ -1,12 +1,13 @@