好友：添加区服信息

shared/consts/constModules/selectConst.ts

@@ -1,10 +1,10 @@
 
 export enum ROLE_SELECT {
    // 初始登录数据
-   ENTRY = 'serverId userInfo.uid userInfo.tel ce topFiveCe teraphs roleId roleName tili lv exp gold coin vLv title hasGuild',
+   ENTRY = 'serverId userInfo.uid userInfo.tel userInfo.serverType ce topFiveCe teraphs roleId roleName tili lv exp gold coin vLv title hasGuild',
    // 玩家列表显示基础数据
-   SHOW_SIMPLE = 'roleId roleName ce headHid sHid lv title job quitTime vLv guildName',
-   SHOW_FRIEND_APPLY_LIST = 'roleId roleName ce headHid sHid lv title job quitTime vLv guildName friendCnt recFrdApplyCnt',
+   SHOW_SIMPLE = 'roleId roleName ce headHid sHid lv title job quitTime vLv guildName serverId userInfo.serverType',
+   SHOW_FRIEND_APPLY_LIST = 'roleId roleName ce headHid sHid lv title job quitTime vLv guildName friendCnt recFrdApplyCnt serverId userInfo.serverType',
    HANDLE_APPLY = 'roleId friendCnt lv',
    ATTR = 'globalCeAttr',
    GET_LV = 'lv',

shared/consts/constModules/sysConst.ts

@@ -223,6 +223,7 @@ export const REDIS_KEY = {
   PVP_RANK: "pvpRank", // pvp排行榜
   GUILD_INFO: "guildInfo", // 公会信息
   GUILD_ACTIVE_RANK: "guildActiveRank", // 公会周活跃排行榜
+  DB_GAME: 'db_game'
 }
 
 // 各排行榜对应hash的key
@@ -380,6 +381,7 @@ export enum POPULATE_TYPE {
 
 export enum BLOCK_OPEATE {
   ADD = 1,
-  REMOVE = 2,
-  REMOVE_AND_APPLY = 3
+  REMOVE_BLACK = 2,
+  REMOVE_AND_APPLY = 3,
+  REMOVE_FRIEND = 4
 }

shared/domain/roleField/friend.ts

@@ -1,7 +1,6 @@
 import { RoleType } from "../../db/Role";
 import { FriendShipType } from "../../db/FriendShip";
 import * as friendUtil from '../../pubUtils/friendUtil'
-import { Relation } from "../../db/FriendRelation";
 
 export class FriendParams {
     roleId: string;
@@ -11,6 +10,8 @@ export class FriendParams {
     sHid: number;
     ce: number;
     title: number;
+    serverId: number;
+    serverName: string;
 
     constructor(role: RoleType) {
         this.roleId = role.roleId;
@@ -21,6 +22,11 @@ export class FriendParams {
         this.ce = role.ce;
         this.title = role.title;
     }
+
+    setServerName(serverId: number, serverName: string) {
+        this.serverId = serverId;
+        this.serverName = serverName;
+    }
 }
 
 export class FriendRecommendParams extends FriendParams {