修改前端广告位动态配置字段

修改放刷子配置

yt-adage/adage-service/src/main/java/com/ytpm/adage/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-adage/adage-service/src/main/resources/mapper/AppUserMapper.xml

@@ -366,6 +366,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -392,6 +393,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">
@@ -645,6 +647,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>

yt-algebraic/algebraic-service/src/main/java/com/ytpm/algebraic/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-algebraic/algebraic-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-allusion/allusion-service/src/main/java/com/ytpm/allusion/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-allusion/allusion-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-answer/answer-service/src/main/java/com/ytpm/answer/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-answer/answer-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-app/app-service/src/main/resources/mapper/xjlrl/XjlrlUserMapper.xml

@@ -305,6 +305,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>

yt-arithmetic/arithmetic-service/src/main/java/com/ytpm/arithmetic/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-arithmetic/arithmetic-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-calculator/calculator-service/src/main/java/com/ytpm/calculator/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-calculator/calculator-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-carp/carp-service/src/main/java/com/ytpm/carp/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-carp/carp-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-common/src/main/java/com/ytpm/agent/view/AgentAppView.java

@@ -127,4 +127,31 @@ public class AgentAppView {
     private Integer appCode;
     @ApiModelProperty("服务名称")
     private String serviceName;
+
+    @ApiModelProperty("taku应用ID")
+    private String takuAppId;
+    @ApiModelProperty("taku应用key")
+    private String takuKey;
+    @ApiModelProperty("taku横幅")
+    private String takuBannerPid;
+    @ApiModelProperty("taku原生")
+    private String takuNativePid;
+    @ApiModelProperty("taku激励")
+    private String takuRewardPid;
+    @ApiModelProperty("taku插屏")
+    private String takuInterstitialPid;
+    @ApiModelProperty("是否允许root")
+    private Integer canUseRoot;
+    @ApiModelProperty("是否允许adb")
+    private Integer canUseAdb;
+    @ApiModelProperty("是否允许浮窗")
+    private Integer canUseFloat;
+    @ApiModelProperty("是否允许累加体力")
+    private Integer canAccumulation;
+    @ApiModelProperty("是否允许模拟器")
+    private Integer canSimulator;
+    @ApiModelProperty("体力等待时间（秒）")
+    private Integer powerWaitTime;
+    @ApiModelProperty("插屏间隔时间（秒）")
+    private Integer interstitialIntervalTime;
 }

yt-common/src/main/java/com/ytpm/app/model/YtAppDefaultConfig.java

@@ -54,6 +54,8 @@ public class YtAppDefaultConfig {
     private Integer canUseFloat;
     @ApiModelProperty("是否允许累加体力")
     private Integer canAccumulation;
+    @ApiModelProperty("是否允许模拟器")
+    private Integer canSimulator;
     @ApiModelProperty("体力等待时间（秒）")
     private Integer powerWaitTime;
     @ApiModelProperty("插屏间隔时间（秒）")

yt-common/src/main/java/com/ytpm/app/view/WxDefaultConfig.java

@@ -1,6 +1,8 @@
 package com.ytpm.app.view;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,6 +15,7 @@ public class WxDefaultConfig {
     private String appId;
     private String secret;
     private String platformAppId;
+    @JsonIgnore
     private String platformAppSecret;
     private int appType;
     private String userPath;
@@ -20,4 +23,32 @@ public class WxDefaultConfig {
     private String adPath;
     private String answerPath;
     private String powerPath;
+    @ApiModelProperty("taku应用ID")
+    private String takuAppId;
+    @ApiModelProperty("taku应用key")
+    private String takuKey;
+    @ApiModelProperty("taku横幅")
+    private String takuBannerPid;
+    @ApiModelProperty("taku原生")
+    private String takuNativePid;
+    @ApiModelProperty("taku激励")
+    private String takuRewardPid;
+    @ApiModelProperty("taku插屏")
+    private String takuInterstitialPid;
+    @ApiModelProperty("是否允许root")
+    private Integer canUseRoot;
+    @ApiModelProperty("是否允许adb")
+    private Integer canUseAdb;
+    @ApiModelProperty("是否允许浮窗")
+    private Integer canUseFloat;
+    @ApiModelProperty("是否允许累加体力")
+    private Integer canAccumulation;
+    @ApiModelProperty("是否允许模拟器")
+    private Integer canSimulator;
+    @ApiModelProperty("体力等待时间（秒）")
+    private Integer powerWaitTime;
+    @ApiModelProperty("插屏间隔时间（秒）")
+    private Integer interstitialIntervalTime;
+    @ApiModelProperty("渠道类型id")
+    private String ditchId;
 }

yt-common/src/main/java/com/ytpm/middle/view/AppListVO.java

@@ -59,4 +59,16 @@ public class AppListVO {
     private String takuPublicKey;
     @ApiModelProperty(value = "售价",hidden = true)
     private String salePrice;
+    @ApiModelProperty("taku应用ID")
+    private String takuAppId;
+    @ApiModelProperty("taku应用key")
+    private String takuKey;
+    @ApiModelProperty("taku横幅")
+    private String takuBannerPid;
+    @ApiModelProperty("taku原生")
+    private String takuNativePid;
+    @ApiModelProperty("taku激励")
+    private String takuRewardPid;
+    @ApiModelProperty("taku插屏")
+    private String takuInterstitialPid;
 }

yt-countstep/countstep-service/src/main/java/com/ytpm/countstep/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-countstep/countstep-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator ,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-diary/diary-service/src/main/java/com/ytpm/diary/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-diary/diary-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -423,6 +426,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -449,6 +453,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-dtw/dtw-service/src/main/java/com/ytpm/dtw/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-dtw/dtw-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -423,6 +426,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -449,6 +453,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-emoticons/emoticons-service/src/main/java/com/ytpm/emoticons/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-emoticons/emoticons-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-funarith/funarith-service/src/main/java/com/ytpm/funarith/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-funarith/funarith-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator ,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-idiom/idiom-service/src/main/java/com/ytpm/idiom/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-idiom/idiom-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-irun/irun-service/src/main/java/com/ytpm/irun/controller/WxController.java

@@ -124,12 +124,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-irun/irun-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -423,6 +426,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -449,6 +453,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-lemon/lemon-service/src/main/java/com/ytpm/lemon/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-lemon/lemon-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator ,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-lime/lime-service/src/main/java/com/ytpm/lime/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-lime/lime-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/impl/ApkServiceImpl.java

@@ -76,13 +76,29 @@ public class ApkServiceImpl implements ApkService {
             List<WxDefaultConfig> configList = JSONArray.parseArray(JSON.toJSONString(o), WxDefaultConfig.class);
             configs.addAll(configList);
         }
-        Map<String, Integer> appTypeMap = configs.stream().collect(Collectors.toMap(WxDefaultConfig::getAppId, WxDefaultConfig::getAppType));
+        Map<String, WxDefaultConfig> appTypeMap = configs.stream().collect(Collectors.toMap(WxDefaultConfig::getAppId, o->o));
         //分析OSS实时日志统计下载次数
         Map<String, Integer> countDownloadMap = AliOSSUtil.getCountDownload(
                 Math.toIntExact(DateUtil.getTodayStart().getTime() / 1000), (int) (System.currentTimeMillis() / 1000));
+        WxDefaultConfig config;
         for (AgentAppView view : views) {
             if(appTypeMap.containsKey(view.getAppId())) {
-                view.setAppCode(appTypeMap.get(view.getAppId()));
+                config = appTypeMap.get(view.getAppId());
+                view.setAppCode(config.getAppType());
+                view.setDitchId(config.getDitchId());
+                view.setTakuAppId(config.getTakuAppId());
+                view.setTakuKey(config.getTakuKey());
+                view.setTakuBannerPid(config.getTakuBannerPid());
+                view.setTakuNativePid(config.getTakuNativePid());
+                view.setTakuRewardPid(config.getTakuRewardPid());
+                view.setTakuInterstitialPid(config.getTakuInterstitialPid());
+                view.setCanUseRoot(config.getCanUseRoot());
+                view.setCanUseAdb(config.getCanUseAdb());
+                view.setCanUseFloat(config.getCanUseFloat());
+                view.setCanAccumulation(config.getCanAccumulation());
+                view.setCanSimulator(config.getCanSimulator());
+                view.setPowerWaitTime(config.getPowerWaitTime());
+                view.setInterstitialIntervalTime(config.getInterstitialIntervalTime());
             }
             if(CharSequenceUtil.isBlank(view.getApkUrl()))continue;
             String substring = view.getApkUrl().substring(view.getApkUrl().lastIndexOf("/")+1).toLowerCase(Locale.ENGLISH);
@@ -131,7 +147,9 @@ public class ApkServiceImpl implements ApkService {
         YtPlatformUserApp app = appMapper.getByPrimary(param.getSuperiorId());
         YtAppDefaultConfig config = new YtAppDefaultConfig();
         config.setAppId(param.getAppId());
-        config.setDitchId(param.getDitchId().toString());
+        if(Objects.nonNull(param.getDitchId())){
+            config.setDitchId(param.getDitchId().toString());
+        }
         config.setTakuAppId(app.getTakuAppId());
         config.setTakuKey(app.getTakuKey());
         config.setTakuBannerPid(app.getTakuBannerPid());

yt-middle/middle-platform/src/main/resources/mapper/AppMapper.xml

@@ -167,6 +167,12 @@
             pua.issued_time,
             pua.wx_app_id,
             pua.wx_secret,
+            pua.taku_app_id,
+            pua.taku_key,
+            pua.taku_banner_pid,
+            pua.taku_native_pid,
+            pua.taku_reward_pid,
+            pua.taku_interstitial_pid,
             me.enterprise_name,
             me.legal,
             me.concat_phone,

yt-mileage/mileage-service/src/main/java/com/ytpm/mileage/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-mileage/mileage-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-nofeeds/nofeeds-service/src/main/java/com/ytpm/nofeeds/controller/UserController.java

@@ -199,12 +199,7 @@ public class UserController {
      */
     @GetMapping("/adRecords")
     public ResultTable<YtDyzAdRecord> adRecords(@RequestParam(name = "userId",required = true) String userId,@RequestParam(name = "adsourceType",required = false)Integer adsourceType) {
-        List<YtDyzAdRecord> result = new ArrayList<>();
-        List<YtDyzAdRecord> adrecords = adRecordMapper.getByUserId(userId, adsourceType);
-        if(CollUtil.isNotEmpty(adrecords)){
-            result.addAll(adrecords);
-        }
-        return ResultTable.resultTableOk(new PageInfo<YtDyzAdRecord>(result));
+        return ResultTable.resultTableOk(new PageInfo<YtDyzAdRecord>(adRecordMapper.getByUserId(userId, adsourceType)));
     }
 
     @PostMapping("/queryUserByTime")

yt-nofeeds/nofeeds-service/src/main/java/com/ytpm/nofeeds/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-nofeeds/nofeeds-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+             ,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,can_simulator,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -451,7 +455,8 @@
     </select>
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
-            config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+            config_id, config_name, open_id, secret, app_id, app_key, app_type, user_path, login_path, ad_path, answer_path, power_path
+             , taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation,can_simulator, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-picking/picking-service/src/main/java/com/ytpm/picking/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-picking/picking-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator ,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-raisepig/raisepig-service/src/main/java/com/ytpm/raisepig/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-raisepig/raisepig-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -423,6 +426,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -449,6 +453,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-summary/summary-service/src/main/java/com/ytpm/summary/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-summary/summary-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-vitality/vitality-service/src/main/java/com/ytpm/vitality/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-vitality/vitality-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">

yt-walk/walk-service/src/main/java/com/ytpm/walk/controller/WxController.java

@@ -123,12 +123,12 @@ public class WxController {
 
     @ApiOperation("获取微信默认配置项")
     @GetMapping("/defaultConfig")
-    public Result<String> getWxDefaultConfig(int appType) {
+    public Result<WxDefaultConfig> getWxDefaultConfig(int appType) {
         WxDefaultConfig config = appUserMapper.getDefaultConfig(appType);
         if(Objects.isNull(config)){
             return Result.resultErr("应用类型有误！");
         }
-       return Result.resultObjOk(config.getAppId());
+       return Result.resultObjOk(config);
     }
 
     @ApiOperation("体力增加")

yt-walk/walk-service/src/main/resources/mapper/AppUserMapper.xml

@@ -92,6 +92,9 @@
     <update id="updateAppConfig">
         update yt_app_default_config
         <set>
+            <if test="canSimulator != null">
+                can_simulator = #{canSimulator},
+            </if>
             <if test="configName != null">
                 config_name = #{configName},
             </if>
@@ -426,6 +429,7 @@
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
+                     ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time
         from yt_app_default_config
         where app_type = #{appType}
     </select>
@@ -452,6 +456,7 @@
     <select id="getConfigByIds" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id, secret, app_id, app_key, app_type,user_path,login_path,ad_path,answer_path,power_path
+        ,can_simulator, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid, can_use_root, can_use_adb, can_use_float, can_accumulation, ditch_id, power_wait_time, interstitial_interval_time
         from yt_app_default_config
         where app_id in
         <foreach collection="appIds.split(',')" item="item" separator="," open="(" close=")">