From 1e23fc383b9dee3caeea61eb471aebece9f98509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com>
Date: Wed, 24 Apr 2024 22:58:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9AJava=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8ZHub=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 22 +++--------
 src/main/java/dev/zhub/client/RpcResult.java  | 37 +++----------------
 src/main/java/dev/zhub/client/ZHubClient.java |  9 -----
 3 files changed, 11 insertions(+), 57 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3944c8d..d5507e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,15 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>dev.zhub</groupId>
-    <artifactId>zhub-client-spring</artifactId>
-    <version>8.0.0424.dev</version>
+    <artifactId>zhub-client</artifactId>
+    <version>0.1.0424.dev</version>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.4</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
+    <description>ZHub-Java 通用客户端</description>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -21,26 +16,21 @@
     </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>
diff --git a/src/main/java/dev/zhub/client/RpcResult.java b/src/main/java/dev/zhub/client/RpcResult.java
index aa5d818..d5ebe46 100644
--- a/src/main/java/dev/zhub/client/RpcResult.java
+++ b/src/main/java/dev/zhub/client/RpcResult.java
@@ -1,40 +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;
-
-    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(R result) {
-        this.result = result;
-    }
 }
diff --git a/src/main/java/dev/zhub/client/ZHubClient.java b/src/main/java/dev/zhub/client/ZHubClient.java
index 68e8600..7cfbaf2 100644
--- a/src/main/java/dev/zhub/client/ZHubClient.java
+++ b/src/main/java/dev/zhub/client/ZHubClient.java
@@ -4,10 +4,7 @@ import com.google.gson.reflect.TypeToken;
 import dev.zhub.*;
 import dev.zhub.timer.Timers;
 import lombok.Setter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -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);
     }