Merge branch 'feature' into 'release'

2023/05/09 client升级

See merge request !13

middleware-automatic-center-client-autoconfigure/pom.xml

@@ -11,13 +11,13 @@
     </parent>
 
     <artifactId>middleware-automatic-center-autoconfigure</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <automatic.version>1.0-SNAPSHOT</automatic.version>
+        <automatic.version>1.0.0.1-SNAPSHOT</automatic.version>
     </properties>
 
     <dependencies>

middleware-automatic-center-client/pom.xml

@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>middleware-automatic-center-client</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0.1-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

middleware-automatic-center-client/src/main/java/com/zhiwei/middleware/automatic/server/core/AutoMaticClientFactory.java

@@ -70,17 +70,25 @@ public class AutoMaticClientFactory {
         return null;
     }
 
-    public static AutoMaticClient getAutoMaticClient(String registry, String group, String appName, long timeOut) {
+    private static <T> T createInstance(Class<T> tClass, String registry, String group, String appName, ConfigCenterConfig configCenterConfig) {
         ApplicationConfig application = new ApplicationConfig();
         RegistryConfig reg = new RegistryConfig(registry);
         application.setName(appName);
         ConsumerConfig consumer = new ConsumerConfig();
         consumer.setGroup(group);
+        return createInstance(tClass, application, reg, consumer, configCenterConfig);
+    }
+
+
+    public static AutoMaticClient getAutoMaticClient(String registry, String group, String appName, long timeOut) {
         ConfigCenterConfig configCenterConfig = new ConfigCenterConfig();
         configCenterConfig.setTimeout(timeOut);
-        return new AutoMaticClient(createInstance(AutoMaticService.class, application, reg, consumer, configCenterConfig));
+        return new AutoMaticClient(createInstance(AutoMaticService.class, registry, group, appName, configCenterConfig));
     }
 
+    public static AutoMaticClient getAutoMaticClient(String registry, String group, String appName) {
+        return new AutoMaticClient(createInstance(AutoMaticService.class, registry, group, appName, null));
+    }
 
     /**
      * 获取自动标注client

middleware-automatic-center-server/pom.xml

@@ -21,7 +21,7 @@
         <qbjc-bean.version>1.1.4.1-SNAPSHOT</qbjc-bean.version>
         <nlp-aggree.version>0.0.5-SNAPSHOT</nlp-aggree.version>
         <dubbo-server.version>2.7.4.1</dubbo-server.version>
-        <automatic.version>1.0-SNAPSHOT</automatic.version>
+        <automatic.version>1.0.0.1-SNAPSHOT</automatic.version>
         <base.version>2.0.0-SNAPSHOT</base.version>
     </properties>