From 62810d099339c38a64497ebdd12efcddca3b327a Mon Sep 17 00:00:00 2001
From: hotlcc <hotlcc@qq.com>
Date: Wed, 25 Jul 2018 22:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/hotlcc/wechat4j/Wechat.java | 20 +++++++++++--------
 src/test/java/TestClass2.java                 |  5 +++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/hotlcc/wechat4j/Wechat.java b/src/main/java/com/hotlcc/wechat4j/Wechat.java
index 4f2ba46..c37f2c4 100644
--- a/src/main/java/com/hotlcc/wechat4j/Wechat.java
+++ b/src/main/java/com/hotlcc/wechat4j/Wechat.java
@@ -569,17 +569,21 @@ public class Wechat {
      * 退出登录
      */
     public void logout(boolean clearAllLoginInfo) {
-        try {
-            isOnlineLock.lock();
+        if (isOnline) {
+            try {
+                isOnlineLock.lock();
 
-            webWeixinApi.logout(httpClient, urlVersion, new BaseRequest(wxsid, skey, wxuin));
-            isOnline = false;
+                if (isOnline) {
+                    webWeixinApi.logout(httpClient, urlVersion, new BaseRequest(wxsid, skey, wxuin));
+                    isOnline = false;
 
-            if (clearAllLoginInfo) {
-                clearAllLoginInfo();
+                    if (clearAllLoginInfo) {
+                        clearAllLoginInfo();
+                    }
+                }
+            } finally {
+                isOnlineLock.unlock();
             }
-        } finally {
-            isOnlineLock.unlock();
         }
     }
 
diff --git a/src/test/java/TestClass2.java b/src/test/java/TestClass2.java
index b6c6a4d..dbae62a 100644
--- a/src/test/java/TestClass2.java
+++ b/src/test/java/TestClass2.java
@@ -4,6 +4,7 @@ import com.hotlcc.wechat4j.api.WebWeixinApi;
 import com.hotlcc.wechat4j.handler.ReceivedMsgHandler;
 import com.hotlcc.wechat4j.model.ReceivedMsg;
 import com.hotlcc.wechat4j.model.UserInfo;
+import com.sun.scenario.effect.GaussianShadow;
 
 public class TestClass2 {
     public static void main(String[] args) {
@@ -22,5 +23,9 @@ public class TestClass2 {
             }
         });
         wechat.autoLogin();
+        UserInfo userInfo = wechat.getContactByNickName(false, "Allen");
+        System.out.println(JSONObject.toJSONString(userInfo));
+        wechat.sendText("aaa", userInfo.getUserName());
+        wechat.logout();
     }
 }