新增：Java通用ZHub客户端分支

pom.xml

@@ -4,43 +4,33 @@
          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>
 
-    <groupId>net.tccn</groupId>
-    <artifactId>zhub-client-spring</artifactId>
-    <version>17.0.0409.dev</version>
+    <groupId>dev.zhub</groupId>
+    <artifactId>zhub-client</artifactId>
+    <version>0.1.0424.dev</version>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.10</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
+    <description>ZHub-Java 通用客户端</description>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <version>2.10.1</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <!--<version>4.13.1</version>-->
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <!--<version>1.18.30</version>-->
+            <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -59,5 +49,12 @@
             <url>https://nexus.1216.top/repository/maven-releases/</url>
         </repository>
     </distributionManagement>
+    <!--<distributionManagement>
+        <repository>
+            <id>mvn-recloud</id>
+            <name>mvn-release</name>
+            <url>http://nexus.recloud.cn/repository/maven-releases/</url>
+        </repository>
+    </distributionManagement>-->
 
 </project>

src/main/java/dev/zhub/AbstractConsumer.java

@@ -1,10 +1,9 @@
-package tccn;
+package dev.zhub;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import tccn.zhub.Rpc;
+import dev.zhub.client.Rpc;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;

src/main/java/dev/zhub/Event.java

@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 /**
  * 发布订阅 事件

src/main/java/dev/zhub/EventType.java

@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 
 import com.google.gson.reflect.TypeToken;

src/main/java/dev/zhub/IConsumer.java

@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 import com.google.gson.reflect.TypeToken;
 

src/main/java/dev/zhub/IProducer.java

@@ -1,4 +1,4 @@
-package tccn;
+package dev.zhub;
 
 import java.util.logging.Logger;
 

src/main/java/dev/zhub/IType.java

@@ -0,0 +1,27 @@
+package dev.zhub;
+
+import com.google.gson.reflect.TypeToken;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IType {
+
+    TypeToken<String> STRING = new TypeToken<String>() {
+    };
+
+    TypeToken<Short> SHORT = new TypeToken<Short>() {
+    };
+    TypeToken<Integer> INT = new TypeToken<Integer>() {
+    };
+    TypeToken<Long> LONG = new TypeToken<Long>() {
+    };
+    TypeToken<Double> DOUBLE = new TypeToken<Double>() {
+    };
+
+    TypeToken<Map<String, String>> MAP = new TypeToken<Map<String, String>>() {
+    };
+
+    TypeToken<List<Map<String, String>>> LMAP = new TypeToken<List<Map<String, String>>>() {
+    };
+}

src/main/java/dev/zhub/client/Lock.java

@@ -1,4 +1,4 @@
-package tccn.zhub;
+package dev.zhub.client;
 
 // ================================================== lock ==================================================
 public class Lock {

src/main/java/dev/zhub/client/Rpc.java

@@ -1,4 +1,4 @@
-package tccn.zhub;
+package dev.zhub.client;
 
 import com.google.gson.Gson;
 import com.google.gson.annotations.Expose;

src/main/java/dev/zhub/client/RpcResult.java

@@ -0,0 +1,13 @@
+package dev.zhub.client;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class RpcResult<R> {
+    private String ruk;
+    private int retcode;
+    private String retinfo;
+    private R result;
+}

src/main/java/dev/zhub/client/ZHubClient.java

@@ -1,12 +1,9 @@
-package tccn.zhub;
+package dev.zhub.client;
 
 import com.google.gson.reflect.TypeToken;
-import jakarta.annotation.PostConstruct;
+import dev.zhub.*;
+import dev.zhub.timer.Timers;
 import lombok.Setter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import tccn.*;
-import tccn.timer.Timers;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -22,24 +19,18 @@ import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-@Component
 public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer {
 
     public Logger logger = Logger.getLogger(ZHubClient.class.getSimpleName());
     @Setter
-    @Value("${zhub.addr}")
     private String addr = "127.0.0.1:1216";
     @Setter
-    @Value("${zhub.groupid}")
     private String groupid = "";
     @Setter
-    @Value("${zhub.auth}")
     private String auth = "";
     @Setter
-    @Value("${zhub.appid}")
     protected String appid = "";
 
-    @PostConstruct
     public void init() {
         init(null);
     }
@@ -638,7 +629,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
             TypeToken typeToken = rpc.getTypeToken();
             if (typeToken.getType() != ((RpcResult<?>) value).getResult().getClass()) {
                 Object result = gson.fromJson(toStr(((RpcResult<?>) value).getResult()), typeToken.getType());
-                ((RpcResult<?>) value).setResult(result);
+                ((RpcResult<Object>) value).setResult(result);
             }
 
             rpc.setRpcResult((RpcResult) value);

src/main/java/dev/zhub/timer/TimerExecutor.java

@@ -1,7 +1,7 @@
-package tccn.timer;
+package dev.zhub.timer;
 
-import tccn.timer.queue.TimerQueue;
-import tccn.timer.task.Task;
+import dev.zhub.timer.queue.TimerQueue;
+import dev.zhub.timer.task.Task;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

src/main/java/dev/zhub/timer/TimerTask.java

@@ -1,8 +1,8 @@
-package tccn.timer;
+package dev.zhub.timer;
 
-import tccn.timer.scheduled.Scheduled;
-import tccn.timer.task.Job;
-import tccn.timer.task.Task;
+import dev.zhub.timer.scheduled.Scheduled;
+import dev.zhub.timer.task.Job;
+import dev.zhub.timer.task.Task;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;

src/main/java/dev/zhub/timer/Timers.java

@@ -1,6 +1,6 @@
-package tccn.timer;
+package dev.zhub.timer;
 
-import tccn.timer.scheduled.ScheduledCycle;
+import dev.zhub.timer.scheduled.ScheduledCycle;
 
 import java.util.UUID;
 import java.util.function.Supplier;

src/main/java/dev/zhub/timer/queue/TimerQueue.java

@@ -1,6 +1,6 @@
-package tccn.timer.queue;
+package dev.zhub.timer.queue;
 
-import tccn.timer.task.Task;
+import dev.zhub.timer.task.Task;
 
 import java.util.LinkedList;
 import java.util.concurrent.TimeUnit;

src/main/java/dev/zhub/timer/scheduled/Scheduled.java

@@ -1,4 +1,4 @@
-package tccn.timer.scheduled;
+package dev.zhub.timer.scheduled;
 
 import java.time.LocalDateTime;
 

src/main/java/dev/zhub/timer/scheduled/ScheduledCycle.java

@@ -1,4 +1,4 @@
-package tccn.timer.scheduled;
+package dev.zhub.timer.scheduled;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;

src/main/java/dev/zhub/timer/scheduled/ScheduledExpres.java

@@ -1,4 +1,4 @@
-package tccn.timer.scheduled;
+package dev.zhub.timer.scheduled;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;

src/main/java/dev/zhub/timer/task/Job.java

@@ -1,4 +1,4 @@
-package tccn.timer.task;
+package dev.zhub.timer.task;
 
 /**
  * @author: liangxianyou at 2018/12/8 17:24.

src/main/java/dev/zhub/timer/task/Task.java

@@ -1,7 +1,7 @@
-package tccn.timer.task;
+package dev.zhub.timer.task;
 
-import tccn.timer.TimerExecutor;
-import tccn.timer.scheduled.Scheduled;
+import dev.zhub.timer.TimerExecutor;
+import dev.zhub.timer.scheduled.Scheduled;
 
 /**
  * @author: liangxianyou at 2018/8/5 19:32.

src/main/java/tccn/IType.java

@@ -1,27 +0,0 @@
-package tccn;
-
-import com.google.gson.reflect.TypeToken;
-
-import java.util.List;
-import java.util.Map;
-
-public interface IType {
-
-    TypeToken<String> STRING = new TypeToken<>() {
-    };
-
-    TypeToken<Short> SHORT = new TypeToken<>() {
-    };
-    TypeToken<Integer> INT = new TypeToken<>() {
-    };
-    TypeToken<Long> LONG = new TypeToken<>() {
-    };
-    TypeToken<Double> DOUBLE = new TypeToken<>() {
-    };
-
-    TypeToken<Map<String, String>> MAP = new TypeToken<>() {
-    };
-
-    TypeToken<List<Map<String, String>>> LMAP = new TypeToken<List<Map<String, String>>>() {
-    };
-}

src/main/java/tccn/zhub/RpcResult.java

@@ -1,40 +0,0 @@
-package tccn.zhub;
-
-public class RpcResult<R> {
-    private String ruk;
-    private int retcode;
-    private String retinfo;
-    private R result;
-
-    public String getRuk() {
-        return ruk;
-    }
-
-    public void setRuk(String ruk) {
-        this.ruk = ruk;
-    }
-
-    public int getRetcode() {
-        return retcode;
-    }
-
-    public void setRetcode(int retcode) {
-        this.retcode = retcode;
-    }
-
-    public String getRetinfo() {
-        return retinfo;
-    }
-
-    public void setRetinfo(String retinfo) {
-        this.retinfo = retinfo;
-    }
-
-    public R getResult() {
-        return result;
-    }
-
-    public void setResult(Object result) {
-        this.result = (R) result;
-    }
-}

test/HelloService.java

@@ -1,8 +1,8 @@
 import org.junit.Before;
 import org.junit.Test;
-import tccn.IType;
-import tccn.zhub.Lock;
-import tccn.zhub.ZHubClient;
+import net.tccn.IType;
+import net.tccn.zhub.Lock;
+import net.tccn.zhub.ZHubClient;
 
 // @RestService(automapping = true)
 public class HelloService {