From 0b5b02c470025b09e6acdc63769d3740a1e3c035 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Sat, 23 Sep 2023 13:31:25 +0800 Subject: [PATCH] remove instance label --- .../linkis-instance-label-errorcode.md | 12 ++-- .../linkis-instance-label-server/pom.xml | 67 +++++++++++++++++++ .../label/InsLabelAutoConfiguration.java | 0 .../label/async/AsyncConsumerQueue.java | 0 .../async/GenericAsyncConsumerQueue.java | 0 .../cache/InsLabelCacheConfiguration.java | 0 .../instance/label/conf/InsLabelConf.java | 0 .../label/dao/InsLabelRelationDao.java | 0 .../instance/label/dao/InstanceInfoDao.java | 0 .../instance/label/dao/InstanceLabelDao.java | 0 .../label/entity/InsPersistenceLabel.java | 0 .../entity/InsPersistenceLabelValue.java | 0 .../instance/label/entity/InstanceInfo.java | 0 .../LinkisInstanceLabelErrorCodeSummary.java | 0 .../exception/InstanceErrorException.java | 0 .../label/restful/InstanceRestful.java | 0 .../label/service/InsLabelAccessService.java | 0 .../label/service/InsLabelService.java | 0 .../label/service/InsLabelServiceAdapter.java | 0 .../label/service/annotation/AdapterMode.java | 0 .../service/impl/DefaultInsLabelService.java | 0 .../impl/DefaultInsLabelServiceAdapter.java | 0 .../service/impl/SpringInsLabelService.java | 0 .../instance/label/utils/EntityParser.java | 0 .../label/vo/InsPersistenceLabelSearchVo.java | 0 .../instance/label/vo/InstanceInfoVo.java | 0 .../mapper/mysql/InsLabelRelationMapper.xml | 0 .../mapper/mysql/InstanceInfoMapper.xml | 0 .../mapper/mysql/InstanceLabelMapper.xml | 0 .../postgresql/InsLabelRelationMapper.xml | 0 .../mapper/postgresql/InstanceInfoMapper.xml | 0 .../mapper/postgresql/InstanceLabelMapper.xml | 0 .../label/service/InsLabelRpcService.scala | 0 .../rpc/DefaultInsLabelRpcService.scala | 0 .../apache/linkis/instance/label/Scan.java | 0 .../instance/label/WebApplicationServer.java | 0 .../instance/label/dao/BaseDaoTest.java | 0 .../label/dao/InsLabelRelationDaoTest.java | 0 .../label/dao/InstanceInfoDaoTest.java | 0 .../label/dao/InstanceLabelDaoTest.java | 0 .../impl/DefaultInsLabelServiceTest.java | 0 .../label/utils/EntityParserTest.java | 0 .../src/test/resources/application.properties | 36 ++++++++++ .../src/test/resources/create.sql} | 0 .../src/test/resources/create_pg.sql} | 0 .../linkis-pes-publicservice/pom.xml | 19 ------ .../src/test/resources/application.properties | 6 +- linkis-public-enhancements/pom.xml | 6 ++ .../linkis-gateway-server-support/pom.xml | 2 +- 49 files changed, 119 insertions(+), 29 deletions(-) create mode 100644 linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/resources/mapper/mysql/InsLabelRelationMapper.xml (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/resources/mapper/mysql/InstanceInfoMapper.xml (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/resources/mapper/mysql/InstanceLabelMapper.xml (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/resources/mapper/postgresql/InsLabelRelationMapper.xml (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/resources/mapper/postgresql/InstanceInfoMapper.xml (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/resources/mapper/postgresql/InstanceLabelMapper.xml (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/test/java/org/apache/linkis/instance/label/Scan.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java (100%) rename linkis-public-enhancements/{linkis-pes-publicservice => linkis-instance-label/linkis-instance-label-server}/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java (100%) create mode 100644 linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties rename linkis-public-enhancements/{linkis-pes-publicservice/src/test/resources/instance_label_create.sql => linkis-instance-label/linkis-instance-label-server/src/test/resources/create.sql} (100%) rename linkis-public-enhancements/{linkis-pes-publicservice/src/test/resources/instance_label_create_pg.sql => linkis-instance-label/linkis-instance-label-server/src/test/resources/create_pg.sql} (100%) diff --git a/docs/errorcode/linkis-instance-label-errorcode.md b/docs/errorcode/linkis-instance-label-errorcode.md index 6390304aa5..5aa7432438 100644 --- a/docs/errorcode/linkis-instance-label-errorcode.md +++ b/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| diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml new file mode 100644 index 0000000000..bf0ff327f3 --- /dev/null +++ b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + org.apache.linkis + linkis + ${revision} + ../../../pom.xml + + + linkis-instance-label-server + + 2.8.4 + + + + org.apache.linkis + linkis-mybatis + ${project.version} + + + org.apache.linkis + linkis-rpc + ${project.version} + provided + + + org.apache.linkis + linkis-label-common + ${project.version} + + + org.reflections + reflections + + + + com.github.ben-manes.caffeine + caffeine + ${caffeine.version} + + + + + + net.alchim31.maven + scala-maven-plugin + + + + diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/InsLabelRelationMapper.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/mysql/InsLabelRelationMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/InsLabelRelationMapper.xml rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/mysql/InsLabelRelationMapper.xml diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/InstanceInfoMapper.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/mysql/InstanceInfoMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/InstanceInfoMapper.xml rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/mysql/InstanceInfoMapper.xml diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/InstanceLabelMapper.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/mysql/InstanceLabelMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/mysql/InstanceLabelMapper.xml rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/mysql/InstanceLabelMapper.xml diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/InsLabelRelationMapper.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/postgresql/InsLabelRelationMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/InsLabelRelationMapper.xml rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/postgresql/InsLabelRelationMapper.xml diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/InstanceInfoMapper.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/postgresql/InstanceInfoMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/InstanceInfoMapper.xml rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/postgresql/InstanceInfoMapper.xml diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/InstanceLabelMapper.xml b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/postgresql/InstanceLabelMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/resources/mapper/postgresql/InstanceLabelMapper.xml rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/postgresql/InstanceLabelMapper.xml diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/Scan.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/Scan.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/Scan.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/Scan.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties new file mode 100644 index 0000000000..b8b65f39b6 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/instance_label_create.sql b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create.sql similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/instance_label_create.sql rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create.sql diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/instance_label_create_pg.sql b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create_pg.sql similarity index 100% rename from linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/instance_label_create_pg.sql rename to linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create_pg.sql diff --git a/linkis-public-enhancements/linkis-pes-publicservice/pom.xml b/linkis-public-enhancements/linkis-pes-publicservice/pom.xml index 55b26058f6..86e45f43f8 100644 --- a/linkis-public-enhancements/linkis-pes-publicservice/pom.xml +++ b/linkis-public-enhancements/linkis-pes-publicservice/pom.xml @@ -26,9 +26,6 @@ linkis-pes-publicservice jar - - 2.8.4 - @@ -102,22 +99,6 @@ oshi-core 6.2.1 - - - org.apache.linkis - linkis-label-common - ${project.version} - - - org.reflections - reflections - - - - com.github.ben-manes.caffeine - caffeine - ${caffeine.version} - diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/application.properties b/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/application.properties index 5cfe01108d..f997dc0727 100644 --- a/linkis-public-enhancements/linkis-pes-publicservice/src/test/resources/application.properties +++ b/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 \ No newline at end of file diff --git a/linkis-public-enhancements/pom.xml b/linkis-public-enhancements/pom.xml index da6889dee9..760ea05698 100644 --- a/linkis-public-enhancements/pom.xml +++ b/linkis-public-enhancements/pom.xml @@ -39,6 +39,7 @@ linkis-udf/linkis-udf-service linkis-jobhistory linkis-configuration + linkis-instance-label/linkis-instance-label-server linkis-ps-common-lock @@ -68,6 +69,11 @@ linkis-configuration ${project.version} + + org.apache.linkis + linkis-instance-label-server + ${project.version} + org.apache.linkis linkis-jobhistory diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml index 8a27501d1d..b089c4bfe9 100644 --- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml +++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml @@ -77,7 +77,7 @@ org.apache.linkis - linkis-pes-publicservice + linkis-instance-label-server ${project.version}