Merge remote-tracking branch 'origin/master'

game-business/src/main/java/com/game/business/config/GameTwoConfig.java

@@ -16,7 +16,7 @@ public class GameTwoConfig implements CommandLineRunner {
     @Override
     @Async
     public void run(String... args) throws Exception {
-//        webSocketConnent = new WebSocketConnent(Common.WS_GAME_TWO_URL, Common.GANME_TWO_NAME);
-//        webSocketConnent.connect();
+        webSocketConnent = new WebSocketConnent(Common.WS_GAME_TWO_URL, Common.GANME_TWO_NAME);
+        webSocketConnent.connect();
     }
 }

game-business/src/main/java/com/game/business/websocket/client/GameTwoClient.java

@@ -56,7 +56,7 @@ public class GameTwoClient {
             }
 
             System.out.println("game two 接收数据" + message);
-//            appGameBettingTask.gameDataTask(message, Common.GAME_TWO_CODE);
+            appGameBettingTask.gameDataTask(message, Common.GAME_TWO_CODE);
         }catch (Exception e){
             e.printStackTrace();
             System.out.println("game one 接收数据异常[" + e.getMessage() + "]");