update to version 0.21

Merge branch 'refactor_server_api' into wildfirechat
* refactor_server_api: update update update update update update
2019-05-25 13:56:26 +08:00 · 2019-05-25 13:54:40 +08:00 · 2019-05-25 13:53:51 +08:00 · 2019-05-25 07:55:58 +08:00 · 2019-05-25 07:55:30 +08:00 · 2019-05-24 21:08:31 +08:00
197 changed files with 3565 additions and 1489 deletions
@@ -4,8 +4,8 @@

 | 仓库                                                         | 说明                                                    | 备注                                           |
 | ------------------------------------------------------------ | ------------------------------------------------------- | ---------------------------------------------- |
-| [android-chat](https://github.com/wildfirechat/android-chat) | 野火IM Android App                                      | 可以很方便地进行二次开发，或集成到现有应用当中 |
-| [ios-chat](https://github.com/wildfirechat/ios-chat)         | 野火IM iOS App                                          | 可以很方便地进行二次开发，或集成到现有应用当中 |
+| [android-chat](https://github.com/wildfirechat/android-chat) | 野火IM Android SDK源码和App源码                                      | 可以很方便地进行二次开发，或集成到现有应用当中 |
+| [ios-chat](https://github.com/wildfirechat/ios-chat)         | 野火IM iOS SDK源码和App源码                                          | 可以很方便地进行二次开发，或集成到现有应用当中 |
 | [pc-chat](https://github.com/wildfirechat/pc-chat)           | 基于[Electron](https://electronjs.org/)开发的PC平台应用 |                                                |
 | [proto](https://github.com/wildfirechat/proto)               | 野火IM的协议栈实现                                      |                                                |
 | [server](https://github.com/wildfirechat/server)             | IM server                                               |                                                |
@@ -24,7 +24,9 @@
 ### 联系我们
 问题讨论请加群：822762829

-<img src="http://static.wildfirechat.cn/qr_qqgroup.jpeg" width = 50% height = 50% />
+微信公众号：
+
+<img src="http://static.wildfirechat.cn/wx_wfc_qrcode.jpg" width = 50% height = 50% />

 #### 体验Demo
 我们提供了体验demo，请使用微信扫码下载安装体验
@@ -3,15 +3,9 @@
    xsi:schemaLocation="http://www.hazelcast.com/schema/config
  http://www.hazelcast.com/schema/config/hazelcast-config-3.5.xsd"
    xmlns="http://www.hazelcast.com/schema/config">
-
-    <group>
-        <!--<name>wfc-dev</name>-->
-        <name>wfc-pro</name>
-    </group>
-
    <network>
        <join>
-            <multicast enabled="true"/>
+            <multicast enabled="false"/>
        </join>
    </network>

@@ -32,6 +32,10 @@ embed.db 1
 ##服务器管理接口密钥
 http.admin.secret_key 123456

+##服务器API接口参数是否检查时间。当设置为false时，所有的请求会检查时间的有效性；当设置为true时，可以在http.admin.secret_key保持不变的情况下，使用固定的服务API签名
+##nonce = "76616", timestamp = "1558350862502", sign = "b98f9b0717f59febccf1440067a7f50d9b31bdde"
+http.admin.no_check_time true
+
 ##客户端协议栈密钥，需要与客户端协议栈文件libemqq.cc文件中的aes_key值保持一致，16进制byte用逗号分割。这个密钥对安全性帮助不大，客户不要修改
 client.proto.secret_key 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F

@@ -5,7 +5,7 @@
        <relativePath>../</relativePath>
        <artifactId>wildfirechat-parent</artifactId>
        <groupId>cn.wildfirechat</groupId>
-        <version>0.20</version>
+        <version>0.21</version>
    </parent>

    <artifactId>moquette-broker</artifactId>
@@ -37,6 +37,12 @@
            <version>${project.version}</version>
        </dependency>

+        <dependency>
+            <groupId>cn.wildfirechat</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
        <!-- https://mvnrepository.com/artifact/log4j/log4j -->
        <dependency>
            <groupId>log4j</groupId>
@@ -44,13 +50,6 @@
            <version>1.2.14</version>
        </dependency>

-        <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.2</version>
-        </dependency>
-
        <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
        <dependency>
            <groupId>mysql</groupId>
@@ -127,13 +126,6 @@
            <version>3.2.2</version>
        </dependency>

-        <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>2.5.0</version>
-        </dependency>
-
        <dependency>
            <groupId>com.librato.metrics</groupId>
            <artifactId>metrics-librato</artifactId>
@@ -349,7 +341,7 @@
                    <!--指定"git.properties"文件的存放路径(相对于${project.basedir}的一个路径);-->
                    <generateGitPropertiesFilename>config/git.properties</generateGitPropertiesFilename>
                    <!--".git"文件夹未找到时,构建是否失败;若设置true,则构建失败;若设置false,则跳过执行该目标;默认值:true;-->
-                    <failOnNoGitDirectory>true</failOnNoGitDirectory>
+                    <failOnNoGitDirectory>false</failOnNoGitDirectory>

                    <!--git描述配置,可选;由JGit提供实现;-->
                    <gitDescribe>
@@ -8,7 +8,7 @@

 package com.xiaoleilu.loServer;

-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

 public class RestResult {

@@ -10,7 +10,6 @@ package com.xiaoleilu.loServer.action;

 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
-import com.xiaoleilu.loServer.action.admin.GetIMTokenAction;
 import com.xiaoleilu.loServer.annotation.RequireAuthentication;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
@@ -21,10 +20,9 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.DBUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

 /**
 * 请求处理接口<br>
@@ -25,7 +25,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

 import java.util.Base64;
 import java.util.concurrent.Executor;
@@ -26,7 +26,7 @@ import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

 import java.util.Base64;
 import java.util.concurrent.Executor;
@@ -79,7 +79,7 @@ public class RouteAction extends Action {

            MemorySessionStore.Session session = sessionsStore.sessionForClientAndUser(uid, cid);
            if (session == null) {
-                ErrorCode errorCode = sessionsStore.createNewSession(uid, cid, true);
+                ErrorCode errorCode = sessionsStore.createNewSession(uid, cid, true, true);
                if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
                    sendResponse(response, errorCode, null, base64Response);
                    return true;
@@ -28,7 +28,7 @@ public class UnknownErrorAction extends Action{

    @Override
    public boolean action(Request request, Response response) {
-        response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR);
+        response.setStatus(HttpResponseStatus.NOT_FOUND);
        return true;
    }
 }
@@ -9,23 +9,17 @@
 package com.xiaoleilu.loServer.action;

 import com.google.gson.Gson;
-import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputUserLogin;
-import com.xiaoleilu.loServer.pojos.OutputLoginData;
-import io.moquette.spi.impl.Utils;
-import io.moquette.spi.impl.security.TokenAuthenticator;
+import cn.wildfirechat.pojos.InputUserLogin;
+import cn.wildfirechat.pojos.OutputLoginData;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
 import win.liyufan.im.GitRepositoryState;

 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;

@Route("/api/version")
@HttpMethod("GET")
@@ -0,0 +1,84 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+
+import cn.wildfirechat.common.APIPath;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import cn.wildfirechat.pojos.InputAddGroupMember;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import cn.wildfirechat.common.ErrorCode;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Member_Add)
+@HttpMethod("POST")
+public class AddGroupMemberAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputAddGroupMember inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputAddGroupMember.class);
+            if (inputAddGroupMember.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputAddGroupMember.getOperator(), null, IMTopic.AddGroupMemberTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), inputAddGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}
@@ -13,24 +13,28 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateUser;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.spi.impl.Utils;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.RateLimiter;

 abstract public class AdminAction extends Action {
    private static String SECRET_KEY = "123456";
+    private static boolean NO_CHECK_TIME = false;
    private final RateLimiter mLimitCounter = new RateLimiter(10, 500);
    public static void setSecretKey(String secretKey) {
        SECRET_KEY = secretKey;
    }

+    public static void setNoCheckTime(String noCheckTime) {
+        try {
+            NO_CHECK_TIME = Boolean.parseBoolean(noCheckTime);
+        } catch (Exception e) {
+
+        }
+    }
+
    @Override
    public ErrorCode preAction(Request request, Response response) {
        if (!mLimitCounter.isGranted("admin")) {
@@ -51,8 +55,8 @@ abstract public class AdminAction extends Action {
            return ErrorCode.INVALID_PARAMETER;
        }

-        if (System.currentTimeMillis() - ts > 2 * 60 * 60 * 1000) {
-//            return ErrorCode.ERROR_CODE_SIGN_EXPIRED;
+        if (!NO_CHECK_TIME && System.currentTimeMillis() - ts > 2 * 60 * 60 * 1000) {
+            return ErrorCode.ERROR_CODE_SIGN_EXPIRED;
        }

        String str = nonce + "|" + SECRET_KEY + "|" + timestamp;
@@ -8,21 +8,22 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputOutputUserBlockStatus;
+import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

-@Route("admin/user/status")
+@Route(APIPath.User_Update_Block_Status)
@HttpMethod("POST")
 public class BlockUserAction extends AdminAction {

@@ -44,7 +45,9 @@ public class BlockUserAction extends AdminAction {
                result = RestResult.resultOf(errorCode);
                response.setContent(new Gson().toJson(result));

-                RPCCenter.getInstance().sendRequest(null, null, RPCCenter.KICKOFF_USER_REQUEST, inputUserBlock.getUserId().getBytes(), inputUserBlock.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, null, true);
+                if (inputUserBlock.getStatus() != 0) {
+                    RPCCenter.getInstance().sendRequest(null, null, RPCCenter.KICKOFF_USER_REQUEST, inputUserBlock.getUserId().getBytes(), inputUserBlock.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, null, true);
+                }

                sendResponse(response, ErrorCode.ERROR_CODE_SUCCESS, null);
            } else {
@@ -8,19 +8,19 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.InputGetUserInfo;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

-@Route("/admin/user/onlinestatus")
+@Route(APIPath.User_Get_Online_Status)
@HttpMethod("POST")
 public class CheckUserOnlineAction extends AdminAction {

@@ -8,6 +8,7 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,17 +16,16 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateChatroom;
-import com.xiaoleilu.loServer.pojos.OutputCreateChatroom;
+import cn.wildfirechat.pojos.InputCreateChatroom;
+import cn.wildfirechat.pojos.OutputCreateChatroom;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
-import win.liyufan.im.UUIDGenerator;
+import cn.wildfirechat.common.ErrorCode;

-@Route("/admin/chatroom")
-@HttpMethod("PUT")
+@Route(APIPath.Create_Chatroom)
+@HttpMethod("POST")
 public class CreateChatroomAction extends AdminAction {

    @Override
@@ -9,27 +9,28 @@
 package com.xiaoleilu.loServer.action.admin;


+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateGroup;
-import com.xiaoleilu.loServer.pojos.OutputCreateGroupResult;
+import cn.wildfirechat.pojos.InputCreateGroup;
+import cn.wildfirechat.pojos.OutputCreateGroupResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.concurrent.Executor;

-@Route("admin/group")
-@HttpMethod("PUT")
+@Route(APIPath.Create_Group)
+@HttpMethod("POST")
 public class CreateGroupAction extends AdminAction {

    @Override
@@ -8,6 +8,7 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,15 +16,15 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateRobot;
-import com.xiaoleilu.loServer.pojos.OutputCreateRobot;
+import cn.wildfirechat.pojos.InputCreateRobot;
+import cn.wildfirechat.pojos.OutputCreateRobot;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.UUIDGenerator;

-@Route("admin/robot/create")
+@Route(APIPath.Create_Robot)
@HttpMethod("POST")
 public class CreateRobotAction extends AdminAction {

@@ -8,6 +8,7 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,15 +16,15 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateUser;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputCreateUser;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.UUIDGenerator;

-@Route("admin/user/create")
+@Route(APIPath.Create_User)
@HttpMethod("POST")
 public class CreateUserAction extends AdminAction {

@@ -35,7 +36,7 @@ public class CreateUserAction extends AdminAction {
    @Override
    public boolean action(Request request, Response response) {
        if (request.getNettyRequest() instanceof FullHttpRequest) {
-            InputCreateUser inputCreateUser = getRequestBody(request.getNettyRequest(), InputCreateUser.class);
+            InputOutputUserInfo inputCreateUser = getRequestBody(request.getNettyRequest(), InputOutputUserInfo.class);
            if (inputCreateUser != null
                && !StringUtil.isNullOrEmpty(inputCreateUser.getName())) {

@@ -8,21 +8,22 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputDestoryChatroom;
+import cn.wildfirechat.pojos.InputDestoryChatroom;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

-@Route("/admin/chatroom")
-@HttpMethod("DELETE")
+@Route(APIPath.Chatroom_Destroy)
+@HttpMethod("POST")
 public class DestoryChatroomAction extends AdminAction {

    @Override
@@ -0,0 +1,84 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+
+import cn.wildfirechat.common.APIPath;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import cn.wildfirechat.pojos.InputDismissGroup;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import cn.wildfirechat.common.ErrorCode;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Dismiss)
+@HttpMethod("POST")
+public class DismissGroupAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputDismissGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputDismissGroup.class);
+            if (inputDismissGroup.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputDismissGroup.getOperator(), null, IMTopic.DismissGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), inputDismissGroup.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}
@@ -0,0 +1,88 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import cn.wildfirechat.pojos.InputFriendRequest;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+import cn.wildfirechat.common.ErrorCode;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Friend_Update_Status)
+@HttpMethod("POST")
+public class FriendRelationAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputFriendRequest friendAdd = getRequestBody(request.getNettyRequest(), InputFriendRequest.class);
+            if (friendAdd != null
+                && !StringUtil.isNullOrEmpty(friendAdd.getUserId())
+                && !StringUtil.isNullOrEmpty(friendAdd.getFriendUid())
+            ) {
+                WFCMessage.HandleFriendRequest friendRequest = WFCMessage.HandleFriendRequest.newBuilder().setTargetUid(friendAdd.getFriendUid()).setStatus(friendAdd.getStatus()).build();
+                RPCCenter.getInstance().sendRequest(friendAdd.getUserId(), null, IMTopic.HandleFriendRequestTopic, friendRequest.toByteArray(), friendAdd.getFriendUid(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> ctx.executor().execute(command);
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import com.xiaoleilu.loServer.model.FriendData;
+import cn.wildfirechat.pojos.InputGetFriendList;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Friend_Get_List)
+@HttpMethod("POST")
+public class FriendRelationGetAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetFriendList inputGetFriendList = getRequestBody(request.getNettyRequest(), InputGetFriendList.class);
+            List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), 0);
+            List<String> list = new ArrayList<>();
+            for (FriendData data : dataList) {
+                if (data.getState() == inputGetFriendList.getStatus()) {
+                    list.add(data.getFriendUid());
+                }
+            }
+            response.setStatus(HttpResponseStatus.OK);
+            RestResult result = RestResult.ok(list);
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}
@@ -8,6 +8,8 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.pojos.*;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,14 +17,13 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.OutputGetChatroomInfo;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

-@Route("/admin/chatroom")
-@HttpMethod("GET")
+@Route(APIPath.Chatroom_Info)
+@HttpMethod("POST")
 public class GetChatroomInfoAction extends AdminAction {

    @Override
@@ -33,8 +34,8 @@ public class GetChatroomInfoAction extends AdminAction {
    @Override
    public boolean action(Request request, Response response) {
        if (request.getNettyRequest() instanceof FullHttpRequest) {
-
-            String chatroomid = request.getParam("id");
+            InputGetChatroomInfo getChatroomInfo = getRequestBody(request.getNettyRequest(), InputGetChatroomInfo.class);
+            String chatroomid = getChatroomInfo.getChatroomId();
            if (!StringUtil.isNullOrEmpty(chatroomid)) {

                WFCMessage.ChatroomInfo info = messagesStore.getChatroomInfo(chatroomid);
@@ -0,0 +1,71 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetGroup;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.PojoGroupInfo;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+@Route(APIPath.Group_Get_Info)
+@HttpMethod("POST")
+public class GetGroupInfoAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class);
+            if (inputGetGroup != null
+                && (!StringUtil.isNullOrEmpty(inputGetGroup.getGroupId()))) {
+
+                WFCMessage.GroupInfo groupInfo = messagesStore.getGroupInfo(inputGetGroup.getGroupId());
+
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result;
+                if (groupInfo == null) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    PojoGroupInfo pojoGroupInfo = new PojoGroupInfo();
+                    pojoGroupInfo.setExtra(groupInfo.getExtra());
+                    pojoGroupInfo.setName(groupInfo.getName());
+                    pojoGroupInfo.setOwner(groupInfo.getOwner());
+                    pojoGroupInfo.setPortrait(groupInfo.getPortrait());
+                    pojoGroupInfo.setTarget_id(groupInfo.getTargetId());
+                    pojoGroupInfo.setType(groupInfo.getType());
+                    result = RestResult.ok(pojoGroupInfo);
+                }
+
+                response.setContent(new Gson().toJson(result));
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetGroup;
+import cn.wildfirechat.pojos.OutputGroupMemberList;
+import cn.wildfirechat.pojos.PojoGroupInfo;
+import cn.wildfirechat.pojos.PojoGroupMember;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Group_Member_List)
+@HttpMethod("POST")
+public class GetGroupMembersAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class);
+            if (inputGetGroup != null
+                && (!StringUtil.isNullOrEmpty(inputGetGroup.getGroupId()))) {
+
+                List<WFCMessage.GroupMember> members = new ArrayList<>();
+                ErrorCode errorCode = messagesStore.getGroupMembers(inputGetGroup.getGroupId(), 0, members);
+
+
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result;
+                if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                    result = RestResult.resultOf(errorCode);
+                } else {
+                    OutputGroupMemberList out = new OutputGroupMemberList();
+                    out.setMembers(new ArrayList<>());
+                    for (WFCMessage.GroupMember member : members) {
+                        PojoGroupMember pm = new PojoGroupMember();
+                        pm.setMember_id(member.getMemberId());
+                        pm.setAlias(member.getAlias());
+                        pm.setType(member.getType());
+                        out.getMembers().add(pm);
+                    }
+                    result = RestResult.ok(out);
+                }
+
+                response.setContent(new Gson().toJson(result));
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}
@@ -8,23 +8,24 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputGetToken;
-import com.xiaoleilu.loServer.pojos.OutputGetIMTokenData;
+import cn.wildfirechat.pojos.InputGetToken;
+import cn.wildfirechat.pojos.OutputGetIMTokenData;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.handler.codec.http.FullHttpRequest;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.Base64;
 import java.util.concurrent.Executor;

-@Route("/admin/user/token")
+@Route(APIPath.User_Get_Token)
@HttpMethod("POST")
 public class GetIMTokenAction extends AdminAction {

@@ -8,6 +8,7 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,15 +16,14 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateUser;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.InputGetUserInfo;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

-@Route("admin/user/info")
+@Route(APIPath.User_Get_Info)
@HttpMethod("POST")
 public class GetUserAction extends AdminAction {

@@ -37,7 +37,7 @@ public class GetUserAction extends AdminAction {
        if (request.getNettyRequest() instanceof FullHttpRequest) {
            InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
            if (inputUserId != null
-                && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()) || !StringUtil.isNullOrEmpty(inputUserId.getName()))) {
+                && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()) || !StringUtil.isNullOrEmpty(inputUserId.getName()) || !StringUtil.isNullOrEmpty(inputUserId.getMobile()))) {

                WFCMessage.User user = null;
                if(!StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
@@ -53,7 +53,7 @@ public class GetUserAction extends AdminAction {
                if (user == null) {
                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
                } else {
-                    result = RestResult.ok(InputCreateUser.fromPbUser(user));
+                    result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
                }

                response.setContent(new Gson().toJson(result));
@@ -8,6 +8,8 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.pojos.OutputUserBlockStatusList;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -17,7 +19,7 @@ import com.xiaoleilu.loServer.handler.Response;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;

-@Route("admin/user/statuslist")
+@Route(APIPath.User_Get_Blocked_List)
@HttpMethod("POST")
 public class GetUserBlockListAction extends AdminAction {

@@ -30,7 +32,9 @@ public class GetUserBlockListAction extends AdminAction {
    public boolean action(Request request, Response response) {
        if (request.getNettyRequest() instanceof FullHttpRequest) {
            response.setStatus(HttpResponseStatus.OK);
-            RestResult result = RestResult.ok(messagesStore.getUserStatusList());
+            OutputUserBlockStatusList list = new OutputUserBlockStatusList();
+            list.setStatusList(messagesStore.getUserStatusList());
+            RestResult result = RestResult.ok(list);
            response.setContent(new Gson().toJson(result));
        }
        return true;
@@ -8,21 +8,21 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
-import com.xiaoleilu.loServer.pojos.OutputUserStatus;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.OutputUserStatus;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

-@Route("admin/user/checkstatus")
+@Route(APIPath.User_Check_Block_Status)
@HttpMethod("POST")
 public class GetUserBlockStatusAction extends AdminAction {

@@ -0,0 +1,84 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+
+import cn.wildfirechat.common.APIPath;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import cn.wildfirechat.pojos.InputKickoffGroupMember;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import cn.wildfirechat.common.ErrorCode;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Member_Kickoff)
+@HttpMethod("POST")
+public class KickoffGroupMemberAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class);
+            if (inputKickoffGroupMember.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputKickoffGroupMember.getOperator(), null, IMTopic.AddGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), inputKickoffGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}
@@ -8,6 +8,7 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,7 +16,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.RecallMessageData;
+import cn.wildfirechat.pojos.RecallMessageData;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
@@ -23,12 +24,12 @@ import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.concurrent.Executor;

-@Route("admin/message/recall")
+@Route(APIPath.Msg_Recall)
@HttpMethod("POST")
 public class RecallMessageAction extends AdminAction {

@@ -9,6 +9,7 @@
 package com.xiaoleilu.loServer.action.admin;


+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.RestResult;
@@ -16,20 +17,20 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.SendMessageData;
-import com.xiaoleilu.loServer.pojos.SendMessageResult;
+import cn.wildfirechat.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.concurrent.Executor;

-@Route("admin/message/send")
+@Route(APIPath.Msg_Send)
@HttpMethod("POST")
 public class SendMessageAction extends AdminAction {

@@ -8,22 +8,19 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputOutputSensitiveWords;
-import com.xiaoleilu.loServer.pojos.InputOutputUserBlockStatus;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
+import cn.wildfirechat.pojos.InputOutputSensitiveWords;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

-@Route("admin/sensitive/add")
+@Route(APIPath.Sensitive_Add)
@HttpMethod("POST")
 public class SensitiveWordAddAction extends AdminAction {

@@ -8,18 +8,19 @@

 package com.xiaoleilu.loServer.action.admin;

+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputOutputSensitiveWords;
+import cn.wildfirechat.pojos.InputOutputSensitiveWords;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

-@Route("admin/sensitive/del")
+@Route(APIPath.Sensitive_Del)
@HttpMethod("POST")
 public class SensitiveWordDeleteAction extends AdminAction {

@@ -8,20 +8,18 @@

 package com.xiaoleilu.loServer.action.admin;

-import com.google.gson.Gson;
-import com.xiaoleilu.loServer.RestResult;
+import cn.wildfirechat.common.APIPath;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputOutputSensitiveWords;
+import cn.wildfirechat.pojos.InputOutputSensitiveWords;
 import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

 import java.util.List;

-@Route("admin/sensitive/query")
+@Route(APIPath.Sensitive_Query)
@HttpMethod("POST")
 public class SensitiveWordQueryAction extends AdminAction {

@@ -0,0 +1,84 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+
+import cn.wildfirechat.common.APIPath;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import cn.wildfirechat.pojos.InputTransferGroup;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import cn.wildfirechat.common.ErrorCode;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Transfer)
+@HttpMethod("POST")
+public class TransferGroupAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputTransferGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputTransferGroup.class);
+            if (inputDismissGroup.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputDismissGroup.getOperator(), null, IMTopic.TransferGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), inputDismissGroup.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}
@@ -14,14 +14,13 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import io.moquette.persistence.RPCCenter;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.RateLimiter;

 abstract public class ChannelAction extends Action {
@@ -9,30 +9,30 @@
 package com.xiaoleilu.loServer.action.channel;


+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
-import com.xiaoleilu.loServer.action.admin.AdminAction;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.Conversation;
-import com.xiaoleilu.loServer.pojos.SendMessageData;
-import com.xiaoleilu.loServer.pojos.SendMessageResult;
+import cn.wildfirechat.pojos.Conversation;
+import cn.wildfirechat.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.concurrent.Executor;

 import static cn.wildfirechat.proto.ProtoConstants.ConversationType.ConversationType_Channel;

-@Route("channel/message/send")
+@Route(APIPath.Channel_Message_Send)
@HttpMethod("POST")
 public class SendMessageAction extends ChannelAction {

@@ -8,6 +8,7 @@

 package com.xiaoleilu.loServer.action.robot;

+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,15 +16,14 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateUser;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.InputGetUserInfo;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

-@Route("admin/robot/user_info")
+@Route(APIPath.Robot_User_Info)
@HttpMethod("POST")
 public class GetUserAction extends RobotAction {

@@ -32,7 +32,7 @@ public class GetUserAction extends RobotAction {
        if (request.getNettyRequest() instanceof FullHttpRequest) {
            InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
            if (inputUserId != null
-                && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()) || !StringUtil.isNullOrEmpty(inputUserId.getName()))) {
+                && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()) || !StringUtil.isNullOrEmpty(inputUserId.getName()) || !StringUtil.isNullOrEmpty(inputUserId.getMobile()))) {

                WFCMessage.User user = null;
                if(!StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
@@ -48,7 +48,7 @@ public class GetUserAction extends RobotAction {
                if (user == null) {
                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
                } else {
-                    result = RestResult.ok(InputCreateUser.fromPbUser(user));
+                    result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
                }

                response.setContent(new Gson().toJson(result));
@@ -14,16 +14,17 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import io.moquette.persistence.RPCCenter;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.RateLimiter;

+import java.io.UnsupportedEncodingException;
+
 abstract public class RobotAction extends Action {
    private final RateLimiter mLimitCounter = new RateLimiter(10, 1000);

@@ -80,10 +81,15 @@ abstract public class RobotAction extends Action {
        if (request instanceof FullHttpRequest) {
            FullHttpRequest fullHttpRequest = (FullHttpRequest) request;
            byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content());
-            String content = new String(bytes);
-            Gson gson = new Gson();
-            T t = gson.fromJson(content, cls);
-            return t;
+            String content = null;
+            try {
+                content = new String(bytes, "UTF-8");
+                Gson gson = new Gson();
+                T t = gson.fromJson(content, cls);
+                return t;
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
        }
        return null;
    }
@@ -9,28 +9,27 @@
 package com.xiaoleilu.loServer.action.robot;


-import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
-import com.xiaoleilu.loServer.action.admin.AdminAction;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.SendMessageData;
-import com.xiaoleilu.loServer.pojos.SendMessageResult;
+import cn.wildfirechat.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.concurrent.Executor;

-@Route("admin/robot/send")
+@Route(APIPath.Robot_Message_Send)
@HttpMethod("POST")
 public class SendMessageAction extends RobotAction {

@@ -100,6 +100,8 @@ public final class BrokerConstants {
    public static final String HZ_Cluster_Node_External_Short_Port = "node_external_short_port";
    public static final String HZ_Cluster_Node_ID = "node_id";
    public static final String HTTP_SERVER_SECRET_KEY = "http.admin.secret_key";
+    public static final String HTTP_SERVER_API_NO_CHECK_TIME = "http.admin.no_check_time";
+
    public static final String CLIENT_PROTO_SECRET_KEY = "client.proto.secret_key";
    public static final String TOKEN_SECRET_KEY = "token.key ";

@@ -113,17 +115,6 @@ public final class BrokerConstants {



-
-
-    public static final int MESSAGE_CONTENT_TYPE_CREATE_GROUP = 104;
-    public static final int MESSAGE_CONTENT_TYPE_ADD_GROUP_MEMBER = 105;
-    public static final int MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER = 106;
-    public static final int MESSAGE_CONTENT_TYPE_QUIT_GROUP = 107;
-    public static final int MESSAGE_CONTENT_TYPE_DISMISS_GROUP = 108;
-    public static final int MESSAGE_CONTENT_TYPE_TRANSFER_GROUP_OWNER = 109;
-    public static final int MESSAGE_CONTENT_TYPE_CHANGE_GROUP_NAME = 110;
-    public static final int MESSAGE_CONTENT_TYPE_MODIFY_GROUP_ALIAS = 111;
-    public static final int MESSAGE_CONTENT_TYPE_CHANGE_GROUP_PORTRAIT = 112;
    private BrokerConstants() {
    }
 }
@@ -12,10 +12,10 @@ import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 import static win.liyufan.im.IMTopic.HandleFriendRequestTopic;

@Handler(IMTopic.AddFriendRequestTopic)
@@ -9,14 +9,13 @@
 package io.moquette.imhandler;

 import cn.wildfirechat.proto.WFCMessage;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

@Handler(value = IMTopic.AddGroupMemberTopic)
 public class AddGroupMember extends GroupHandler<WFCMessage.AddGroupMemberRequest> {
@@ -11,10 +11,10 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

@Handler(IMTopic.BlackListUserTopic)
 public class BlackListRequestHandler extends GroupHandler<WFCMessage.BlackUserRequest> {
@@ -9,13 +9,11 @@
 package io.moquette.imhandler;

 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
 import static win.liyufan.im.IMTopic.PutUserSettingTopic;
 import static win.liyufan.im.UserSettingScope.kUserSettingListenedChannels;

@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.List;
@@ -10,16 +10,12 @@ package io.moquette.imhandler;

 import cn.wildfirechat.proto.WFCMessage;
 import com.hazelcast.util.StringUtil;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
-import win.liyufan.im.IDUtils;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
-import win.liyufan.im.UUIDGenerator;

 import static win.liyufan.im.IMTopic.PutUserSettingTopic;
-import static win.liyufan.im.UserSettingScope.kUserSettingListenedChannels;
 import static win.liyufan.im.UserSettingScope.kUserSettingMyChannels;

@Handler(value = IMTopic.CreateChannelTopic)
@@ -9,19 +9,24 @@
 package io.moquette.imhandler;

 import cn.wildfirechat.proto.WFCMessage;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
+import com.hazelcast.util.StringUtil;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

-import static io.moquette.BrokerConstants.MESSAGE_CONTENT_TYPE_CREATE_GROUP;
-
@Handler(value = IMTopic.CreateGroupTopic)
 public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupRequest> {
    @Override
    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.CreateGroupRequest request, Qos1PublishHandler.IMCallback callback) {
+
+        if (!StringUtil.isNullOrEmpty(request.getGroup().getGroupInfo().getTargetId())) {
+            WFCMessage.GroupInfo existGroupInfo = m_messagesStore.getGroupInfo(request.getGroup().getGroupInfo().getTargetId());
+            if (existGroupInfo != null) {
+                return ErrorCode.ERROR_CODE_GROUP_ALREADY_EXIST;
+            }
+        }
        WFCMessage.GroupInfo groupInfo = m_messagesStore.createGroup(fromUser, request.getGroup().getGroupInfo(), request.getGroup().getMembersList());
        if (groupInfo != null) {
            if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

@Handler(IMTopic.DeleteFriendTopic)
@@ -10,10 +10,10 @@ package io.moquette.imhandler;

 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

 import static win.liyufan.im.IMTopic.DismissGroupTopic;

@@ -24,9 +24,9 @@ public class DismissGroupHandler extends GroupHandler<WFCMessage.DismissGroupReq
            WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId());
            ErrorCode errorCode;
            if (groupInfo == null) {
-                errorCode = m_messagesStore.dismissGroup(fromUser, request.getGroupId());
+                errorCode = m_messagesStore.dismissGroup(fromUser, request.getGroupId(), isAdmin);

-            } else if ((groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)
+            } else if (isAdmin || (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)
                && groupInfo.getOwner() != null && groupInfo.getOwner().equals(fromUser)) {

                //send notify message first, then dismiss group
@@ -36,7 +36,7 @@ public class DismissGroupHandler extends GroupHandler<WFCMessage.DismissGroupReq
                    WFCMessage.MessageContent content = new GroupNotificationBinaryContent(groupInfo.getTargetId(), fromUser, null, "").getDismissGroupNotifyContent();
                    sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
                }
-                errorCode = m_messagesStore.dismissGroup(fromUser, request.getGroupId());
+                errorCode = m_messagesStore.dismissGroup(fromUser, request.getGroupId(), isAdmin);
            } else {
                errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
            }
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import static win.liyufan.im.IMTopic.PutUserSettingTopic;
@@ -12,7 +12,7 @@ import cn.wildfirechat.proto.WFCMessage;
 import com.xiaoleilu.loServer.model.FriendData;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.List;
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.List;
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

@Handler(IMTopic.ChannelPullTopic)
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

@Handler(IMTopic.GetChatroomInfoTopic)
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

@Handler(IMTopic.GetChatroomMemberTopic)
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.List;
@@ -11,13 +11,13 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.ArrayList;
 import java.util.List;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

@Handler(IMTopic.GetGroupMemberTopic)
 public class GetGroupMemberHandler extends IMHandler<WFCMessage.PullGroupMemberRequest> {
@@ -14,7 +14,7 @@ import com.xiaoleilu.loServer.action.UploadFileAction;
 import io.moquette.server.config.MediaServerConfig;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

@Handler(IMTopic.GetQiniuUploadTokenTopic)
@@ -13,7 +13,7 @@ import io.moquette.persistence.MemorySessionStore;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.moquette.spi.impl.security.TokenAuthenticator;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

@Handler(IMTopic.GetTokenTopic)
@@ -11,10 +11,10 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

@Handler(IMTopic.GetUserInfoTopic)
 public class GetUserInfoHandler extends IMHandler<WFCMessage.PullUserRequest> {
@@ -11,10 +11,10 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

@Handler(IMTopic.GetUserSettingTopic)
 public class GetUserSettingHandler extends IMHandler<WFCMessage.Version> {
@@ -12,11 +12,11 @@ import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 import win.liyufan.im.MessageShardingUtil;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

@Handler(IMTopic.HandleFriendRequestTopic)
 public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFriendRequest> {
@@ -25,9 +25,9 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
            WFCMessage.Message.Builder builder = WFCMessage.Message.newBuilder();
            builder.setFromUser(request.getTargetUid());
            long[] heads = new long[2];
-            ErrorCode errorCode = m_messagesStore.handleFriendRequest(fromUser, request, builder, heads);
+            ErrorCode errorCode = m_messagesStore.handleFriendRequest(fromUser, request, builder, heads, isAdmin);

-            if (errorCode == ERROR_CODE_SUCCESS) {
+            if (errorCode == ERROR_CODE_SUCCESS && !isAdmin) {
                long messageId = MessageShardingUtil.generateId();
                long timestamp = System.currentTimeMillis();
                builder.setMessageId(messageId);
@@ -23,24 +23,19 @@ import io.netty.buffer.Unpooled;
 import io.netty.util.internal.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.RateLimiter;
 import win.liyufan.im.Utility;

-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
-import java.util.Spliterator;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.function.Consumer;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

 /**
 * 请求处理接口<br>
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;


@@ -10,10 +10,10 @@ package io.moquette.imhandler;

 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import static win.liyufan.im.IMTopic.KickoffGroupMemberTopic;

@Handler(value = KickoffGroupMemberTopic)
@@ -8,11 +8,10 @@

 package io.moquette.imhandler;

-import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

@Handler(value = IMTopic.LoadRemoteMessagesTopic)
@@ -9,16 +9,11 @@
 package io.moquette.imhandler;

 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

-import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Name;
-import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Portrait;
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
 import static win.liyufan.im.IMTopic.ModifyChannelInfoTopic;
-import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic;

@Handler(value = ModifyChannelInfoTopic)
 public class ModifyChannelInfoHandler extends GroupHandler<WFCMessage.ModifyChannelInfo> {
@@ -9,13 +9,13 @@
 package io.moquette.imhandler;

 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

@Handler(IMTopic.ModifyGroupAliasTopic)
 public class ModifyGroupAliasHandler extends GroupHandler<WFCMessage.ModifyGroupMemberAlias> {
@@ -9,14 +9,14 @@
 package io.moquette.imhandler;

 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

 import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Name;
 import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Portrait;
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic;

@Handler(value = ModifyGroupInfoTopic)
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

@Handler(IMTopic.ModifyMyInfoTopic)
@@ -10,10 +10,9 @@ package io.moquette.imhandler;

 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
-import com.google.protobuf.InvalidProtocolBufferException;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

@Handler(value = IMTopic.PullMessageTopic)
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

@Handler(IMTopic.PutUserSettingTopic)
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

@Handler(IMTopic.QuitChatroomTopic)
@@ -9,10 +9,10 @@
 package io.moquette.imhandler;

 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

 import static win.liyufan.im.IMTopic.QuitGroupTopic;

@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.LinkedHashSet;
@@ -13,7 +13,7 @@ import com.hazelcast.core.Member;
 import io.moquette.spi.ClientSession;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import static io.moquette.BrokerConstants.HZ_Cluster_Node_External_IP;
@@ -32,7 +32,7 @@ public class RouteHandler extends IMHandler<WFCMessage.RouteRequest> {
        ClientSession clientSession = m_sessionsStore.sessionForClient(clientID);
        boolean isSessionAlreadyStored = clientSession != null;
        if (!isSessionAlreadyStored) {
-            m_sessionsStore.createNewSession(fromUser, clientID, true);
+            m_sessionsStore.createNewSession(fromUser, clientID, true, true);
        } else {
            m_sessionsStore.updateExistSession(fromUser, clientID, request, true);
        }
@@ -14,10 +14,9 @@ import com.hazelcast.util.StringUtil;
 import io.moquette.BrokerConstants;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 import win.liyufan.im.MessageShardingUtil;
-import win.liyufan.im.SensitiveFilter;

 import java.util.Set;

@@ -11,10 +11,10 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

@Handler(IMTopic.SetFriendAliasTopic)
 public class SetFriendAliasRequestHandler extends GroupHandler<WFCMessage.AddFriendRequest> {
@@ -11,10 +11,10 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

@Handler(IMTopic.RriendRequestUnreadSyncTopic)
 public class SyncFriendRequestUnreadHandler extends GroupHandler<WFCMessage.Version> {
@@ -9,14 +9,11 @@
 package io.moquette.imhandler;

 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
-
@Handler(IMTopic.TransferChannelInfoTopic)
 public class TransferChannelHandler extends GroupHandler<WFCMessage.TransferChannel> {
    @Override
@@ -9,19 +9,19 @@
 package io.moquette.imhandler;

 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

@Handler(IMTopic.TransferGroupTopic)
 public class TransferGroupHandler extends GroupHandler<WFCMessage.TransferGroupRequest> {
    @Override
    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.TransferGroupRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = m_messagesStore.transferGroup(fromUser, request.getGroupId(), request.getNewOwner());
+        ErrorCode errorCode = m_messagesStore.transferGroup(fromUser, request.getGroupId(), request.getNewOwner(), isAdmin);
        if (errorCode == ERROR_CODE_SUCCESS) {
            if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
@@ -13,7 +13,7 @@ import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.persistence.MemorySessionStore;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;


@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

 import java.util.List;
@@ -22,11 +22,11 @@ import com.google.protobuf.ByteString;
 import com.hazelcast.core.*;
 import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.model.FriendData;
-import com.xiaoleilu.loServer.pojos.InputOutputUserBlockStatus;
+import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
+import cn.wildfirechat.common.ErrorCode;
 import io.moquette.server.Server;
 import io.moquette.spi.IMatchingCondition;
 import io.moquette.spi.IMessagesStore;
-import io.moquette.spi.impl.security.TokenAuthenticator;
 import io.moquette.spi.security.Tokenor;
 import io.moquette.spi.impl.subscriptions.Topic;
 import org.slf4j.Logger;
@@ -34,8 +34,6 @@ import org.slf4j.LoggerFactory;
 import sun.misc.BASE64Encoder;
 import win.liyufan.im.*;

-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.security.MessageDigest;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -138,7 +136,13 @@ public class MemoryMessagesStore implements IMessagesStore {
    private void updateSensitiveWord() {
        long now = System.currentTimeMillis();
        if (now - lastUpdateSensitiveTime > 2 * 60 * 60 * 1000) {
-            lastUpdateSensitiveTime = now;
+            synchronized (this) {
+                if (now - lastUpdateSensitiveTime > 2 * 60 * 60 * 1000) {
+                    lastUpdateSensitiveTime = now;
+                } else {
+                    return;
+                }
+            }
            Set<String> sensitiveWords = databaseStore.getSensitiveWord();
            mSensitiveFilter = new SensitiveFilter(sensitiveWords);
        }
@@ -577,6 +581,8 @@ public class MemoryMessagesStore implements IMessagesStore {
        long dt = System.currentTimeMillis();
        if (StringUtil.isNullOrEmpty(groupInfo.getTargetId())) {
            groupId = getShortUUID();
+        } else {
+            groupId = groupInfo.getTargetId();
        }
        groupInfo = groupInfo.toBuilder()
            .setTargetId(groupId)
@@ -743,7 +749,7 @@ public class MemoryMessagesStore implements IMessagesStore {
    }

    @Override
-    public ErrorCode dismissGroup(String operator, String groupId) {
+    public ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin) {
        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
        IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);

@@ -756,9 +762,9 @@ public class MemoryMessagesStore implements IMessagesStore {
            return ErrorCode.ERROR_CODE_NOT_EXIST;
        }

-        if (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Free ||
+        if (!isAdmin && (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Free ||
            (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal)
-                && (groupInfo.getOwner() == null || !groupInfo.getOwner().equals(operator))) {
+                && (groupInfo.getOwner() == null || !groupInfo.getOwner().equals(operator)))) {
            return ErrorCode.ERROR_CODE_NOT_RIGHT;
        }

@@ -907,7 +913,7 @@ public class MemoryMessagesStore implements IMessagesStore {


    @Override
-    public ErrorCode transferGroup(String operator, String groupId, String newOwner) {
+    public ErrorCode transferGroup(String operator, String groupId, String newOwner, boolean isAdmin) {
        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
        IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);

@@ -918,7 +924,7 @@ public class MemoryMessagesStore implements IMessagesStore {
            return ErrorCode.ERROR_CODE_NOT_EXIST;
        }

-        if ((groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal)
+        if (!isAdmin && (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal)
            && (groupInfo.getOwner() == null || !groupInfo.getOwner().equals(operator))) {
            return ErrorCode.ERROR_CODE_NOT_RIGHT;
        }
@@ -1342,7 +1348,7 @@ public class MemoryMessagesStore implements IMessagesStore {
        }

        for (FriendData friendData : friendDatas) {
-            if (friendData.getUserId().equals(userId)) {
+            if (friendData.getFriendUid().equals(userId)) {
                if (friendData.getState() == 2) {
                    return true;
                } else {
@@ -1533,8 +1539,61 @@ public class MemoryMessagesStore implements IMessagesStore {
    }

    @Override
-    public ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads) {
+    public ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin) {
        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+
+        if (isAdmin) {
+            MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
+
+            FriendData friendData1 = null;
+            Collection<FriendData> friendDatas = friendsMap.get(userId);
+            for (FriendData fd : friendDatas) {
+                if (fd.getFriendUid().equals(request.getTargetUid())) {
+                    friendData1 = fd;
+                    break;
+                }
+            }
+            if (friendData1 == null) {
+                friendData1 = new FriendData(userId, request.getTargetUid(), "", request.getStatus(), System.currentTimeMillis());
+            } else {
+                friendsMap.remove(userId, friendData1);
+                friendData1.setState(request.getStatus());
+                friendData1.setTimestamp(System.currentTimeMillis());
+            }
+
+            friendsMap.put(userId, friendData1);
+            databaseStore.persistOrUpdateFriendData(friendData1);
+
+            if (request.getStatus() != 2) {
+                FriendData friendData2 = null;
+
+                friendDatas = friendsMap.get(request.getTargetUid());
+                for (FriendData fd : friendDatas) {
+                    if (fd.getFriendUid().equals(userId)) {
+                        friendData2 = fd;
+                        break;
+                    }
+                }
+                if (friendData2 == null) {
+                    friendData2 = new FriendData(request.getTargetUid(), userId, "", request.getStatus(), friendData1.getTimestamp());
+                } else {
+                    friendsMap.remove(request.getTargetUid(), friendData2);
+                    friendData2.setState(request.getStatus());
+                    friendData2.setTimestamp(System.currentTimeMillis());
+                }
+
+
+                friendsMap.put(request.getTargetUid(), friendData2);
+                databaseStore.persistOrUpdateFriendData(friendData2);
+
+                heads[0] = friendData2.getTimestamp();
+            } else {
+                heads[0] = 0;
+            }
+            heads[1] = friendData1.getTimestamp();
+            return ErrorCode.ERROR_CODE_SUCCESS;
+        }
+
        MultiMap<String, WFCMessage.FriendRequest> requestMap = hzInstance.getMultiMap(USER_FRIENDS_REQUEST);
        Collection<WFCMessage.FriendRequest> requests = requestMap.get(userId);
        if (requests == null || requests.size() == 0) {
@@ -2027,6 +2086,7 @@ public class MemoryMessagesStore implements IMessagesStore {
            words) {
            databaseStore.persistSensitiveWord(word);
        }
+        lastUpdateSensitiveTime = 0;
        return true;
    }

@@ -23,12 +23,9 @@ import io.moquette.spi.ClientSession;
 import io.moquette.spi.IMessagesStore.StoredMessage;
 import io.moquette.spi.ISessionsStore;

-import io.netty.util.internal.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import win.liyufan.im.ErrorCode;
-import win.liyufan.im.UserSettingScope;
-import win.liyufan.im.Utility;
+import cn.wildfirechat.common.ErrorCode;

 import java.util.*;
 import java.util.concurrent.*;
@@ -285,7 +282,7 @@ public class MemorySessionStore implements ISessionsStore {


    @Override
-    public ErrorCode createNewSession(String username, String clientID, boolean cleanSession) {
+    public ErrorCode createNewSession(String username, String clientID, boolean cleanSession, boolean createWhenNoExist) {
        LOG.debug("createNewSession for client <{}>", clientID);

        Session session = sessions.get(clientID);
@@ -299,6 +296,10 @@ public class MemorySessionStore implements ISessionsStore {
        session = databaseStore.getSession(username, clientID, clientSession);

        if (session == null) {
+            if (!createWhenNoExist) {
+                return ErrorCode.ERROR_CODE_NOT_EXIST;
+            }
+
            session = databaseStore.createSession(username, clientID, clientSession);
        }

@@ -12,7 +12,7 @@ import io.moquette.persistence.remote.*;
 import io.moquette.server.Server;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;

@@ -27,7 +27,7 @@ import io.netty.handler.codec.mqtt.MqttMessage;
 import io.netty.handler.codec.mqtt.MqttMessageType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

 import java.util.ArrayList;
 import java.util.Collection;
@@ -102,6 +102,7 @@ public class Server {
        instance = new Server();
        final IConfig config = defaultConfig();

+        System.setProperty("hazelcast.logging.type", "none" );
        instance.mConfig = config;
        ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.ADVANCED);

@@ -111,6 +112,8 @@ public class Server {
        int httpAdminPort = Integer.parseInt(config.getProperty(BrokerConstants.HTTP_ADMIN_PORT));

        AdminAction.setSecretKey(config.getProperty(HTTP_SERVER_SECRET_KEY));
+        AdminAction.setNoCheckTime(config.getProperty(HTTP_SERVER_API_NO_CHECK_TIME));
+
        final LoServer httpServer = new LoServer(httpLocalPort, httpAdminPort, instance.m_processor.getMessagesStore(), instance.m_store.sessionsStore());
        try {
            httpServer.start();
@@ -125,6 +128,8 @@ public class Server {
        //Bind  a shutdown hook
        Runtime.getRuntime().addShutdownHook(new Thread(instance::stopServer));
        Runtime.getRuntime().addShutdownHook(new Thread(httpServer::shutdown));
+
+        System.out.println("Wildfire IM server start success...");
    }

    /**
@@ -18,17 +18,15 @@ package io.moquette.spi;

 import cn.wildfirechat.proto.WFCMessage;
 import com.xiaoleilu.loServer.model.FriendData;
-import com.xiaoleilu.loServer.pojos.InputOutputUserBlockStatus;
+import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
 import io.moquette.persistence.DatabaseStore;
-import io.moquette.persistence.MemoryMessagesStore;
 import io.moquette.persistence.UserClientEntry;
 import io.moquette.spi.impl.subscriptions.Topic;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.mqtt.MqttQoS;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

-import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -106,13 +104,13 @@ public interface IMessagesStore {
    ErrorCode addGroupMembers(String operator, String groupId, List<WFCMessage.GroupMember> memberList);
    ErrorCode kickoffGroupMembers(String operator, String groupId, List<String> memberList);
    ErrorCode quitGroup(String operator, String groupId);
-    ErrorCode dismissGroup(String operator, String groupId);
+    ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin);
    ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value);
    ErrorCode modifyGroupAlias(String operator, String groupId, String alias);
    List<WFCMessage.GroupInfo> getGroupInfos(List<WFCMessage.UserRequest> requests);
    WFCMessage.GroupInfo getGroupInfo(String groupId);
    ErrorCode getGroupMembers(String groupId, long maxDt, List<WFCMessage.GroupMember> members);
-    ErrorCode transferGroup(String operator, String groupId, String newOwner);
+    ErrorCode transferGroup(String operator, String groupId, String newOwner, boolean isAdmin);
    boolean isMemberInGroup(String member, String groupId);
    boolean isForbiddenInGroup(String member, String groupId);

@@ -152,7 +150,7 @@ public interface IMessagesStore {
    List<WFCMessage.FriendRequest> getFriendRequestList(String userId, long version);

    ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head);
-    ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads);
+    ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin);
    ErrorCode deleteFriend(String userId, String friendUid);
    ErrorCode blackUserRequest(String fromUser, String targetUserId, int status, long[] head);
    ErrorCode SyncFriendRequestUnread(String userId, long unreadDt, long[] head);
@@ -19,10 +19,9 @@ package io.moquette.spi;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.persistence.MemorySessionStore.Session;
 import io.moquette.spi.IMessagesStore.StoredMessage;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;

 import java.util.Collection;
-import java.util.List;
 import java.util.Queue;

 /**
@@ -41,7 +40,7 @@ public interface ISessionsStore {

    Session createUserSession(String username, String clientID);

-    ErrorCode createNewSession(String username, String clientID, boolean cleanSession);
+    ErrorCode createNewSession(String username, String clientID, boolean cleanSession, boolean createNoExist);

    ClientSession updateExistSession(String username, String clientID, WFCMessage.RouteRequest endpoint, boolean cleanSession);

@@ -21,8 +21,8 @@ import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.util.StringUtil;
-import com.xiaoleilu.loServer.pojos.OutputNotifyChannelSubscribeStatus;
-import com.xiaoleilu.loServer.pojos.SendMessageData;
+import cn.wildfirechat.pojos.OutputNotifyChannelSubscribeStatus;
+import cn.wildfirechat.pojos.SendMessageData;
 import io.moquette.persistence.*;
 import io.moquette.persistence.MemorySessionStore.Session;
 import io.moquette.server.ConnectionDescriptorStore;
@@ -480,6 +480,10 @@ public class MessagesPublisher {
                pushContent = "[视频]";
            } else if(type == ProtoConstants.ContentType.RichMedia) {
                pushContent = "[图文]";
+            } else if(type == ProtoConstants.ContentType.File) {
+                pushContent = "[文件]";
+            } else if(type == ProtoConstants.ContentType.Sticker) {
+                pushContent = "[表情]";
            }
        }

@@ -251,11 +251,16 @@ public class ProtocolProcessor {
                pwd = msg.payload().password();

                MemorySessionStore.Session session = m_sessionsStore.getSession(clientId);
+                if (session == null) {
+                    m_sessionsStore.createNewSession(msg.payload().userName(), clientId, true, false);
+                    session = m_sessionsStore.getSession(clientId);
+                }
+                
                if (session != null && session.getUsername().equals(msg.payload().userName())) {
                    pwd = AES.AESDecrypt(pwd, session.getSecret(), true);
                } else {
                    LOG.error("Password decrypt failed of client {}", clientId);
-                    failedCredentials(channel);
+                    failedNoSession(channel);
                    return false;
                }

@@ -365,6 +370,11 @@ public class ProtocolProcessor {
        LOG.info("Client {} failed to connect with bad username or password.", session);
    }

+    private void failedNoSession(Channel session) {
+        session.writeAndFlush(connAck(CONNECTION_REFUSED_SESSION_NOT_EXIST));
+        LOG.info("Client {} failed to connect with bad username or password.", session);
+    }
+
    private void setIdleTime(ChannelPipeline pipeline, int idleTime) {
        if (pipeline.names().contains("idleStateHandler")) {
            pipeline.remove("idleStateHandler");
@@ -19,9 +19,9 @@ package io.moquette.spi.impl;
 import static io.moquette.spi.impl.Utils.readBytesAndRewind;
 import static io.netty.handler.codec.mqtt.MqttMessageIdVariableHeader.from;
 import static io.netty.handler.codec.mqtt.MqttQoS.AT_MOST_ONCE;
-import static win.liyufan.im.ErrorCode.ERROR_CODE_NOT_IMPLEMENT;
-import static win.liyufan.im.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_NOT_IMPLEMENT;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;

 import java.io.IOException;
 import java.util.*;
@@ -30,7 +30,7 @@ import cn.wildfirechat.server.ThreadPoolExecutorWrapper;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.ClassUtil;
-import com.xiaoleilu.loServer.pojos.OutputCheckUserOnline;
+import cn.wildfirechat.pojos.OutputCheckUserOnline;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.imhandler.Handler;
 import io.moquette.imhandler.IMHandler;
@@ -56,7 +56,7 @@ import io.netty.channel.Channel;
 import io.netty.handler.codec.mqtt.MqttFixedHeader;
 import io.netty.handler.codec.mqtt.MqttMessageType;
 import io.netty.handler.codec.mqtt.MqttPublishMessage;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 import win.liyufan.im.RateLimiter;
 import win.liyufan.im.Utility;
@@ -63,8 +63,11 @@ public class GitRepositoryState {

    public static GitRepositoryState getGitRepositoryState() throws IOException {
        Properties properties = new Properties();
-        properties.load(new FileInputStream("config/git.properties"));
-//        properties.load(GitRepositoryState.class.getClassLoader().getResourceAsStream("config/git.properties"));
+        try {
+            properties.load(new FileInputStream("config/git.properties"));
+        } catch (IOException e) {
+            
+        }
        GitRepositoryState gitRepositoryState = new GitRepositoryState(properties);
        return gitRepositoryState;
    }
@@ -41,7 +41,7 @@
        <!--关闭连接时，是否提交未提交的事务，默认为false，即关闭连接，回滚未提交的事务 -->
        <property name="autoCommitOnClose">false</property>
        <!--c3p0将建一张名为Test的空表，并使用其自带的查询语句进行测试。如果定义了这个参数那么属性preferredTestQuery将被忽略。你不能在这张Test表上进行任何操作，它将只供c3p0测试使用。默认值: null -->
-        <property name="automaticTestTable">Test</property>
+        <!--<property name="automaticTestTable">null</property>-->
        <!--如果为false，则获取连接失败将会引起所有等待连接池来获取连接的线程抛出异常，但是数据源仍有效保留，并在下次调用getConnection()的时候继续尝试获取连接。如果设为true，那么在尝试获取连接失败后该数据源将申明已断开并永久关闭。默认: false-->
        <property name="breakAfterAcquireFailure">false</property>
        <!--每60秒检查所有连接池中的空闲连接。默认值: 0，不检查 -->
@@ -6,14 +6,19 @@
        <relativePath>../</relativePath>
        <artifactId>wildfirechat-parent</artifactId>
        <groupId>cn.wildfirechat</groupId>
-        <version>0.20</version>
+        <version>0.21</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

-    <groupId>cn.wildfirechat</groupId>
    <artifactId>client</artifactId>

    <dependencies>
+        <dependency>
+            <groupId>cn.wildfirechat</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
@@ -3,7 +3,7 @@ package cn.wildfirechat.client;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.xiaoleilu.loServer.pojos.InputRoute;
+import cn.wildfirechat.pojos.InputRoute;
 import io.moquette.spi.impl.security.AES;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -34,6 +34,7 @@ public class IMClient implements Listener {
    private final int port;
    private ConnectionStatusCallback connectionStatusCallback;
    private ReceiveMessageCallback receiveMessageCallback;
+    private ConnectionStatus connectionStatus;

    protected String mqttServerIp;
    protected long mqttServerPort;
@@ -45,16 +46,16 @@ public class IMClient implements Listener {
    private transient MQTT mqtt = new MQTT();
    private transient CallbackConnection connection = null;

-    interface ReceiveMessageCallback {
+    public interface ReceiveMessageCallback {
        void onReceiveMessages(List<WFCMessage.Message> messageList, boolean hasMore);
        void onRecallMessage(long messageUid);
    }

-    interface ConnectionStatusCallback {
+    public interface ConnectionStatusCallback {
        void onConnectionStatusChanged(ConnectionStatus newStatus);
    }

-    interface SendMessageCallback {
+    public interface SendMessageCallback {
        void onSuccess(long messageUid, long timestamp);
        void onFailure(int errorCode);
    }
@@ -102,9 +103,11 @@ public class IMClient implements Listener {
                connection.listener(this);

                //connecting
+                connectionStatus = ConnectionStatus_Connecting;
                if(connectionStatusCallback != null) {
-                    connectionStatusCallback.onConnectionStatusChanged(ConnectionStatus_Connecting);
+                    connectionStatusCallback.onConnectionStatusChanged(connectionStatus);
                }
+
                connection.connect(new Callback<byte[]>() {
                    @Override
                    public void onSuccess(byte[] value) {
@@ -121,16 +124,18 @@ public class IMClient implements Listener {

                        System.out.println("on connect success");
                        //connected
+                        connectionStatus = ConnectionStatus_Connected;
                        if(connectionStatusCallback != null) {
-                            connectionStatusCallback.onConnectionStatusChanged(ConnectionStatus_Connected);
+                            connectionStatusCallback.onConnectionStatusChanged(connectionStatus);
                        }
                    }

                    @Override
                    public void onFailure(Throwable value) {
                        System.out.println("on connect failure");
+                        connectionStatus = ConnectionStatus_Unconnected;
                        if(connectionStatusCallback != null) {
-                            connectionStatusCallback.onConnectionStatusChanged(ConnectionStatus_Unconnected);
+                            connectionStatusCallback.onConnectionStatusChanged(connectionStatus);
                        }
                    }
                });
@@ -142,6 +147,9 @@ public class IMClient implements Listener {
        }
    }

+    public void disconnect(boolean clearSession, final Callback<Void> onComplete) {
+        this.connection.disconnect(clearSession, onComplete);
+    }
    public void sendMessage(WFCMessage.Conversation conversation, WFCMessage.MessageContent messageContent, final SendMessageCallback callback) {
        WFCMessage.Message message = WFCMessage.Message.newBuilder().setConversation(conversation).setContent(messageContent).setFromUser(userId).build();
        byte[] data = message.toByteArray();
@@ -249,16 +257,18 @@ public class IMClient implements Listener {
    @Override
    public void onConnected() {
        System.out.println("onConnected");
+        connectionStatus = ConnectionStatus_Connecting;
        if(connectionStatusCallback != null) {
-            connectionStatusCallback.onConnectionStatusChanged(ConnectionStatus_Connecting);
+            connectionStatusCallback.onConnectionStatusChanged(connectionStatus);
        }
    }

    @Override
    public void onDisconnected() {
        System.out.println("onDisconnected");
+        connectionStatus = ConnectionStatus_Unconnected;
        if(connectionStatusCallback != null) {
-            connectionStatusCallback.onConnectionStatusChanged(ConnectionStatus_Unconnected);
+            connectionStatusCallback.onConnectionStatusChanged(connectionStatus);
        }
    }

@@ -319,6 +329,30 @@ public class IMClient implements Listener {
        this.receiveMessageCallback = receiveMessageCallback;
    }

+    public String getUserId() {
+        return userId;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public ConnectionStatus getConnectionStatus() {
+        return connectionStatus;
+    }
+
    public static void main(String[] args) {
        //token与userid和clientid是绑定的，使用时一定要传入正确的userid和clientid，不然会认为token非法
        IMClient client = new IMClient("yzyOyOKK", "7SJk13q+YdHHe6EwDzry9BKogxTNf3UgtYj50cBTZgWNkNuxEkiqg2koKg0lXViONIX1LmwCR1jN0Mw8hvk6KGpiSKFi+IRaRkIb3mNzgIfrq4afhyIHaQfa2HOfsi6Ws+9YobkdDgdq7W70bEdVfiCSU9+JOIY449nxZzfg2Zw=", "DD72C212-26C7-4B38-A5FC-88550896B170", "192.168.1.101", 80);
@@ -338,7 +372,7 @@ public class IMClient implements Listener {
        client.setConnectionStatusCallback((ConnectionStatus newStatus) -> {
            if (newStatus == ConnectionStatus_Connected) {
                WFCMessage.Conversation conversation = WFCMessage.Conversation.newBuilder().setType(0).setTarget("yzyOyOKK").setLine(0).build();
-                WFCMessage.MessageContent messageContent = WFCMessage.MessageContent.newBuilder().setContent("helloworld").setType(1).build();
+                WFCMessage.MessageContent messageContent = WFCMessage.MessageContent.newBuilder().setSearchableContent("helloworld").setType(1).build();
                client.sendMessage(conversation, messageContent, new SendMessageCallback() {
                    @Override
                    public void onSuccess(long messageUid, long timestamp) {
@@ -1,4 +1,4 @@
-package com.xiaoleilu.loServer.pojos;
+package cn.wildfirechat.pojos;


 public class InputRoute {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
heavyrain.lee	a9abda9ae9	update to version 0.21	2019-05-25 13:56:26 +08:00
heavyrain.lee	757186d77b	Merge branch 'refactor_server_api' into wildfirechat * refactor_server_api: update update update update update update	2019-05-25 13:54:40 +08:00
heavyrain.lee	3e769c885c	update	2019-05-25 13:53:51 +08:00
heavyrain.lee	af4d73a0d5	推送提示错误	2019-05-25 07:55:58 +08:00
heavyrain.lee	331c38cc98	update	2019-05-25 07:55:30 +08:00
heavyrain.lee	fbd1a7f5dc	update	2019-05-24 21:08:31 +08:00
heavyrain.lee	675025c0ec	解决session在重启后，内存中不存在的问题	2019-05-24 16:33:35 +08:00
heavyrain.lee	3e1efe4c4c	update	2019-05-24 16:12:57 +08:00
heavyrain.lee	679e76a5f6	update	2019-05-23 08:21:48 +08:00
heavyrain.lee	5a338cdba1	update	2019-05-23 07:26:57 +08:00
heavyrain.lee	3ef973ffc5	update	2019-05-22 20:38:35 +08:00
heavyrain.lee	d36c3f4f77	update	2019-05-22 20:24:21 +08:00
heavyrain.lee	79bd0c3304	add sdk	2019-05-22 08:38:55 +08:00
heavyrain.lee	721abfe3a5	解决同一局域网多人调试问题	2019-05-22 08:20:35 +08:00
heavyrain.lee	77a5d61861	调整代码目录结构	2019-05-22 07:23:09 +08:00
heavyrain.lee	34aee2290c	调整编译顺序	2019-05-22 07:05:59 +08:00
heavyrain.lee	4b93157816	server api群组功能添加	2019-05-21 21:55:20 +08:00
heavyrain.lee	d66b01c681	修改部分错误	2019-05-21 21:55:20 +08:00
imndx	939dfc2c9b	update readme	2019-05-21 21:52:58 +08:00
heavyrain.lee	1578c4c77d	好友关系api	2019-05-20 20:16:16 +08:00
heavyrain.lee	640a4fa47c	用户关系的api	2019-05-20 19:51:57 +08:00
heavyrain.lee	3d50b65ad9	优化敏感词设置	2019-05-20 19:34:49 +08:00
heavyrain.lee	3f9eef9538	服务api时间戳检查开关	2019-05-20 19:34:12 +08:00
heavyrain.lee	f655f519d0	server api时间戳检查开关	2019-05-20 19:33:22 +08:00
heavyrain.lee	59add35703	jmeter tools	2019-05-19 23:07:37 +08:00
heavyrain.lee	0ff21e70b5	add trycatch for load git.properties failure	2019-05-18 14:12:54 +08:00
heavyrain.lee	cfc97e602e	完善jmeter插件	2019-05-15 23:03:18 +08:00
heavyrain.lee	4661b8c856	优化imclient代码	2019-05-15 23:02:55 +08:00
heavyrain.lee	e955153d53	修改野火IM jmeter插件的连接测试case	2019-05-15 00:00:18 +08:00
heavyrain.lee	911dcb99ec	java client interface should be public	2019-05-14 23:59:21 +08:00
heavyrain.lee	40ff829c72	update	2019-05-14 22:31:31 +08:00
heavyrain.lee	729f3485de	修改服务启动提示	2019-05-14 13:41:09 +08:00
heavyrain.lee	84db868244	remove test db of c3p0	2019-05-14 13:40:52 +08:00
heavyrain.lee	126a9af2ac	.git文件未找到时，继续编译	2019-05-14 13:12:34 +08:00
heavyrain.lee	c9dc33d285	修正乱码问题	2019-05-12 20:25:37 +08:00
heavyrain.lee	49ee1d1d57	fix warning	2019-05-12 19:07:43 +08:00
heavyrain.lee	1a477068fb	fix warning	2019-05-12 18:59:35 +08:00
heavyrain.lee	d633830f7a	fix error	2019-05-12 11:21:42 +08:00