修改重构引入的部分问题

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

@@ -46,7 +46,7 @@ public class AddFriendRequestAction extends AdminAction {
                 byteBuf.writeBytes(result);
                 ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
                 return new Result(errorCode);
-            });
+            }, !input.isForce());
             return false;
         }
         return true;

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

@@ -92,9 +92,16 @@ abstract public class AdminAction extends Action {
         response.setContent(new Gson().toJson(result));
         response.send();
     }
-
     protected void sendApiMessage(String fromUser, String topic, byte[] message, ApiCallback callback) {
-        ServerAPIHelper.sendRequest(fromUser, null, topic, message, new ServerAPIHelper.Callback() {
+        sendApiMessage(fromUser, null, topic, message, callback, false);
+    }
+
+    protected void sendApiMessage(String fromUser, String topic, byte[] message, ApiCallback callback, boolean noAdmin) {
+        sendApiMessage(fromUser, null, topic, message, callback, noAdmin);
+    }
+
+    protected void sendApiMessage(String fromUser, String clientId, String topic, byte[] message, ApiCallback callback, boolean noAdmin) {
+        ServerAPIHelper.sendRequest(fromUser, clientId, topic, message, new ServerAPIHelper.Callback() {
             @Override
             public void onSuccess(byte[] result) {
                 if(callback != null) {
@@ -119,6 +126,6 @@ abstract public class AdminAction extends Action {
                     ctx.executor().execute(command);
                 };
             }
-        }, true);
+        }, !noAdmin);
     }
 }

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

@@ -38,7 +38,7 @@ public class GetIMTokenAction extends AdminAction {
 
 
             WFCMessage.GetTokenRequest getTokenRequest = WFCMessage.GetTokenRequest.newBuilder().setUserId(userId).setClientId(input.getClientId()).setPlatform(input.getPlatform() == null ? 0 : input.getPlatform()).build();
-            sendApiMessage(userId, IMTopic.GetTokenTopic, getTokenRequest.toByteArray(), result -> {
+            sendApiMessage(userId, input.getClientId(), IMTopic.GetTokenTopic, getTokenRequest.toByteArray(), result -> {
                 ErrorCode errorCode1 = ErrorCode.fromCode(result[0]);
                 if (errorCode1 == ErrorCode.ERROR_CODE_SUCCESS) {
                     //ba errorcode qudiao
@@ -52,7 +52,7 @@ public class GetIMTokenAction extends AdminAction {
                 } else {
                     return new Result(errorCode1);
                 }
-            });
+            }, false);
             return false;
         }
         return true;