Merge remote-tracking branch 'origin/package' into package

# Conflicts:
#	game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/GameBackApplication.java
#	game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/GameDataApplication.java
#	game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java
#	game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java
#	game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/GamePlatformApplication.java

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/GameBackApplication.java

@@ -16,7 +16,7 @@ public class GameBackApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(GameBackApplication.class, args);
-        System.out.println("游戏回传服务启动成功123 ( ´･･)ﾉ(._.`)  \n" +
+        System.out.println("游戏回传服务启动成功 <dubbo升级3.0, 删掉dubbo的group> ( ´･･)ﾉ(._.`) \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/GameDataApplication.java

@@ -16,7 +16,7 @@ public class GameDataApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(GameDataApplication.class, args);
-        System.out.println("游戏数据服务启动成功 ( ´･･)ﾉ(._.`)  \n" +
+        System.out.println("游戏数据服务启动成功 <dubbo升级3.0> ( ´･･)ﾉ(._.`) \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/enums/AccountTypeEnum.java → game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/enums/AccountTypeEnum.java

@@ -1,4 +1,4 @@
-package com.zanxiang.game.module.manage.pojo.enums;
+package com.zanxiang.game.module.base.pojo.enums;
 
 import lombok.Getter;
 

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

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功001 ( ´･･)ﾉ(._.`)  \n" +
+        System.out.println("赞象Manage服务启动成功 <dubbo升级3.0, 删掉dubbo的group> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -2,7 +2,7 @@ package com.zanxiang.game.module.manage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.game.module.manage.pojo.enums.AccountTypeEnum;
+import com.zanxiang.game.module.base.pojo.enums.AccountTypeEnum;
 import com.zanxiang.game.module.manage.pojo.params.AgentAddParam;
 import com.zanxiang.game.module.manage.pojo.params.AgentListParam;
 import com.zanxiang.game.module.manage.pojo.vo.AgentVO;

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

@@ -16,7 +16,7 @@ import com.zanxiang.game.back.base.ServerInfo;
 import com.zanxiang.game.back.base.pojo.vo.GameBackPolicyRpcVO;
 import com.zanxiang.game.back.base.rpc.IGameBackPolicyRpc;
 import com.zanxiang.game.module.manage.pojo.dto.AgentDTO;
-import com.zanxiang.game.module.manage.pojo.enums.AccountTypeEnum;
+import com.zanxiang.game.module.base.pojo.enums.AccountTypeEnum;
 import com.zanxiang.game.module.manage.pojo.params.AgentAddParam;
 import com.zanxiang.game.module.manage.pojo.params.AgentListParam;
 import com.zanxiang.game.module.manage.pojo.vo.AgentAccountChoiceVO;

game-module/game-module-mybatis/src/main/java/com/zanxiang/game/module/mybatis/entity/Agent.java

@@ -28,9 +28,6 @@ public class Agent implements Serializable {
 
     public static final Long DEFAULT_AGENT = 0L;
 
-    public static final Integer ACCOUNT_TYPE_TENCENT = 1;
-    public static final Integer ACCOUNT_TYPE_BYTE = 2;
-
     public static final Integer PUT_STATUS_ING = 1;
     public static final Integer PUT_STATUS_STOP = 2;
 

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服务启动成功 <dubbo升级3.0, APP提现记录接口上线> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/controller/RemitController.java

@@ -1,5 +1,6 @@
 package com.zanxiang.game.module.sdk.controller;
 
+import com.zanxiang.game.module.sdk.annotation.UnSignCheck;
 import com.zanxiang.game.module.sdk.pojo.param.GameRemitLogParam;
 import com.zanxiang.game.module.sdk.service.IGameRemitLogService;
 import com.zanxiang.module.util.pojo.ResultVO;
@@ -27,6 +28,7 @@ public class RemitController {
     @Autowired
     private IGameRemitLogService gameRemitLogService;
 
+    @UnSignCheck
     @ApiOperation(value = "游戏提现记录日志推送")
     @PostMapping("/log/push")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})

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

@@ -28,4 +28,12 @@ public interface IAgentService extends IService<Agent> {
      * @return {@link Tuple2}<{@link Long}, {@link Map}<{@link String}, {@link String}>>
      */
     Tuple3<Long, Map<String, String>, String> getUserAgentId(String channel);
+
+    /**
+     * channel解析
+     *
+     * @param channel 通道
+     * @return {@link Map}<{@link String}, {@link String}>
+     */
+    Map<String, String> channelTransform(String channel);
 }

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

@@ -117,7 +117,8 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
         return super.getOne(new LambdaQueryWrapper<Agent>().eq(Agent::getAgentKey, state));
     }
 
-    private Map<String, String> channelTransform(String channel) {
+    @Override
+    public Map<String, String> channelTransform(String channel) {
         //判断是否是json, 是就直接转成map
         if (this.isJsonStr(channel)) {
             return JsonUtil.toMap(channel, Map.class, String.class);

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

@@ -3,13 +3,11 @@ package com.zanxiang.game.module.sdk.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zanxiang.game.back.base.ServerInfo;
-import com.zanxiang.game.back.base.pojo.dto.TtAccountRpcDTO;
-import com.zanxiang.game.back.base.pojo.dto.TtOrderRpcDTO;
-import com.zanxiang.game.back.base.pojo.dto.TtUserActiveRpcDTO;
-import com.zanxiang.game.back.base.rpc.ITtMiniGameBackRpc;
-import com.zanxiang.game.back.base.pojo.dto.TencentOrderDTO;
-import com.zanxiang.game.back.base.pojo.dto.TencentUserDTO;
+import com.zanxiang.game.back.base.pojo.dto.*;
+import com.zanxiang.game.back.base.rpc.ITencentMiniGameBackRpc;
 import com.zanxiang.game.back.base.rpc.ITencentUserActionBackRpc;
+import com.zanxiang.game.back.base.rpc.ITtMiniGameBackRpc;
+import com.zanxiang.game.module.base.pojo.enums.AccountTypeEnum;
 import com.zanxiang.game.module.base.pojo.enums.GameCategoryEnum;
 import com.zanxiang.game.module.mybatis.entity.*;
 import com.zanxiang.game.module.sdk.pojo.dto.PlatformOrderDTO;
@@ -33,10 +31,13 @@ import java.util.Objects;
 public class CallBackServiceImpl implements ICallBackService {
 
     @DubboReference(providedBy = ServerInfo.SERVER_DUBBO_NAME)
-    private ITencentUserActionBackRpc gameBackTencentRpc;
+    private ITencentUserActionBackRpc tencentUserActionBackRpc;
 
     @DubboReference(providedBy = ServerInfo.SERVER_DUBBO_NAME)
-    private ITtMiniGameBackRpc wechatMiniGameDataReportRpc;
+    private ITencentMiniGameBackRpc tencentMiniGameBackRpc;
+
+    @DubboReference(providedBy = ServerInfo.SERVER_DUBBO_NAME)
+    private ITtMiniGameBackRpc ttMiniGameBackRpc;
 
     @Autowired
     private IAgentService agentService;
@@ -75,20 +76,29 @@ public class CallBackServiceImpl implements ICallBackService {
                 .eq(GameApplet::getGameId, user.getGameId()));
         log.error("用户注册回传, userId : {}", user.getId());
         try {
-            //腾讯回传
-            if (Objects.equals(agent.getAccountType(), Agent.ACCOUNT_TYPE_TENCENT)) {
+            //腾讯H5回传
+            if (Objects.equals(agent.getAccountType(), AccountTypeEnum.TENCENT_H5.getValue())) {
                 TencentUserDTO tencentUserDTO = this.transform(user, agent, gameApplet);
-                log.error("用户注册 --> 腾讯回传提交, tencentUserDTO : {}", JsonUtil.toString(tencentUserDTO));
-                gameBackTencentRpc.backUser(tencentUserDTO);
+                log.error("用户注册 --> 腾讯H5回传提交, tencentUserDTO : {}", JsonUtil.toString(tencentUserDTO));
+                tencentUserActionBackRpc.backUser(tencentUserDTO);
+            }
+            //腾讯小游戏回传
+            if (Objects.equals(agent.getAccountType(), AccountTypeEnum.TENCENT_MINI_GAME.getValue())) {
+                TencentUserDTO tencentUserDTO = this.transform(user, agent, gameApplet);
+                //解析设置clickId
+                Map<String, String> channelMap = agentService.channelTransform(user.getChannel());
+                tencentUserDTO.setClickId(channelMap.get("gdt_vid"));
+                log.error("用户注册 --> 腾讯小游戏回传提交, tencentUserDTO : {}", JsonUtil.toString(tencentUserDTO));
+                tencentMiniGameBackRpc.backUser(tencentUserDTO);
             }
             //头条回传
-            if (CollectionUtils.isNotEmpty(urlParamMap) && Objects.equals(agent.getAccountType(), Agent.ACCOUNT_TYPE_BYTE)) {
+            if (CollectionUtils.isNotEmpty(urlParamMap) && Objects.equals(agent.getAccountType(), AccountTypeEnum.BYTE.getValue())) {
                 Game game = gameService.getById(user.getGameId());
                 //判断是微信小游戏
                 if (Objects.equals(game.getCategory(), GameCategoryEnum.CATEGORY_WX_APPLET.getId())) {
                     TtUserActiveRpcDTO activeReportRpcDTO = this.transform(user, agent, gameApplet, urlParamMap);
                     log.error("用户注册 --> 头条回传提交, activeReportRpcDTO : {}", JsonUtil.toString(activeReportRpcDTO));
-                    wechatMiniGameDataReportRpc.userActiveReport(activeReportRpcDTO);
+                    ttMiniGameBackRpc.userActiveReport(activeReportRpcDTO);
                 }
             }
         } catch (Exception e) {
@@ -115,20 +125,29 @@ public class CallBackServiceImpl implements ICallBackService {
                 .eq(GameApplet::getGameId, user.getGameId()));
         log.error("用户订单回传, orderId : {}", platformOrderDTO.getOrderId());
         try {
-            //腾讯回传
-            if (Objects.equals(agent.getAccountType(), Agent.ACCOUNT_TYPE_TENCENT)) {
+            //腾讯H5回传
+            if (Objects.equals(agent.getAccountType(), AccountTypeEnum.TENCENT_H5.getValue())) {
+                TencentOrderDTO tencentOrderDTO = this.transform(platformOrderDTO, user, agent, gameApplet);
+                log.error("用户下单 --> 腾讯H5回传提交, tencentOrderDTO : {}", JsonUtil.toString(tencentOrderDTO));
+                tencentUserActionBackRpc.backOrder(tencentOrderDTO);
+            }
+            //腾讯小游戏回传
+            if (Objects.equals(agent.getAccountType(), AccountTypeEnum.TENCENT_MINI_GAME.getValue())) {
                 TencentOrderDTO tencentOrderDTO = this.transform(platformOrderDTO, user, agent, gameApplet);
-                log.error("用户下单 --> 腾讯回传提交, tencentOrderDTO : {}", JsonUtil.toString(tencentOrderDTO));
-                gameBackTencentRpc.backOrder(tencentOrderDTO);
+                //解析设置clickId
+                Map<String, String> channelMap = agentService.channelTransform(user.getChannel());
+                tencentOrderDTO.setClickId(channelMap.get("gdt_vid"));
+                log.error("用户下单 --> 腾讯小游戏回传提交, tencentOrderDTO : {}", JsonUtil.toString(tencentOrderDTO));
+                tencentUserActionBackRpc.backOrder(tencentOrderDTO);
             }
             //头条回传
-            if (Objects.equals(agent.getAccountType(), Agent.ACCOUNT_TYPE_BYTE)) {
+            if (Objects.equals(agent.getAccountType(), AccountTypeEnum.BYTE.getValue())) {
                 //判断游戏类型
                 Game game = gameService.getById(platformOrderDTO.getGameId());
                 if (Objects.equals(game.getCategory(), GameCategoryEnum.CATEGORY_WX_APPLET.getId())) {
                     TtOrderRpcDTO ttOrderRpcDTO = this.transform(platformOrderDTO, user.getOpenId(), agent, gameApplet);
                     log.error("用户下单 --> 头条回传提交, orderReportRpcDTO : {}", JsonUtil.toString(ttOrderRpcDTO));
-                    wechatMiniGameDataReportRpc.orderReport(ttOrderRpcDTO);
+                    ttMiniGameBackRpc.orderReport(ttOrderRpcDTO);
                 }
             }
         } catch (Exception e) {
@@ -138,6 +157,7 @@ public class CallBackServiceImpl implements ICallBackService {
 
     private TencentUserDTO transform(User user, Agent agent, GameApplet gameApplet) {
         return TencentUserDTO.builder()
+                .backPolicyId(agent.getBackPolicyId())
                 .gameId(user.getGameId())
                 .adAccountId(agent.getAccountId())
                 .registerTime(user.getCreateTime())

game-platform/game-platform-serve/src/main/java/com/zanxiang/game/platform/serve/GamePlatformApplication.java

@@ -23,7 +23,7 @@ public class GamePlatformApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(GamePlatformApplication.class, args);
-        System.out.println("游戏第三方平台数据服务启动成功--pro ( ´･･)ﾉ(._.`)  \n" +
+        System.out.println("游戏第三方平台数据服务启动成功 <dubbo升级3.0, 删掉dubbo的group> ( ´･･)ﾉ(._.`) \n" +
                 " ______  __     __     \n" +
                 "/_____/\\/__/\\ /__/\\    \n" +
                 "\\:::__\\/\\ \\::\\\\:.\\ \\   \n" +