Merge pull request #19 from andrewshan/main

feat：更新版本号，修改common-polaris为polaris-adapter-dubbo

dubbo/dubbo-plugins/dubbo-registry-polaris/pom.xml

@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>com.tencent.polaris</groupId>
-            <artifactId>common-polaris</artifactId>
+            <artifactId>polaris-adapter-dubbo</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

dubbox/dubbox-plugins/dubbox-registry-polaris/pom.xml

@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>com.tencent.polaris</groupId>
-            <artifactId>common-polaris</artifactId>
+            <artifactId>polaris-adapter-dubbo</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

common-polaris/pom.xml → polaris-adapter-dubbo/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>common-polaris</artifactId>
+    <artifactId>polaris-adapter-dubbo</artifactId>
 
     <dependencies>
         <dependency>
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 </project>

common-polaris/src/main/java/com/tencent/polaris/common/registry/PolarisOperator.java → polaris-adapter-dubbo/src/main/java/com/tencent/polaris/common/registry/PolarisOperator.java

@@ -25,18 +25,21 @@
 import com.tencent.polaris.api.pojo.RetStatus;
 import com.tencent.polaris.api.pojo.RouteArgument;
 import com.tencent.polaris.api.pojo.ServiceEventKey.EventType;
+import com.tencent.polaris.api.pojo.ServiceInfo;
 import com.tencent.polaris.api.pojo.ServiceKey;
 import com.tencent.polaris.api.pojo.ServiceRule;
 import com.tencent.polaris.api.pojo.SourceService;
 import com.tencent.polaris.api.rpc.Criteria;
 import com.tencent.polaris.api.rpc.GetHealthyInstancesRequest;
 import com.tencent.polaris.api.rpc.GetServiceRuleRequest;
+import com.tencent.polaris.api.rpc.GetServicesRequest;
 import com.tencent.polaris.api.rpc.InstanceDeregisterRequest;
 import com.tencent.polaris.api.rpc.InstanceRegisterRequest;
 import com.tencent.polaris.api.rpc.InstanceRegisterResponse;
 import com.tencent.polaris.api.rpc.InstancesResponse;
 import com.tencent.polaris.api.rpc.ServiceCallResult;
 import com.tencent.polaris.api.rpc.ServiceRuleResponse;
+import com.tencent.polaris.api.rpc.ServicesResponse;
 import com.tencent.polaris.api.rpc.UnWatchServiceRequest;
 import com.tencent.polaris.api.rpc.WatchServiceRequest;
 import com.tencent.polaris.client.api.SDKContext;
@@ -253,6 +256,13 @@ public ServiceRule getServiceRule(String service, EventType eventType) {
         return serviceRule.getServiceRule();
     }
 
+    public List<ServiceInfo> getServices() {
+        GetServicesRequest getServicesRequest = new GetServicesRequest();
+        getServicesRequest.setNamespace(polarisConfig.getNamespace());
+        ServicesResponse services = consumerAPI.getServices(getServicesRequest);
+        return services.getServices();
+    }
+
     public PolarisConfig getPolarisConfig() {
         return polarisConfig;
     }

common-polaris/src/main/java/com/tencent/polaris/common/registry/PolarisOperators.java → polaris-adapter-dubbo/src/main/java/com/tencent/polaris/common/registry/PolarisOperators.java

@@ -45,4 +45,9 @@ public PolarisOperator getFirstPolarisOperator() {
         return polarisOperatorMap.values().iterator().next();
     }
 
+    public void deletePolarisOperator(String host, int port) {
+        String address = String.format("%s:%d", host, port);
+        polarisOperatorMap.remove(address);
+    }
+
 }

pom.xml

@@ -9,7 +9,7 @@
     <packaging>pom</packaging>
     <version>${revision}</version>
     <modules>
-        <module>common-polaris</module>
+        <module>polaris-adapter-dubbo</module>
         <module>dubbo</module>
         <module>dubbox</module>
     </modules>
@@ -38,7 +38,7 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>0.1.1-SNAPSHOT</revision>
+        <revision>0.1.2-SNAPSHOT</revision>
         <timestamp>${maven.build.timestamp}</timestamp>
         <skip.maven.deploy>false</skip.maven.deploy>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
@@ -51,7 +51,6 @@
         <maven.source.plugin.version>3.2.0</maven.source.plugin.version>
         <maven.javadoc.plugin.version>3.2.0</maven.javadoc.plugin.version>
         <maven.gpg.plugin.version>3.0.1</maven.gpg.plugin.version>
-        <maven.shaded.plugin.version>3.2.4</maven.shaded.plugin.version>
         <maven.deploy.plugin.version>3.0.0-M1</maven.deploy.plugin.version>
         <maven.flatten.plugin.version>1.2.5</maven.flatten.plugin.version>
         <polaris.version>1.10.1</polaris.version>