Merge branch 'package' of GameCenter/game-center into dev

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameOceanengineAppBackLog.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@TableName("t_game_ocenaengine_app_back_log")
+@TableName("t_game_oceanengine_app_back_log")
 public class GameOceanengineAppBackLog implements Serializable {
     private static final long serialVersionUID = 1L;
 

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameTencentAppCallbackServiceImpl.java

@@ -53,7 +53,7 @@ implements IGameTencentAppCallbackService {
             appCallback.setAgentKey("-");
             appCallback.setGameId(-1L);
         }
-        appCallback.setDay(dto.getClickTime() == null || dto.getClickTime() < 1000 ? LocalDate.now() : DateUtil.milliToLocalDateTime(dto.getClickTime()).toLocalDate());
+        appCallback.setDay(dto.getClickTime() == null || dto.getClickTime() < 1000 ? LocalDate.now() : DateUtil.secondToLocalDate(dto.getClickTime()));
         save(appCallback);
         try {
             kafkaProducer.send(new ProducerRecord<>(tencentAppCallbackTopic, dto.getAccountId().toString(), JsonUtil.toString(appCallback)));

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服务启动成功 <修改类型转换01> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <斗罗归因判断问题解决> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

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

@@ -567,7 +567,7 @@ public class CpPushDataServiceImpl implements ICpPushDataService {
         //解析渠道信息
         String channel = new String(Base64.getDecoder().decode(userData.getChannel()));
         //没有携带渠道标识, 无法解析渠道信息, 判定为自然量
-        if (!channel.contains("agentKey") || !channel.contains("state")) {
+        if (!channel.contains("agentKey") && !channel.contains("state")) {
             return Tuples.of(0L, Collections.emptyMap(), channel);
         }
         Tuple2<Boolean, Boolean> jsonAndEmpty = this.isJsonAndEmpty(channel);