fix : 头条虚拟游戏链路兼容修改

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java

@@ -23,7 +23,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <删除调试日志> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <头条虚拟游戏链路兼容修改> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/AgentServiceImpl.java

@@ -206,7 +206,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
         // 1. 策略一 : 根据 ip + ua 精准匹配用户
         userVisitLogList = userVisitLogService.list(new LambdaQueryWrapper<UserVisitLog>()
                 .eq(UserVisitLog::getIp, userData.getIp())
-                .eq(UserVisitLog::getUa, userData)
+                .eq(UserVisitLog::getUa, userData.getUa())
                 .le(UserVisitLog::getCreateTime, regTime));
         // 判断通过策略一是否拿到数据, 筛选出访问时间与注册时间最接近的
         if (CollectionUtils.isNotEmpty(userVisitLogList)) {
@@ -303,6 +303,8 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
         UserApplet userApplet = userAppletService.getById(Integer.valueOf(paramMap.get(callState)));
         if (userApplet != null && Strings.isNotBlank(userApplet.getChannel())) {
             paramMap.putAll(this.channelToMap(userApplet.getChannel()));
+            paramMap.put("appId", userApplet.getAppId());
+            paramMap.put("openId", userApplet.getOpenId());
         }
         return paramMap;
     }

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/LoginServiceImpl.java

@@ -290,7 +290,7 @@ public class LoginServiceImpl implements IRegisterLoginService {
         User user = transform(userData, tuple3.getT1(), userName);
         user.setPassword(password);
         user.setMobile(mobile);
-        user.setOpenId(openId);
+        user.setOpenId(Strings.isNotBlank(openId) ? openId : tuple3.getT2().get("openId"));
         user.setSessionKey(sessionKey);
         user.setChannel(userData.getChannel());
         user.setShareUserId(shareUserId);