Fix build

apache · Nov 4, 2024 · 923d4ca · 923d4ca
1 parent 9174fc2
commit 923d4ca
Show file tree

Hide file tree

Showing 30 changed files with 97 additions and 122 deletions.
diff --git a/...utation-governance/linkis-client/linkis-cli/src/test/resources/conf/linkis-cli.properties b/...utation-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/...-computation-governance/linkis-client/linkis-cli/src/test/resources/linkis-cli.properties b/...-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/...computation-client/src/test/java/org/apache/linkis/ujes/client/JobObserveActionTest.scala b/...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/...-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java b/...-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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');
+('QUALITIS-AUTH','*','*','BDP',curdate(),curdate(),-1,'LINKIS'));
diff --git a/...ala/org/apache/linkis/manager/engineplugin/jdbc/executor/TestJDBCEngineConnExecutor.scala b/...ala/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
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2019 WeBank
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~  you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.