From 38b84f0fa5c948e55fad010943f3320253eef6ce Mon Sep 17 00:00:00 2001
From: heavyrain lee <heavyrain.lee@gmail.com>
Date: Sun, 21 Jul 2019 12:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B0=81=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=97=A0=E6=B3=95=E8=B8=A2=E7=94=A8=E6=88=B7=E4=B8=8B?=
 =?UTF-8?q?=E7=BA=BF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/moquette/spi/impl/ProtocolProcessor.java   | 3 ++-
 sdk/src/main/java/cn/wildfirechat/sdk/Main.java             | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
index f809ab638..7340b419e 100755
--- a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
+++ b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java
@@ -623,7 +623,8 @@ public ISessionsStore getSessionsStore() {
 
     public void onRpcMsg(String fromUser, String clientId, byte[] message, int messageId, String from, String request, boolean isAdmin) {
         if(request.equals(RPCCenter.KICKOFF_USER_REQUEST)) {
-            mServer.getImBusinessScheduler().execute(()->handleTargetRemovedFromCurrentNode(new TargetEntry(TargetEntry.Type.TARGET_TYPE_USER, from)));
+            String userId = new String(message);
+            mServer.getImBusinessScheduler().execute(()->handleTargetRemovedFromCurrentNode(new TargetEntry(TargetEntry.Type.TARGET_TYPE_USER, userId)));
             return;
         }
         qos1PublishHandler.onRpcMsg(fromUser, clientId, message, messageId, from, request, isAdmin);
diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java
index 9568c02f4..21d5f4d0f 100644
--- a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java
+++ b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java
@@ -103,7 +103,7 @@ public static void main(String[] args) throws Exception {
             System.exit(-1);
         }
 
-        IMResult<Void> resultVoid =UserAdmin.updateUserBlockStatus(userInfo.getUserId(), 1);
+        IMResult<Void> resultVoid =UserAdmin.updateUserBlockStatus(userInfo.getUserId(), 2);
         if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("block user done");
         } else {
@@ -113,7 +113,7 @@ public static void main(String[] args) throws Exception {
 
         IMResult<OutputUserStatus> resultCheckUserStatus = UserAdmin.checkUserBlockStatus(userInfo.getUserId());
         if (resultCheckUserStatus != null && resultCheckUserStatus.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            if (resultCheckUserStatus.getResult().getStatus() == 1) {
+            if (resultCheckUserStatus.getResult().getStatus() == 2) {
                 System.out.println("check user status success");
             } else {
                 System.out.println("user status not correct");
@@ -128,7 +128,7 @@ public static void main(String[] args) throws Exception {
         if (resultBlockStatusList != null && resultBlockStatusList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             boolean success = false;
             for (InputOutputUserBlockStatus blockStatus : resultBlockStatusList.getResult().getStatusList()) {
-                if (blockStatus.getUserId().equals(userInfo.getUserId()) && blockStatus.getStatus() == 1) {
+                if (blockStatus.getUserId().equals(userInfo.getUserId()) && blockStatus.getStatus() == 2) {
                     System.out.println("get block list done");
                     success = true;
                     break;