app提示语问题

首页统计数据不准确问题
风控初始值配置问题

yt-agent/agent-service/src/main/java/com/ytpm/controller/AgentIndexController.java

@@ -410,13 +410,7 @@ public class AgentIndexController {
     @PostMapping("/userStatistic")
     public Result<Map<String, Object>> getDashboardData(@ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo) throws InterruptedException {
         Map<String, Object> result = new ConcurrentHashMap<>();
-        AppListParam appListParam = new AppListParam();
-        appListParam.setUserId(userInfo.getUserId());
-        List<String> appIdList = null;
-        List<AgentAppView> agentAppViews = agentAppService.searchAppIdList(appListParam);
-        if (CollUtil.isNotEmpty(agentAppViews)){
-            appIdList = agentAppViews.stream().map(AgentAppView::getSuperiorId).collect(Collectors.toList());
-        }
+        List<String> appIdList = agentAppService.getApkIdList(userInfo.getUserId());
         processPeriodData(result, "today",
                 DateUtil.getTodayStart(),
                 DateUtil.getTodayEnd(),

yt-agent/agent-service/src/main/java/com/ytpm/dao/AgentAppMapper.java

@@ -31,4 +31,9 @@ public interface AgentAppMapper {
      * 查询加盟商上架应用列表
      */
     List<YtPlatformUserApp> getIssuedAppList(@Param("userId") String userId);
+
+    /**
+     * 查询代理商子包ID
+     */
+    List<String> getApkIdList(@Param("userId") String userId);
 }

yt-agent/agent-service/src/main/java/com/ytpm/service/AgentAppService.java

@@ -51,4 +51,9 @@ public interface AgentAppService {
      * 查询加盟商上架应用列表
      */
     ResultTable<YtPlatformUserApp> getIssuedAppList(String userId);
+
+    /**
+     * 查询代理商子包ID
+     */
+    List<String> getApkIdList(String userId);
 }

yt-agent/agent-service/src/main/java/com/ytpm/service/impl/AgentAppServiceImpl.java

@@ -207,4 +207,12 @@ public class AgentAppServiceImpl implements AgentAppService {
         return ResultTable.resultTableOk(new PageInfo<YtPlatformUserApp>(agentAppMapper.getIssuedAppList(userId)));
     }
 
+    /**
+     * 查询代理商子包ID
+     */
+    @Override
+    public List<String> getApkIdList(String userId) {
+        return agentAppMapper.getApkIdList(userId);
+    }
+
 }

yt-agent/agent-service/src/main/java/com/ytpm/service/impl/YtAppUserServiceImpl.java

@@ -1,22 +1,13 @@
 package com.ytpm.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ytpm.advertise.param.ComprehensiveReportParam;
-import com.ytpm.advertise.view.ComprehensiveAdSourceReport;
-import com.ytpm.advertise.view.ComprehensiveAppReport;
-import com.ytpm.advertise.view.ComprehensiveCommonView;
-import com.ytpm.advertise.view.ComprehensiveReportView;
-import com.ytpm.advertise.view.ReportAdSourceView;
 import com.ytpm.agent.model.YtApp;
 import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.app.model.YtAppUserLoginRecord;
 import com.ytpm.app.model.YtDyzAdRecord;
 import com.ytpm.app.model.YtDyzLoginRecord;
-import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.app.param.YtAppUserListParam;
 import com.ytpm.app.view.AppUserStaticsView;
 import com.ytpm.app.view.YtAppUserListView;
@@ -24,21 +15,14 @@ import com.ytpm.app.view.YtUserEcpmListView;
 import com.ytpm.dao.AgentStaticsMapper;
 import com.ytpm.dao.AppMapper;
 import com.ytpm.dao.AppUserLoginMapper;
-import com.ytpm.dao.AppUserMapper;
 import com.ytpm.dao.AppVideoWatchMapper;
 import com.ytpm.dao.AppWithdrawMapper;
-import com.ytpm.feign.AdvertiseFeign;
 import com.ytpm.feign.AppFeign;
-import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
 import com.ytpm.service.YtAppUserService;
-import com.ytpm.util.DateUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -65,8 +49,6 @@ public class YtAppUserServiceImpl implements YtAppUserService {
     private AgentStaticsMapper staticsMapper;
     @Resource
     private AppFeign appFeign;
-    @Value("${yt.platform.appId}")
-    private String APP_ID;
 
 
     /**

yt-agent/agent-service/src/main/resources/mapper/AgentAppMapper.xml

@@ -90,4 +90,10 @@
         from yt_platform_user_app
         where user_id = #{userId}
     </select>
+    <select id="getApkIdList" resultType="java.lang.String">
+        select
+            app_id
+        from yt_app
+        where user_id = #{userId}
+    </select>
 </mapper>

yt-app/app-service/src/main/java/com/ytpm/service/dyz/impl/AdServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ytpm.service.dyz.impl;
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.RandomUtil;
 import com.ytpm.advertise.enums.AdPlatformTypeEnum;
 import com.ytpm.advertise.enums.AdSourceTypeEnum;
 import com.ytpm.agent.enums.UserStatusEnum;
@@ -27,6 +28,8 @@ import com.ytpm.service.dyz.AdService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,6 +45,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.stream.Collectors;
 
 @Service
+@RefreshScope
 public class AdServiceImpl implements AdService {
 
     @Autowired
@@ -51,6 +55,8 @@ public class AdServiceImpl implements AdService {
     @Qualifier("com.ytpm.feign.RiskFeign")
     @Autowired
     private RiskFeign riskFeign;
+    @Value("${risk.config.banned.tips}")
+    private String tips;
 
     /**
      * 保存广告记录
@@ -63,7 +69,7 @@ public class AdServiceImpl implements AdService {
             return Result.resultOk(RepMessage.SAVE_SUCCESS);
         }
         if(!UserStatusEnum.NORMAL.getCode().equals(user.getUserStatus())){
-            return new Result<>(StatusCode.ACCESS_ERR,"当前用户处于风控中");
+            return new Result<>(StatusCode.ACCESS_ERR,getTipsMsg());
         }
         saveRecordAndChangeUser(param, user);
         //调用风控广告校验
@@ -76,6 +82,10 @@ public class AdServiceImpl implements AdService {
         return Result.resultOk(RepMessage.SAVE_SUCCESS);
     }
 
+    private String getTipsMsg(){
+        String[] split = tips.split(",");
+        return split[RandomUtil.randomInt(split.length)];
+    }
     /**
      * 根据应用查询广告数量
      */

yt-app/app-service/src/main/java/com/ytpm/service/dyz/impl/AppUserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ytpm.service.dyz.impl;
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzLoginRecord;
@@ -15,6 +16,8 @@ import com.ytpm.dao.dyz.QuestionMapper;
 import com.ytpm.handle.CustomerException;
 import com.ytpm.service.dyz.AppUserService;
 import com.ytpm.util.RedisService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +28,7 @@ import java.util.Date;
 import java.util.Objects;
 
 @Service
+@RefreshScope
 public class AppUserServiceImpl implements AppUserService {
 
     @Resource
@@ -35,6 +39,8 @@ public class AppUserServiceImpl implements AppUserService {
     private QuestionMapper questionMapper;
     @Resource
     private RedisService redisService;
+    @Value("${risk.config.banned.tips}")
+    private String tips;
 
     /**
      * openid查询用户信息
@@ -89,13 +95,17 @@ public class AppUserServiceImpl implements AppUserService {
         loginRecordMapper.insertOne(loginRecord);
     }
 
+    private String getTipsMsg(){
+        String[] split = tips.split(",");
+        return split[RandomUtil.randomInt(split.length)];
+    }
     /**
      * 处理用户数据
      */
     private void deadWithUserCrud(YtDyzUser old, WxUserInfo wxUserInfo, WxLoginParam param) {
         //处于风控状态的用户不允许登录
         if(!old.getUserStatus().equals(UserStatusEnum.NORMAL.getCode())){
-            throw new CustomerException("当前用户处于"+UserStatusEnum.getByCode(old.getUserStatus())+"中,无法登录");
+            throw new CustomerException(getTipsMsg());
         }
         YtDyzUser newUser = new YtDyzUser();
         newUser.setUserId(old.getUserId());

yt-middle/middle-platform/src/main/java/com/ytpm/middle/monitor/RedisKeyExpirationListener.java

@@ -14,6 +14,7 @@ import com.ytpm.middle.view.AppRankingListVO;
 import com.ytpm.middle.view.DashboardRankingListVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
@@ -26,6 +27,7 @@ import javax.annotation.Resource;
  */
 @Slf4j
 @Component
+@RefreshScope
 public class RedisKeyExpirationListener extends KeyExpirationEventMessageListener {
  
 

yt-middle/middle-platform/src/main/java/com/ytpm/middle/oss/OssProperties.java

@@ -2,6 +2,7 @@ package com.ytpm.middle.oss;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Component;
 
 /**
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Component;
  */
 @Data
 @Component
+@RefreshScope
 public class OssProperties {
     /**
      * 存储类的全称

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

@@ -21,6 +21,7 @@ import com.ytpm.util.IDUtil;
 import com.ytpm.util.RandomPasswordGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +31,7 @@ import java.util.Date;
 import java.util.Objects;
 
 @Service
+@RefreshScope
 @Slf4j(topic = "代理商业务")
 public class AgentServiceImpl implements AgentService {
 

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

@@ -27,6 +27,8 @@ import com.ytpm.middle.view.MiddleUserInfo;
 import com.ytpm.risk.model.YtRiskConfig;
 import com.ytpm.risk.model.YtRiskTemplate;
 import com.ytpm.risk.model.YtRiskTemplateConfig;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,16 +42,19 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
+@RefreshScope
 public class ApkServiceImpl implements ApkService {
 
     @Resource
     private ApkMapper apkMapper;
     @Resource
-    private AppMapper appMapper;
-    @Resource
     private RiskMapper riskMapper;
     @Resource
     private AppFeign appFeign;
+    @Value("${risk.config.initEcpm}")
+    private String initEcpm;
+    @Value("${risk.config.initRevenue}")
+    private String initRevenue;
 
     /**
      * 查询应用列表
@@ -103,7 +108,7 @@ public class ApkServiceImpl implements ApkService {
         riskMapper.insertConfigItem(config);
         configId = IdUtil.getSnowflakeNextIdStr();
         configIds.add(configId);
-        config = new YtRiskConfig(configId,agentId,"income","总收益为<0.21",1,"0.21",4);
+        config = new YtRiskConfig(configId,agentId,"income","总收益为<"+initRevenue,1,initRevenue,4);
         riskMapper.insertConfigItem(config);
         String templateId = IdUtil.getSnowflakeNextIdStr();
         YtRiskTemplateConfig templateConfig;
@@ -130,7 +135,7 @@ public class ApkServiceImpl implements ApkService {
         riskMapper.insertConfigItem(config);
         configId = IdUtil.getSnowflakeNextIdStr();
         configIds.add(configId);
-        config = new YtRiskConfig(configId,agentId,"ecpm","ecpm值为<35",1,"35",4);
+        config = new YtRiskConfig(configId,agentId,"ecpm","ecpm值为<"+initEcpm,1,initEcpm,4);
         riskMapper.insertConfigItem(config);
         String templateId = IdUtil.getSnowflakeNextIdStr();
         YtRiskTemplateConfig templateConfig;

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

@@ -19,6 +19,7 @@ import com.ytpm.middle.view.DashboardRevenueVO;
 import com.ytpm.middle.view.DashboardRiskVO;
 import com.ytpm.middle.view.DashboardTopCountVo;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -29,6 +30,7 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
+@RefreshScope
 public class CountServiceImpl implements CountService {
 
     @Resource

yt-middle/middle-platform/src/main/java/com/ytpm/middle/util/AliOSSUtil.java

@@ -21,6 +21,7 @@ import com.aliyun.oss.model.PutObjectRequest;
 import com.aliyun.oss.model.PutObjectResult;
 import com.aliyun.oss.model.UploadFileRequest;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -38,6 +39,7 @@ import java.util.Date;
 import java.util.List;
 
 @Component
+@RefreshScope
 public class AliOSSUtil {
 
     private static String endpoint;

yt-middle/middle-platform/src/main/java/com/ytpm/middle/util/TencentSmsUtil.java

@@ -11,10 +11,12 @@ import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
 import com.ytpm.general.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 
 
 @Service
+@RefreshScope
 @Slf4j(topic = "SmsUtil")
 public class TencentSmsUtil {
 

yt-risk/risk-manage/src/main/java/com/ytpm/service/impl/RiskServiceImpl.java

@@ -52,6 +52,7 @@ import com.ytpm.util.ReflectUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -78,6 +79,7 @@ import java.util.stream.Collectors;
 
 @Slf4j(topic = "风控服务")
 @Service
+@RefreshScope
 public class RiskServiceImpl extends ReflectUtil implements RiskService {
 
     @Value("${risk.banned.defaultLimit}")