Merge branch 'refactor_server_api' into wildfirechat

* refactor_server_api:
  update
  update
  update
  update
  update
  update

common/src/main/java/cn.wildfirechat.pojos/InputDismissGroup.java

@@ -14,7 +14,7 @@ import io.netty.util.internal.StringUtil;
 
 import java.util.List;
 
-public class InputDismissGroupMember extends InputGroupBase {
+public class InputDismissGroup extends InputGroupBase {
     private String group_id;
 
 

common/src/main/java/cn.wildfirechat.pojos/InputGetGroup.java

@@ -0,0 +1,21 @@
+/*
+ * 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 cn.wildfirechat.pojos;
+
+public class InputGetGroup {
+    private String groupId;
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+}

common/src/main/java/cn.wildfirechat.pojos/InputGetUserInfo.java

@@ -13,9 +13,10 @@ public class InputGetUserInfo {
     private String name;
     private String mobile;
 
-    public InputGetUserInfo(String userId, String name) {
+    public InputGetUserInfo(String userId, String name, String mobile) {
         this.userId = userId;
         this.name = name;
+        this.mobile = mobile;
     }
 
     public String getMobile() {

common/src/main/java/cn.wildfirechat.pojos/InputGroupBase.java

@@ -20,6 +20,10 @@ public class InputGroupBase {
         return operator;
     }
 
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
     public List<Integer> getTo_lines() {
         return to_lines;
     }

common/src/main/java/cn.wildfirechat.pojos/OutputGroupMemberList.java

@@ -0,0 +1,23 @@
+/*
+ * 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 cn.wildfirechat.pojos;
+
+import java.util.List;
+
+public class OutputGroupMemberList {
+    private List<PojoGroupMember> members;
+
+    public List<PojoGroupMember> getMembers() {
+        return members;
+    }
+
+    public void setMembers(List<PojoGroupMember> members) {
+        this.members = members;
+    }
+}

common/src/main/java/cn.wildfirechat.pojos/OutputUserBlockStatusList.java

@@ -0,0 +1,24 @@
+/*
+ * 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 cn.wildfirechat.pojos;
+
+
+import java.util.List;
+
+public class OutputUserBlockStatusList {
+    private List<InputOutputUserBlockStatus> statusList;
+
+    public List<InputOutputUserBlockStatus> getStatusList() {
+        return statusList;
+    }
+
+    public void setStatusList(List<InputOutputUserBlockStatus> statusList) {
+        this.statusList = statusList;
+    }
+}

common/src/main/java/cn/wildfirechat/common/APIPath.java

@@ -2,10 +2,6 @@ package cn.wildfirechat.common;
 
 public interface APIPath {
     String Create_Chatroom = "/admin/chatroom/create";
-    String Create_Group = "/admin/group/create";
-    String Create_Robot = "/admin/robot/create";
-    String Create_User = "/admin/user/create";
-
     String Chatroom_Destroy = "/admin/chatroom/del";
     String Chatroom_Info = "/admin/chatroom/info";
 
@@ -14,24 +10,29 @@ public interface APIPath {
     String Sensitive_Del = "/admin/sensitive/del";
     String Sensitive_Query = "/admin/sensitive/query";
 
-    String Get_User_Token = "/admin/user/token";
-    String User_Status = "/admin/user/status";
-    String Get_User_Info = "/admin/user/info";
-    String User_Status_List = "/admin/user/statuslist";
-    String User_Check_Status = "/admin/user/checkstatus";
-    String User_Online_Status = "/admin/user/onlinestatus";
+    String Create_User = "/admin/user/create";
+    String Create_Robot = "/admin/robot/create";
+    String User_Get_Token = "/admin/user/get_token";
+    String User_Update_Block_Status = "/admin/user/update_block_status";
+    String User_Get_Info = "/admin/user/get_info";
+    String User_Get_Blocked_List = "/admin/user/get_blocked_list";
+    String User_Check_Block_Status = "/admin/user/check_block_status";
+    String User_Get_Online_Status = "/admin/user/onlinestatus";
 
 
-    String Friend_Status = "/admin/friend/status";
-    String Friend_List = "/admin/friend/list";
+    String Friend_Update_Status = "/admin/friend/status";
+    String Friend_Get_List = "/admin/friend/list";
 
     String Msg_Send = "/admin/message/send";
     String Msg_Recall = "/admin/message/recall";
 
+    String Create_Group = "/admin/group/create";
     String Group_Dismiss = "/admin/group/del";
+    String Group_Transfer = "/admin/group/transfer";
+    String Group_Get_Info = "/admin/group/get_info";
+    String Group_Member_List = "/admin/group/member/list";
     String Group_Member_Add = "/admin/group/member/add";
     String Group_Member_Kickoff = "/admin/group/member/del";
-    String Group_Owner = "/admin/group/owner";
 
 
     String Channel_Message_Send = "/channel/message/send";

common/src/main/java/cn/wildfirechat/common/ErrorCode.java

@@ -68,7 +68,7 @@ public enum ErrorCode {
 
     public static ErrorCode fromCode(int code) {
         for (ErrorCode errorCode : ErrorCode.values()) {
-            if(errorCode.code == code) {
+            if(errorCode.code == (code&0xff)) {
                 return errorCode;
             }
         }