fix : 小程序监听修改完成上线

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <测试小程序监听2> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <小程序监听修改完成上线> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/TestController.java

@@ -1,39 +0,0 @@
-package com.zanxiang.game.module.manage.controller;
-
-import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.pojo.vo.VipLevelChoiceVO;
-import com.zanxiang.game.module.manage.service.IAppletCheckService;
-import com.zanxiang.module.util.pojo.ResultVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author : lingfeng
- * @time : 2024-01-23
- * @description :
- */
-@Api(tags = {"CP管理接口"})
-@RestController
-@RequestMapping("/test")
-@Slf4j
-public class TestController {
-
-    @Autowired
-    private IAppletCheckService appletCheckService;
-
-    @ApiOperation(value = "小程序监测测试接口")
-    @GetMapping(value = "/check/app")
-    @PreAuthorize(permissionKey = "manage:cp:checkApp")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = VipLevelChoiceVO.class, responseContainer = "list")})
-    public ResultVO<Void> vipLevelChoiceList() {
-        appletCheckService.payApplicationCheck();
-        return ResultVO.ok();
-    }
-}

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/AppletCheckServiceImpl.java

@@ -78,9 +78,8 @@ public class AppletCheckServiceImpl implements IAppletCheckService {
             } catch (Exception e) {
                 log.error("获取小程序token异常, appName : {}, e : {}", payApplication.getAppName(), e.getMessage());
             }
-            log.error("小程序监测获取token, appName : {}, accessToken : {}", payApplication.getAppName(), accessToken);
             if (Strings.isBlank(accessToken) || !this.appletCheck(accessToken)) {
-                log.error("小程序判定封停, appName : {}", payApplication.getAppName());
+                log.error("小程序判定封停或者禁用, appName : {}, accessToken : {}", payApplication.getAppName(), accessToken);
                 this.payApplicationCheck(payApplication);
             }
         });
@@ -89,8 +88,8 @@ public class AppletCheckServiceImpl implements IAppletCheckService {
     @Override
     public void payApplicationCheck(PayApplication payApplication) {
         try {
-            //更新游戏支付盒子配置
-            this.gamePayWayUpdate(payApplication);
+            //更新游戏支付
+            this.gamePayUpdate(payApplication);
         } catch (Exception e) {
             log.error("支付应用异常更新游戏支付盒子失败, appName : {}, e : {}", payApplication.getAppName(), e.getMessage());
         }
@@ -108,15 +107,13 @@ public class AppletCheckServiceImpl implements IAppletCheckService {
         }
     }
 
-    private void gamePayWayUpdate(PayApplication payApplication) {
+    private void gamePayUpdate(PayApplication payApplication) {
         //修改支付应用状态
         log.error("支付应用异常 - 修改支付应用状态, appName : {}", payApplication.getAppName());
         payApplicationService.update(new LambdaUpdateWrapper<PayApplication>()
                 .eq(PayApplication::getAppId, payApplication.getAppId())
                 .set(PayApplication::getStatus, StatusEnum.NO.getCode())
                 .set(PayApplication::getUpdateTime, LocalDateTime.now()));
-
-
         //查询支付应用对应的盒子
         List<PayBox> payBoxList = payBoxService.list(new LambdaQueryWrapper<PayBox>()
                 .eq(PayBox::getAppId, payApplication.getAppId())
@@ -132,8 +129,11 @@ public class AppletCheckServiceImpl implements IAppletCheckService {
                 .in(PayBox::getId, payBoxIdList)
                 .set(PayBox::getStatus, StatusEnum.NO.getCode())
                 .set(PayBox::getUpdateTime, LocalDateTime.now()));
+        //游戏支付应用修改
+//        this.gamePayWayUpdate(payApplication, payBoxIdList);
+    }
 
-
+    private void gamePayWayUpdate(PayApplication payApplication, Set<Integer> payBoxIdList) {
         //查询相关盒子被使用到的游戏
         List<GamePayWay> gamePayWayList = gamePayWayService.list(new LambdaQueryWrapper<GamePayWay>()
                 .in(GamePayWay::getPayBoxId, payBoxIdList));
@@ -155,10 +155,10 @@ public class AppletCheckServiceImpl implements IAppletCheckService {
         //修改游戏支付配置
         log.error("支付应用异常 - 修改游戏支付配置, appName : {}, gamePayWayIdSet : {}, payBoxId : {}", payApplication.getAppName(),
                 gamePayWayIdSet, payBox.getId());
-//        gamePayWayService.update(new LambdaUpdateWrapper<GamePayWay>()
-//                .in(GamePayWay::getId, gamePayWayIdSet)
-//                .set(GamePayWay::getPayBoxId, payBox.getId())
-//                .set(GamePayWay::getUpdateTime, LocalDateTime.now()));
+        gamePayWayService.update(new LambdaUpdateWrapper<GamePayWay>()
+                .in(GamePayWay::getId, gamePayWayIdSet)
+                .set(GamePayWay::getPayBoxId, payBox.getId())
+                .set(GamePayWay::getUpdateTime, LocalDateTime.now()));
     }
 
     private void sendDingTalkMsg(PayApplication payApplication) {
@@ -178,13 +178,11 @@ public class AppletCheckServiceImpl implements IAppletCheckService {
         }
         String content = payApplication.getAppName() + "监测异常";
         Set<String> phoneNumSet = listenCallList.stream().map(ListenCall::getPhoneNum).collect(Collectors.toSet());
-        phoneNumSet.forEach(phoneNum -> this.phoneCall(phoneNum, content));
+        phoneNumSet.forEach(phoneNum -> this.phoneCall(content, phoneNum));
     }
 
     private List<ListenCall> callListenUser() {
         List<ListenCall> listenCallList = listenCallService.list(new LambdaQueryWrapper<ListenCall>()
-                //todo : 临时调试条件
-                .eq(ListenCall::getUserId, 220L)
                 .eq(ListenCall::getStatus, StatusEnum.YES.getCode()));
         if (CollectionUtils.isEmpty(listenCallList)) {
             return Collections.emptyList();

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/task/PayApplicationTask.java

@@ -25,13 +25,13 @@ public class PayApplicationTask {
     private IAppletCheckService appletCheckService;
 
     /**
-     * 小程序每分钟检查
+     * 小程序每10分钟检查
      */
-//    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0 0/10 * * * ?")
     public void payApplicationCheck() {
         String lockKey = "payApplicationCheck_lock";
         //上锁
-        if (!distributedLockComponent.doLock(lockKey, 0L, 10L, TimeUnit.MINUTES)) {
+        if (!distributedLockComponent.doLock(lockKey, 0L, 15L, TimeUnit.MINUTES)) {
             return;
         }
         log.error("小程序每分钟token监控定时器开始执行, time : {}", System.currentTimeMillis());