封禁用户问题修改

broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlockUserAction.java

@@ -45,7 +45,7 @@ public class BlockUserAction extends AdminAction {
                 result = RestResult.resultOf(errorCode);
                 response.setContent(new Gson().toJson(result));
 
-                if (inputUserBlock.getStatus() != 0) {
+                if (inputUserBlock.getStatus() == 2) {
                     RPCCenter.getInstance().sendRequest(null, null, RPCCenter.KICKOFF_USER_REQUEST, inputUserBlock.getUserId().getBytes(), inputUserBlock.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, null, true);
                 }
 

broker/src/main/java/io/moquette/persistence/DatabaseStore.java

@@ -1623,6 +1623,27 @@ public class DatabaseStore {
         });
     }
 
+    void deleteUserStatus(String userId) {
+        mScheduler.execute(()->{
+            Connection connection = null;
+            PreparedStatement statement = null;
+            try {
+                connection = DBUtil.getConnection();
+                String sql = "delete from t_user_status where _uid = ?";
+                statement = connection.prepareStatement(sql);
+                statement.setString(1, userId);
+                int count = statement.executeUpdate();
+                LOG.info("Update rows {}", count);
+            } catch (SQLException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+                Utility.printExecption(LOG, e);
+            } finally {
+                DBUtil.closeDB(connection, statement);
+            }
+        });
+    }
+
     void updateUserStatus(String userId, int status) {
         mScheduler.execute(()->{
             Connection connection = null;

broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java

@@ -1165,7 +1165,6 @@ public class MemoryMessagesStore implements IMessagesStore {
         } else {
             mUserMap.put(userId, status);
         }
-        databaseStore.updateUserStatus(userId, status);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 

broker/src/main/java/io/moquette/persistence/UserStatusLoader.java

@@ -27,7 +27,7 @@ public class UserStatusLoader implements MapStore<String, Integer> {
 
     @Override
     public void delete(String s) {
-        getDatabaseStore().deleteUser(s);
+        getDatabaseStore().deleteUserStatus(s);
     }
 
     @Override