dos 2 månader sedan
förälder
incheckning
d94a65a7ca

+ 1 - 1
game-business/src/main/java/com/game/business/config/GameEightConfig.java

@@ -16,7 +16,7 @@ public class GameEightConfig implements CommandLineRunner {
     @Override
     @Async
     public void run(String... args) throws Exception {
-        webSocketConnent = new WebSocketConnent(Common.WS_GAME_EIGHT_REMARK_URL,Common.WS_GAME_EIGHT_URL, Common.GAME_EIGHT_NAME);
+        webSocketConnent = new WebSocketConnent(Common.WS_GAME_EIGHT_URL,Common.WS_GAME_EIGHT_URL, Common.GAME_EIGHT_NAME);
         webSocketConnent.connect();
     }
 }

+ 1 - 1
game-business/src/main/java/com/game/business/config/GameFiveConfig.java

@@ -16,7 +16,7 @@ public class GameFiveConfig implements CommandLineRunner {
     @Override
     @Async
     public void run(String... args) throws Exception {
-        webSocketConnent = new WebSocketConnent(Common.WS_GAME_FIVE_REMARK_URL,Common.WS_GAME_FIVE_URL,  Common.GAME_FIVE_NAME);
+        webSocketConnent = new WebSocketConnent(Common.WS_GAME_FIVE_URL,Common.WS_GAME_FIVE_URL,  Common.GAME_FIVE_NAME);
         webSocketConnent.connect();
     }
 }

+ 1 - 1
game-business/src/main/java/com/game/business/config/GameFourConfig.java

@@ -16,7 +16,7 @@ public class GameFourConfig implements CommandLineRunner {
     @Override
     @Async
     public void run(String... args) throws Exception {
-        webSocketConnent = new WebSocketConnent( Common.WS_GAME_FOUR_REMARK_URL, Common.WS_GAME_FOUR_URL,Common.GAME_FOUR_NAME);
+        webSocketConnent = new WebSocketConnent( Common.WS_GAME_FOUR_URL, Common.WS_GAME_FOUR_URL,Common.GAME_FOUR_NAME);
         webSocketConnent.connect();
     }
 }

+ 1 - 1
game-business/src/main/java/com/game/business/config/GameOneConfig.java

@@ -16,7 +16,7 @@ public class GameOneConfig implements CommandLineRunner {
     @Override
     @Async
     public void run(String... args) throws Exception {
-        webSocketConnent = new WebSocketConnent(Common.WS_GAME_ONE_REMARK_URL,Common.WS_GAME_ONE_URL,  Common.GANME_ONE_NAME);
+        webSocketConnent = new WebSocketConnent(Common.WS_GAME_ONE_URL,Common.WS_GAME_ONE_URL,  Common.GANME_ONE_NAME);
         webSocketConnent.connect();
     }
 }

+ 1 - 1
game-business/src/main/java/com/game/business/config/GameSevenConfig.java

@@ -16,7 +16,7 @@ public class GameSevenConfig implements CommandLineRunner {
     @Override
     @Async
     public void run(String... args) throws Exception {
-        webSocketConnent = new WebSocketConnent( Common.WS_GAME_SEVEN_REMARK_URL,Common.WS_GAME_SEVEN_URL, Common.GAME_SEVEN_NAME);
+        webSocketConnent = new WebSocketConnent( Common.WS_GAME_SEVEN_URL,Common.WS_GAME_SEVEN_URL, Common.GAME_SEVEN_NAME);
         webSocketConnent.connect();
     }
 }

+ 1 - 1
game-business/src/main/java/com/game/business/config/GameSixConfig.java

@@ -16,7 +16,7 @@ public class GameSixConfig implements CommandLineRunner {
     @Override
     @Async
     public void run(String... args) throws Exception {
-        webSocketConnent = new WebSocketConnent( Common.WS_GAME_SIX_REMARK_URL, Common.WS_GAME_SIX_URL,Common.GAME_SIX_NAME);
+        webSocketConnent = new WebSocketConnent( Common.WS_GAME_SIX_URL, Common.WS_GAME_SIX_URL,Common.GAME_SIX_NAME);
         webSocketConnent.connect();
     }
 }

+ 1 - 1
game-business/src/main/java/com/game/business/config/GameThreesConfig.java

@@ -16,7 +16,7 @@ public class GameThreesConfig implements CommandLineRunner {
     @Override
     @Async
     public void run(String... args) throws Exception {
-        webSocketConnent = new WebSocketConnent( Common.WS_GAME_THREES_REMARK_URL,Common.WS_GAME_THREES_URL, Common.GAME_THREES_NAME);
+        webSocketConnent = new WebSocketConnent( Common.WS_GAME_THREES_URL,Common.WS_GAME_THREES_URL, Common.GAME_THREES_NAME);
         webSocketConnent.connect();
     }
 }

+ 1 - 1
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_REMARK_URL,Common.WS_GAME_TWO_URL,  Common.GANME_TWO_NAME);
+        webSocketConnent = new WebSocketConnent(Common.WS_GAME_TWO_URL,Common.WS_GAME_TWO_URL,  Common.GANME_TWO_NAME);
         webSocketConnent.connect();
     }
 }

+ 2 - 2
game-business/src/main/java/com/game/business/domain/AppGameLotteryHistory.java

@@ -20,8 +20,8 @@ import lombok.Data;
  * @author game
  * @date 2025-01-09
  */
-@ApiModel(value = "app_game_lottery_history", description = "游戏开奖记录(备份)")
-@TableName(value= "app_game_lottery_history")
+@ApiModel(value = "app_game_lottery_history2", description = "游戏开奖记录(备份)")
+@TableName(value= "app_game_lottery_history2")
 @Data
 public class AppGameLotteryHistory
         {

+ 2 - 2
game-business/src/main/java/com/game/business/task/AppGameBettingTask.java

@@ -123,7 +123,7 @@ public class AppGameBettingTask {
 
             if(type == 3){
 
-                String redisKey = CacheConstants.GAME_LOTTERY_TASK_CREATE_NEW.concat(appGame.getId() + ":" + gameCode);
+                String redisKey = CacheConstants.GAME_LOTTERY_TASK_CREATE_NEW2.concat(appGame.getId() + ":" + gameCode);
                 if(!redisCache.redisTemplate.opsForValue().setIfAbsent(redisKey, 1)){
                     continue;
                 }
@@ -162,7 +162,7 @@ public class AppGameBettingTask {
                 continue;
             }
 
-            String redisKey = CacheConstants.GAME_LOTTERY_TASK_NEW.concat(appGame.getId() + ":" + gameDate);
+            String redisKey = CacheConstants.GAME_LOTTERY_TASK_NEW2.concat(appGame.getId() + ":" + gameDate);
             if(!redisCache.redisTemplate.opsForValue().setIfAbsent(redisKey, 1)){
                 continue;
             }

+ 5 - 5
game-business/src/main/resources/mapper/business/AppGameLotteryHistoryMapper.xml

@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAppGameLotteryHistoryVo">
-        select id, class_id, game_id, game_date, is_lottery, game_lottery_succ, game_record_date from app_game_lottery_history
+        select id, class_id, game_id, game_date, is_lottery, game_lottery_succ, game_record_date from app_game_lottery_history2
     </sql>
 
     <select id="selectAppGameLotteryHistoryList" parameterType="com.game.business.domain.AppGameLotteryHistory" resultMap="AppGameLotteryHistoryResult">
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertAppGameLotteryHistory" parameterType="com.game.business.domain.AppGameLotteryHistory" useGeneratedKeys="true" keyProperty="id">
-        insert into app_game_lottery_history
+        insert into app_game_lottery_history2
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="classId != null">class_id,</if>
             <if test="gameId != null">game_id,</if>
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateAppGameLotteryHistory" parameterType="com.game.business.domain.AppGameLotteryHistory">
-        update app_game_lottery_history
+        update app_game_lottery_history2
         <trim prefix="SET" suffixOverrides=",">
             <if test="classId != null">class_id = #{classId},</if>
             <if test="gameId != null">game_id = #{gameId},</if>
@@ -69,11 +69,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteAppGameLotteryHistoryById" parameterType="Long">
-        delete from app_game_lottery_history where id = #{id}
+        delete from app_game_lottery_history2 where id = #{id}
     </delete>
 
     <delete id="deleteAppGameLotteryHistoryByIds" parameterType="String">
-        delete from app_game_lottery_history where id in 
+        delete from app_game_lottery_history2 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

+ 6 - 0
game-common/src/main/java/com/game/common/constant/CacheConstants.java

@@ -62,6 +62,11 @@ public class CacheConstants
      */
     public static final String GAME_LOTTERY_TASK_NEW = "game_lottery_task_new:";
 
+    /**
+     * 开奖任务锁
+     */
+    public static final String GAME_LOTTERY_TASK_NEW2 = "game_lottery_task_new2:";
+
     /**
      * 创建开奖任务锁
      */
@@ -71,6 +76,7 @@ public class CacheConstants
      * 创建开奖任务锁
      */
     public static final String GAME_LOTTERY_TASK_CREATE_NEW = "game_lottery_task_create_new:";
+    public static final String GAME_LOTTERY_TASK_CREATE_NEW2 = "game_lottery_task_create_new2:";
 
     /**
      * 倍数记录锁