Merge remote-tracking branch 'origin/master'

incubator-game/src/main/java/com/incubator/game/GGame.java

@@ -181,6 +181,7 @@ public class GGame extends AbstractService {
         String name = RedisKeyConstant.WK_SERVE_KEY;
         String type = RedisKeyConstant.WK_SERVE_TYPE;
         WkServerStatus wkServerStatus = new WkServerStatus();
+        wkServerStatus.setIntranetIp(RedisKeyConstant.WK_SERVE_IP);
         wkServerStatus.setName(name);
         wkServerStatus.setNum(0);
         wkServerStatus.setType(type);

incubator-game/src/main/java/com/incubator/game/constant/RedisKeyConstant.java

@@ -38,9 +38,11 @@ public class RedisKeyConstant {
      * 服务域名或者ip端口信息 value当前服务域名或者ip端口信息,分割符为: 比如127.0.0.1:8080,127.0.0.1:8081
      */
     public static final String WK_SERVE = "wk:serve";
-    public static final String WK_SERVE_KEY = "192.168.0.236:9000";
+    public static final String WK_SERVE_KEY = "192.168.0.112:9000";
     // 0:普通房间 1:赛事房间  8 大厅
-    public static final String WK_SERVE_TYPE = "8";
+    public static final String WK_SERVE_TYPE = "0";
+
+    public static final String WK_SERVE_IP = "192.168.0.112";
 
     /**
      * 服务在线普通房间

incubator-game/src/main/java/com/incubator/game/constant/WkServerStatus.java

@@ -10,6 +10,16 @@ public  class WkServerStatus {
     private int num;
     // 服务器类型 8:大厅 0:好友房间 1:比赛房间
     private String type;
+    //内网ip
+    private String intranetIp;
+
+    public String getIntranetIp() {
+        return intranetIp;
+    }
+
+    public void setIntranetIp(String intranetIp) {
+        this.intranetIp = intranetIp;
+    }
 
     public WkServerStatus(String name, int num, String type) {
         this.type = type;