remove instance label

docs/errorcode/linkis-instance-label-errorcode.md

@@ -1,8 +1,8 @@
-## linkis-pes-publicservice  errorcode
+## linkis-instance-label  errorcode
 
 | 模块名(服务名) | 错误码  | 描述 | Exception Class|
-| -------- | -------- | ----- |-----|
-|linkis-pes-publicservice |14100|Failed to insert service instance(插入服务实例失败)|LinkisInstanceLabelErrorCodeSummary|
-|linkis-pes-publicservice |14100|Only admin can view all instances(只有管理员才能查看所有实例).|LinkisInstanceLabelErrorCodeSummary|
-|linkis-pes-publicservice |14100|Only admin can modify instance label(只有管理员才能修改标签).|LinkisInstanceLabelErrorCodeSummary|
-|linkis-pes-publicservice |14100|Failed to update label, include repeat label(更新label失败，包含重复label)|LinkisInstanceLabelErrorCodeSummary|
+|  | -------- | ----- |-----|
+|linkis-instance-label |14100|Failed to insert service instance(插入服务实例失败)|LinkisInstanceLabelErrorCodeSummary|
+|linkis-instance-label |14100|Only admin can view all instances(只有管理员才能查看所有实例).|LinkisInstanceLabelErrorCodeSummary|
+|linkis-instance-label |14100|Only admin can modify instance label(只有管理员才能修改标签).|LinkisInstanceLabelErrorCodeSummary|
+|linkis-instance-label |14100|Failed to update label, include repeat label(更新label失败，包含重复label)|LinkisInstanceLabelErrorCodeSummary|

linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.linkis</groupId>
+    <artifactId>linkis</artifactId>
+    <version>${revision}</version>
+    <relativePath>../../../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>linkis-instance-label-server</artifactId>
+  <properties>
+    <caffeine.version>2.8.4</caffeine.version>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.linkis</groupId>
+      <artifactId>linkis-mybatis</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.linkis</groupId>
+      <artifactId>linkis-rpc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.linkis</groupId>
+      <artifactId>linkis-label-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.reflections</groupId>
+      <artifactId>reflections</artifactId>
+    </dependency>
+    <!-- caffeine -->
+    <dependency>
+      <groupId>com.github.ben-manes.caffeine</groupId>
+      <artifactId>caffeine</artifactId>
+      <version>${caffeine.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>net.alchim31.maven</groupId>
+        <artifactId>scala-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+</project>

linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties

@@ -0,0 +1,36 @@
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+
+#h2 database config
+spring.datasource.driver-class-name=org.h2.Driver
+#init
+spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
+#spring.datasource.url=jdbc:h2:mem:testPgDb;MODE=PostgreSQL;IGNORECASE=TRUE;DATABASE_TO_LOWER=TRUE;
+spring.datasource.username=sa
+spring.datasource.password=
+spring.datasource.schema=classpath:create.sql
+#spring.datasource.schema=classpath:create_pg.sql
+
+mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
+#mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/postgresql/*.xml
+mybatis-plus.type-aliases-package=org.apache.linkis.instance.label.entity
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+
+#disable eureka discovery client
+spring.cloud.service-registry.auto-registration.enabled=false
+eureka.client.enabled=false
+eureka.client.serviceUrl.registerWithEureka=false

linkis-public-enhancements/linkis-pes-publicservice/pom.xml

@@ -26,9 +26,6 @@
 
   <artifactId>linkis-pes-publicservice</artifactId>
   <packaging>jar</packaging>
-  <properties>
-    <caffeine.version>2.8.4</caffeine.version>
-  </properties>
 
   <dependencies>
 
@@ -102,22 +99,6 @@
       <artifactId>oshi-core</artifactId>
       <version>6.2.1</version>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-label-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.reflections</groupId>
-      <artifactId>reflections</artifactId>
-    </dependency>
-    <!-- caffeine -->
-    <dependency>
-      <groupId>com.github.ben-manes.caffeine</groupId>
-      <artifactId>caffeine</artifactId>
-      <version>${caffeine.version}</version>
-    </dependency>
   </dependencies>
 
   <build>

linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/application.properties

@@ -41,12 +41,12 @@ logging.level.org.springframework.web=trace
 
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
-spring.datasource.schema=classpath:basedata_manager_create.sql,classpath:error_code_create.sql,classpath:instance_label_create.sql,classpath:variable_create.sql
+spring.datasource.schema=classpath:basedata_manager_create.sql,classpath:error_code_create.sql,classpath:variable_create.sql
 spring.datasource.username=sa
 spring.datasource.password=
 #pgtest
 #spring.datasource.url=jdbc:h2:mem:testPgDb;MODE=PostgreSQL;IGNORECASE=TRUE;DATABASE_TO_LOWER=TRUE;
-#spring.datasource.schema=classpath:basedata_manager_create_pg.sql,classpath:error_code_create_pg.sql,classpath:instance_label_create_pg.sql,classpath:variable_create_pg.sql
+#spring.datasource.schema=classpath:basedata_manager_create_pg.sql,classpath:error_code_create_pg.sql,classpath:variable_create_pg.sql
 
 spring.main.web-application-type=servlet
 server.port=1234
@@ -60,5 +60,5 @@ eureka.client.serviceUrl.registerWithEureka=false
 
 mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
 #mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/postgresql/*.xml
-mybatis-plus.type-aliases-package=org.apache.linkis.basedatamanager.server.domain,org.apache.linkis.errorcode.common,org.apache.linkis.instance.label.entity,org.apache.linkis.variable.entity
+mybatis-plus.type-aliases-package=org.apache.linkis.basedatamanager.server.domain,org.apache.linkis.errorcode.common,org.apache.linkis.variable.entity
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl

linkis-public-enhancements/pom.xml

@@ -39,6 +39,7 @@
     <module>linkis-udf/linkis-udf-service</module>
     <module>linkis-jobhistory</module>
     <module>linkis-configuration</module>
+    <module>linkis-instance-label/linkis-instance-label-server</module>
     <module>linkis-ps-common-lock</module>
   </modules>
 
@@ -68,6 +69,11 @@
       <artifactId>linkis-configuration</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.linkis</groupId>
+      <artifactId>linkis-instance-label-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.linkis</groupId>
       <artifactId>linkis-jobhistory</artifactId>

linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml

@@ -77,7 +77,7 @@
     <!-- instance label -->
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-pes-publicservice</artifactId>
+      <artifactId>linkis-instance-label-server</artifactId>
       <version>${project.version}</version>
     </dependency>