升级sud的jar版本

accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/MiniGameCallbackService.java

@@ -47,24 +47,21 @@ public class MiniGameCallbackService {
     @Autowired
     private MiniGameRoomService miniGameRoomService;
 
-//    @Lazy
+    //    @Lazy
     @Autowired
     private RoomService roomService;
 
     private Gson gson = new Gson();
 
-
     public SudCode getCode(String uid) {
-        SudMGPAuth client = new SudMGPAuth(MiniGameConfig.appId,MiniGameConfig.appSecret);
+        SudMGPAuth client = new SudMGPAuth(MiniGameConfig.appId, MiniGameConfig.appSecret);
         return client.getCode(uid);
     }
 
-    public BaseResp<SudSSToken> getSSToken(String code) {
+    public BaseResp<GetSSTokenResp> getSSToken(String code) {
         log.info("小游戏依据code{}获取SSToken", code);
-        SudMGPAuth client = new SudMGPAuth(MiniGameConfig.appId,MiniGameConfig.appSecret);
+        SudMGPAuth client = new SudMGPAuth(MiniGameConfig.appId, MiniGameConfig.appSecret);
-        BaseResp baseResp = new BaseResp();
+        BaseResp<GetSSTokenResp> baseResp = new BaseResp<>();
-
-
         SudUid sudUid = client.getUidByCode(code);
         if (!sudUid.isSuccess()) {
             log.error("check code failed. code:{},sudUid:{}", code, sudUid);
@@ -72,9 +69,7 @@ public class MiniGameCallbackService {
             baseResp.setRet_msg(RetCodeTypeEnum.PARAM_INVALID.getName());
             return baseResp;
         }
-
         SudSSToken sudSSToken = client.getSSToken(sudUid.getUid());
-
         GetSSTokenResp ssTokenResp = new GetSSTokenResp();
         ssTokenResp.setSs_token(sudSSToken.getToken());
         ssTokenResp.setExpire_date(sudSSToken.getExpireDate());
@@ -82,20 +77,17 @@ public class MiniGameCallbackService {
         return baseResp;
     }
 
-    public BaseResp updateSSToken(String ssToken) {
+    public BaseResp<UpdateSSTokenResp> updateSSToken(String ssToken) {
         log.info("小游戏更新SSToken{}", ssToken);
-        SudMGPAuth client = new SudMGPAuth(MiniGameConfig.appId,MiniGameConfig.appSecret);
+        SudMGPAuth client = new SudMGPAuth(MiniGameConfig.appId, MiniGameConfig.appSecret);
-
+        BaseResp<UpdateSSTokenResp> baseResp = new BaseResp<>();
-        BaseResp baseResp = new BaseResp();
+        SudUid sudUid = client.getUidBySSToken(ssToken);
-
-        SudUid sudUid =  client.getUidBySSToken(ssToken);
         if (!sudUid.isSuccess()) {
             log.error("check code failed. ssToken:{},sudUid:{}", ssToken, sudUid);
             baseResp.setRet_code(RetCodeTypeEnum.PARAM_INVALID);
             baseResp.setRet_msg(RetCodeTypeEnum.PARAM_INVALID.getName());
             return baseResp;
         }
-
         SudSSToken sudSSToken = client.getSSToken(sudUid.getUid());
         UpdateSSTokenResp data = new UpdateSSTokenResp();
         data.setSs_token(sudSSToken.getToken());
@@ -104,29 +96,24 @@ public class MiniGameCallbackService {
         return baseResp;
     }
 
-    public BaseResp getUserInfo(String ssToken) {
+    public BaseResp<GetUserInfoResp> getUserInfo(String ssToken) {
-        SudMGPAuth client = new SudMGPAuth(MiniGameConfig.appId,MiniGameConfig.appSecret);
+        SudMGPAuth client = new SudMGPAuth(MiniGameConfig.appId, MiniGameConfig.appSecret);
-        BaseResp baseResp = new BaseResp();
+        BaseResp<GetUserInfoResp> baseResp = new BaseResp<>();
-
+        SudUid sudUid = client.getUidBySSToken(ssToken);
-        SudUid sudUid =  client.getUidBySSToken(ssToken);
         if (!sudUid.isSuccess()) {
             log.error("check code failed. ssToken:{},sudUid:{}", ssToken, sudUid);
             baseResp.setRet_code(RetCodeTypeEnum.PARAM_INVALID);
             baseResp.setRet_msg(RetCodeTypeEnum.PARAM_INVALID.getName());
             return baseResp;
         }
-
-
 //        TODO 根据userId 查询用户数据返回
 //        String userId = sdkUidResponse.getUid();
-
+        Random random = new Random();
-        Random random = new  Random();
+        int index = random.nextInt(100);
-        int index=random.nextInt(100);
+        String uid = "uid" + index;
-        String uid ="uid"+index;
+        String nickName = "user" + index;
-        String nickName ="user"+index;
+        String gender = "male";
-        String gender ="male";
+        String avatarUrl = "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fi2.hdslb.com%2Fbfs%2Fface%2F3d4f30235a8f3bb9914fe59ff58e1009e5498ba6.jpg%4068w_68h.jpg&refer=http%3A%2F%2Fi2.hdslb.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1637226890&t=63d2ca921e1fde4abe30329f67e3612d";
-        String avatarUrl ="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fi2.hdslb.com%2Fbfs%2Fface%2F3d4f30235a8f3bb9914fe59ff58e1009e5498ba6.jpg%4068w_68h.jpg&refer=http%3A%2F%2Fi2.hdslb.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1637226890&t=63d2ca921e1fde4abe30329f67e3612d";
-
         GetUserInfoResp data = new GetUserInfoResp();
         data.setUid(uid);
         data.setNick_name(nickName);
@@ -138,21 +125,17 @@ public class MiniGameCallbackService {
 
     public BaseResp<GetUserInfoResp> getUserInfoV2(String ssToken) {
         log.info("小游戏获取用户信息回调{}", ssToken);
-        SudMGPAuth client = new SudMGPAuth(MiniGameConfig.appId,MiniGameConfig.appSecret);
+        SudMGPAuth client = new SudMGPAuth(MiniGameConfig.appId, MiniGameConfig.appSecret);
-        BaseResp baseResp = new BaseResp();
+        BaseResp<GetUserInfoResp> baseResp = new BaseResp<>();
-
         //SudMGPAuth client = new SudMGPAuth(CommonConstant.APP_ID,CommonConstant.APP_SECRET);
-        SudUid sudUid =  client.getUidBySSToken(ssToken);
+        SudUid sudUid = client.getUidBySSToken(ssToken);
         if (!sudUid.isSuccess()) {
             log.error("check code failed. ssToken:{},sudUid:{}", ssToken, sudUid);
             baseResp.setRet_code(RetCodeTypeEnum.PARAM_INVALID);
             baseResp.setRet_msg(RetCodeTypeEnum.PARAM_INVALID.getName());
             return baseResp;
         }
-
-
         String userId = sudUid.getUid();
-
         log.info("小游戏获取userInfo信息:{}", userId);
         Users users = usersBaseService.getUsersByUid(Long.valueOf(userId));
         if (ObjectUtil.isNull(users)) {
@@ -165,7 +148,6 @@ public class MiniGameCallbackService {
         String nickName = users.getNick();
         String gender = String.valueOf(users.getGender());
         String avatarUrl = ReplaceDomainUtil.handler(users.getAvatar());
-
         GetUserInfoResp data = new GetUserInfoResp();
         data.setUid(uid);
         data.setNick_name(nickName);
@@ -175,12 +157,10 @@ public class MiniGameCallbackService {
         return baseResp;
     }
 
-    public BaseResp reportGameSettleRs(MiniGameEndDataDto miniGameEndDataDto) {
+    public BaseResp<Void> reportGameSettleRs(MiniGameEndDataDto miniGameEndDataDto) {
         log.info("小游戏收到游戏结束回调{}", gson.toJson(miniGameEndDataDto));
-        BaseResp baseResp = new BaseResp();
+        BaseResp<Void> baseResp = new BaseResp<>();
-
         MiniGameRound miniGameRound = new MiniGameRound();
-
         miniGameRound.setRoundId(miniGameEndDataDto.getRound_id());
         miniGameRound.setLeaderUid(Long.valueOf(miniGameEndDataDto.getUid()));
         miniGameRound.setRoomUid(Long.valueOf(miniGameEndDataDto.getRoom_id()));
@@ -190,165 +170,120 @@ public class MiniGameCallbackService {
         miniGameRound.setBattleEndAt(miniGameEndDataDto.getBattle_end_at());
         miniGameRound.setBattleDuration(miniGameEndDataDto.getBattle_duration());
         miniGameRound.setState(Constant.MiniGameRoundState.game_end);
-
         miniGameRoundService.save(miniGameRound);
-
-
-
         List<MiniGameRoundRank> rankList = miniGameEndDataDto.getBattle_rs();
         if (CollectionUtil.isEmpty(rankList)) {
             log.info("房间{}场次{}参与用户为空", miniGameEndDataDto.getRoom_id(), miniGameEndDataDto.getRound_id());
             return baseResp;
         }
-        
         for (MiniGameRoundRank rank : rankList) {
             if (Constant.MiniGameUserType.normal.equals(rank.getIs_ai())) {
-                Long playerUid = Long.valueOf(Long.valueOf(rank.getUid()));
+                Long playerUid = Long.valueOf(rank.getUid());
                 Boolean isNewUsers = miniGameJoinUserRecordService.checkIsNewUser(playerUid);
-
                 MiniGameJoinUserRecord miniGameJoinUserRecord = new MiniGameJoinUserRecord();
-
                 miniGameJoinUserRecord.setRoomUid(Long.valueOf(miniGameEndDataDto.getUid()));
                 miniGameJoinUserRecord.setRoundId(miniGameEndDataDto.getRound_id());
                 miniGameJoinUserRecord.setUid(Long.valueOf(rank.getUid()));
                 miniGameJoinUserRecord.setIsEscaped(rank.getIs_escaped());
                 miniGameJoinUserRecord.setRank(rank.getRank());
-
-
-
                 miniGameJoinUserRecord.setIsNewUser((byte) (isNewUsers ? 1 : 0));
-
                 miniGameJoinUserRecordService.save(miniGameJoinUserRecord);
-
+            } else if (Constant.MiniGameUserType.ai.equals(rank.getIs_ai())) {
-            }else if (Constant.MiniGameUserType.ai.equals(rank.getIs_ai())) {
                 MiniGameJoinAiRecord miniGameJoinAiRecord = new MiniGameJoinAiRecord();
-
                 miniGameJoinAiRecord.setRoomUid(Long.valueOf(miniGameEndDataDto.getUid()));
                 miniGameJoinAiRecord.setRoundId(miniGameEndDataDto.getRound_id());
                 miniGameJoinAiRecord.setIsEscaped(rank.getIs_escaped());
-
                 miniGameJoinAiRecordService.save(miniGameJoinAiRecord);
-            }else {
+            } else {
                 log.info("房间{}场次{}出现用户{}未知类型{}", miniGameEndDataDto.getRoom_id(), miniGameEndDataDto.getRound_id(), rank.getUid(), rank.getIs_ai());
             }
         }
-
         return baseResp;
     }
 
-    public BaseResp reportGameInfo(MiniGameInfoDto miniGameInfoDto) {
+    public BaseResp<Void> reportGameInfo(MiniGameInfoDto miniGameInfoDto) {
         log.info("小游戏信息上报回调{}", gson.toJson(miniGameInfoDto));
-        BaseResp baseResp = new BaseResp();
+        BaseResp<Void> baseResp = new BaseResp<>();
-
         try {
             MiniGameRound miniGameRound = new MiniGameRound();
-
             Long leaderUid = Long.valueOf(miniGameInfoDto.getUid());
             miniGameRound.setLeaderUid(leaderUid);
-
             Object report_msg = miniGameInfoDto.getReport_msg();
             if (Constant.MiniGameConstant.game_start.equals(miniGameInfoDto.getReport_type())) {
                 if (ObjectUtil.isNull(report_msg)) return baseResp;
-
                 //战斗开始信息
                 GameStartDto gameStartDto = gson.fromJson(gson.toJson(report_msg), GameStartDto.class);
                 log.info("小游戏开始信息上报数据解析成功{}", gson.toJson(gameStartDto));
-
                 Long roomUid = Long.valueOf(gameStartDto.getRoom_id());
-
                 miniGameRound.setRoundId(gameStartDto.getGame_round_id());
                 miniGameRound.setRoomUid(roomUid);
-                miniGameRound.setMgId(Long.valueOf(gameStartDto.getMg_id()));
+                miniGameRound.setMgId(gameStartDto.getMg_id());
                 miniGameRound.setMode(gameStartDto.getGame_mode());
                 miniGameRound.setBattleStartAt(gameStartDto.getBattle_start_at());
                 miniGameRound.setState(Constant.MiniGameRoundState.gaming);
-
                 miniGameRoundService.save(miniGameRound);
-
-
                 //写入参加用户记录
                 if (CollectionUtil.isEmpty(gameStartDto.getPlayers())) {
                     log.info("小游戏开始信息上报竟然没有玩家...");
                     return baseResp;
                 }
-
                 miniGameJoinUserRecordService.writeStartMiniGame(gameStartDto);
-
                 miniGameRoomService.updateStateByRoomUid(Constant.MiniGameRoomState.gaming, Long.valueOf(miniGameInfoDto.getUid()));
-
                 //更新云信
-                SpringContextHolder.getBean(MiniGameCallbackService.class).updateNeteaseRoom(Long.valueOf(miniGameInfoDto.getUid()), Constant.MiniGameRoomState.gaming);
+                SpringContextHolder.getBean(MiniGameCallbackService.class).updateNetEaseRoom(Long.valueOf(miniGameInfoDto.getUid()), Constant.MiniGameRoomState.gaming);
-
             } else if (Constant.MiniGameConstant.game_settle.equals(miniGameInfoDto.getReport_type())) {
                 if (ObjectUtil.isNull(report_msg)) return baseResp;
                 //战斗结束信息
                 GameEndDto gameEndDto = gson.fromJson(gson.toJson(report_msg), GameEndDto.class);
                 log.info("小游戏结束信息上报数据解析成功{}", gson.toJson(gameEndDto));
                 Long roomUid = Long.valueOf(gameEndDto.getRoom_id());
-
                 MiniGameRound existsRound = miniGameRoundService.getById(gameEndDto.getGame_round_id());
                 if (ObjectUtil.isNull(existsRound)) {
                     log.info("小游戏结束上报未获取到开始游戏写入的数据{}", gson.toJson(gameEndDto));
-
                     miniGameRound.setRoundId(gameEndDto.getGame_round_id());
                     miniGameRound.setRoomUid(roomUid);
-                    miniGameRound.setMgId(Long.valueOf(gameEndDto.getMg_id()));
+                    miniGameRound.setMgId(gameEndDto.getMg_id());
                     miniGameRound.setMode(gameEndDto.getGame_mode());
                     miniGameRound.setBattleStartAt(gameEndDto.getBattle_start_at());
                     miniGameRound.setBattleEndAt(gameEndDto.getBattle_end_at());
                     miniGameRound.setBattleDuration(gameEndDto.getBattle_duration());
                     miniGameRound.setState(Constant.MiniGameRoundState.game_end);
-
                     miniGameRoundService.save(miniGameRound);
                 } else {
                     log.info("小游戏结束上报更新{}", gson.toJson(gameEndDto));
-
                     existsRound.setBattleEndAt(gameEndDto.getBattle_end_at());
                     existsRound.setBattleDuration(gameEndDto.getBattle_duration());
                     existsRound.setState(Constant.MiniGameRoundState.game_end);
                     miniGameRoundService.updateById(existsRound);
                 }
-
                 //写入参加用户记录
                 if (CollectionUtil.isEmpty(gameEndDto.getResults())) {
                     log.info("小游戏结束信息上报竟然没有玩家...");
                     return baseResp;
                 }
                 miniGameJoinUserRecordService.writeEndMiniGame(gameEndDto);
-
                 miniGameRoomService.updateStateByRoomUid(Constant.MiniGameRoomState.wait, Long.valueOf(miniGameInfoDto.getUid()));
-
                 //更新云信
-                SpringContextHolder.getBean(MiniGameCallbackService.class).updateNeteaseRoom(Long.valueOf(miniGameInfoDto.getUid()), Constant.MiniGameRoomState.wait);
+                SpringContextHolder.getBean(MiniGameCallbackService.class).updateNetEaseRoom(Long.valueOf(miniGameInfoDto.getUid()), Constant.MiniGameRoomState.wait);
-
             } else {
-                log.info("小游戏未知的信息上报类型", gson.toJson(miniGameInfoDto));
+                log.info("小游戏未知的信息上报类型 gameInfo : {}", gson.toJson(miniGameInfoDto));
             }
         } catch (Exception e) {
             log.info("小游戏上报异常{}", e.getMessage());
             throw new ServiceException("小遊戲上報異常");
         }
-
-
         return baseResp;
     }
 
     @Async
-    public void updateNeteaseRoom(Long roomUid, Byte mgState) {
+    public void updateNetEaseRoom(Long roomUid, Byte mgState) {
         try {
             Room room = roomService.getRoomByUid(roomUid);
             room.setMgState(mgState);
             roomService.updateRoomNeteaseAndDB(room);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.info("小游戏上报更新房间{}游戏状态失败", roomUid, e);
-            log.info("小游戏上报更新房间{}游戏状态失败", roomUid);
         }
-
     }
 
-
-
-
-
-
 }

accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/miniGame/MiniGameCallbackController.java

@@ -7,57 +7,57 @@ import com.accompany.common.result.BusiResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import tech.sud.mgp.auth.api.SudCode;
-import tech.sud.mgp.auth.api.SudSSToken;
 
 import javax.annotation.Resource;
 
 @Slf4j
 @RestController
-@Api(tags = "小游戏接入",value = "小游戏接入")
+@Api(tags = "小游戏接入", value = "小游戏接入")
 @RequestMapping(value = "/miniGame")
 public class MiniGameCallbackController extends BaseController {
 
-
     @Resource
     private MiniGameCallbackService miniGameCallbackService;
 
-
     @ApiOperation("获取code")
     @PostMapping("/getCode")
     public BusiResult<SudCode> getCode(Long uid) {
-        return new BusiResult(miniGameCallbackService.getCode(String.valueOf(uid)));
+        return new BusiResult<>(miniGameCallbackService.getCode(String.valueOf(uid)));
     }
 
     @ApiOperation("获取sstoken")
     @PostMapping("/get_sstoken")
-    public BaseResp<SudSSToken> getSSToken(@RequestBody() GetSSTokenReq reqParam) {
+    public BaseResp<GetSSTokenResp> getSSToken(@RequestBody GetSSTokenReq reqParam) {
         return miniGameCallbackService.getSSToken(reqParam.getCode());
     }
 
     @ApiOperation("更新sstoken")
     @PostMapping("/update_sstoken")
-    public BaseResp<SudSSToken> updateSSToken(@RequestBody() UpdateSSTokenReq reqParam) {
+    public BaseResp<UpdateSSTokenResp> updateSSToken(@RequestBody UpdateSSTokenReq reqParam) {
         return miniGameCallbackService.updateSSToken(reqParam.getSs_token());
     }
 
 
     @ApiOperation("获取用户信息")
     @PostMapping("/get_user_info")
-    public BaseResp<GetUserInfoResp> getUserInfo(@RequestBody() GetUserInfoReq reqParam) {
+    public BaseResp<GetUserInfoResp> getUserInfo(@RequestBody GetUserInfoReq reqParam) {
         return miniGameCallbackService.getUserInfoV2(reqParam.getSs_token());
     }
 
     @ApiOperation("游戏结束上报(目前废弃)")
     @PostMapping("/report_game_settle_rs")
-    public BaseResp reportGameSettleRs(@RequestBody() MiniGameEndDataDto miniGameEndDataDto) {
+    public BaseResp<Void> reportGameSettleRs(@RequestBody MiniGameEndDataDto miniGameEndDataDto) {
         return miniGameCallbackService.reportGameSettleRs(miniGameEndDataDto);
     }
 
     @ApiOperation("游戏信息上报")
     @PostMapping("/report_game_info")
-    public BaseResp reportGameInfo(@RequestBody() MiniGameInfoDto miniGameInfoDto) {
+    public BaseResp<Void> reportGameInfo(@RequestBody MiniGameInfoDto miniGameInfoDto) {
         return miniGameCallbackService.reportGameInfo(miniGameInfoDto);
     }
 }

accompany-dependencies/pom.xml

@@ -54,7 +54,7 @@
         <hanlp-lucene-plugin.version>1.1.6</hanlp-lucene-plugin.version>
         <sdk-core-java.version>1.0.2</sdk-core-java.version>
         <jjwt.version>0.9.1</jjwt.version>
-        <java-jwt.version>3.4.0</java-jwt.version>
+        <java-jwt.version>3.10.3</java-jwt.version>
         <ons-client.version>1.2.1</ons-client.version>
         <sitemesh.version>2.4.2</sitemesh.version>
         <jackson-mapper-asl.version>1.9.13</jackson-mapper-asl.version>
@@ -77,7 +77,7 @@
         <mybatisplus.version>3.1.2</mybatisplus.version>
         <kotlin.version>1.3.70</kotlin.version>
         <jackson-module-kotlin.version>2.9.7</jackson-module-kotlin.version>
-        <sud-mgp-auth-java.version>1.0.2</sud-mgp-auth-java.version>
+        <sud-mgp-auth-java.version>1.0.4</sud-mgp-auth-java.version>
         <redisson.version>3.16.8</redisson.version>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <easyexcel.version>3.2.1</easyexcel.version>