anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refactor_server_api' into wildfirechat

Browse Source 
* refactor_server_api:
  update
  update
  update
  update
  update
  update
This commit is contained in:
heavyrain.lee
2019-05-25 13:54:40 +08:00
parent af4d73a0d5 3e769c885c
commit 757186d77b
43 changed files with 1180 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/cn/wildfirechat/common/APIPath.java
+14 -13
View File
@@ -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
+1 -1
View File
@@ -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;
}
}