From c0708e49d042c6118807c4f23df29d3c8473d714 Mon Sep 17 00:00:00 2001
From: Changhua <lichanghua0821@gmail.com>
Date: Sun, 9 Apr 2023 16:20:38 +0800
Subject: [PATCH] Adapt new dll

---
 .../src/main/java/com/iamteer/Client.java     | 27 ++++++++++++++-----
 .../src/main/java/com/iamteer/Main.java       | 10 +++----
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/java/wcferry/src/main/java/com/iamteer/Client.java b/java/wcferry/src/main/java/com/iamteer/Client.java
index 2088779..9ca88a0 100644
--- a/java/wcferry/src/main/java/com/iamteer/Client.java
+++ b/java/wcferry/src/main/java/com/iamteer/Client.java
@@ -20,28 +20,40 @@ public class Client {
     private final int BUFFER_SIZE = 16 * 1024 * 1024; // 16M
     private Socket cmdSocket = null;
     private Socket msgSocket = null;
-    private String cmdUrl = "tcp://127.0.0.1:10086";
+    private String host = "127.0.0.1";
+    private int port = 10086;
     private boolean isReceivingMsg = false;
     private boolean isLocalHostPort = false;
     private BlockingQueue<WxMsg> msgQ;
     private String wcfPath;
 
-    public Client(String hostPort) {
-        cmdUrl = hostPort;
+    public Client(String host, int port) {
+        this.host = host;
+        this.port = port;
+        String cmdUrl = "tcp://" + host + ":" + port;
         connectRPC(cmdUrl);
     }
 
+    public Client(int port, boolean debug) {
+        initClient(this.host, port, debug);
+    }
+
     public Client(boolean debug) {
+        initClient(this.host, this.port, debug);
+    }
+
+    private void initClient(String host, int port, boolean debug) {
         try {
             URL url = this.getClass().getResource("/win32-x86-64/wcf.exe");
             wcfPath = url.getFile();
-            String[] cmd = new String[3];
+            String[] cmd = new String[4];
             cmd[0] = wcfPath;
             cmd[1] = "start";
+            cmd[2] = Integer.toString(port);
             if (debug) {
-                cmd[2] = "debug";
+                cmd[3] = "debug";
             } else {
-                cmd[2] = "";
+                cmd[3] = "";
             }
             int status = Runtime.getRuntime().exec(cmd).waitFor();
             if (status != 0) {
@@ -49,6 +61,7 @@ public class Client {
                 System.exit(-1);
             }
             isLocalHostPort = true;
+            String cmdUrl = "tcp://" + host + ":" + port;
             connectRPC(cmdUrl);
         } catch (Exception e) {
             logger.error("初始化失败: {}", e);
@@ -296,7 +309,7 @@ public class Client {
 
         isReceivingMsg = true;
         msgQ = new ArrayBlockingQueue<WxMsg>(qSize);
-        String msgUrl = cmdUrl.replace("10086", "10087");
+        String msgUrl = "tcp://" + this.host + ":" + (this.port + 1);
         Thread thread = new Thread(new Runnable() {
             public void run() {
                 listenMsg(msgUrl);
diff --git a/java/wcferry/src/main/java/com/iamteer/Main.java b/java/wcferry/src/main/java/com/iamteer/Main.java
index 0e8ceac..47253de 100644
--- a/java/wcferry/src/main/java/com/iamteer/Main.java
+++ b/java/wcferry/src/main/java/com/iamteer/Main.java
@@ -8,18 +8,18 @@ public class Main {
 
     public static void main(String[] args) {
         // 连接远程 RPC
-        // final String url = "tcp://192.168.1.104:10086";
-        // Client client = new Client(url);
+        // Client client = new Client("127.0.0.1", 10086);
 
         // 本地启动 RPC
-        Client client = new Client(true);
+        Client client = new Client(true); // 默认 10086 端口
+        // Client client = new Client(10088,true); // 也可以指定端口
 
         // 是否已登录
         logger.info("isLogin: {}", client.isLogin());
-/*
+
         // 登录账号 wxid
         logger.info("wxid: {}", client.getSelfWxid());
-
+/*
         // 消息类型
         logger.info("message types: {}", client.getMsgTypes());