fix:修复新风控规则格式化文本更新问题;

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

@@ -345,7 +345,7 @@ public class RiskServiceImpl implements RiskService {
             }
             String oldValue = valueMap.get(listParam.getConfigId());
             if (!StrUtil.emptyIfNull(oldValue).equals(StrUtil.emptyIfNull(listParam.getConfigVal()))) {
-                YtRiskTemplateLog log = new  YtRiskTemplateLog();;
+                YtRiskTemplateLog log = new YtRiskTemplateLog();;
                 log.setTemplateId(old.getTemplateId());
                 log.setTemplateCode(old.getTemplateCode());
                 log.setConfigId(listParam.getConfigId());
@@ -363,7 +363,9 @@ public class RiskServiceImpl implements RiskService {
         template.setUpdateTime(new Date());
         template.setUpdateUserId(param.getChannelId());
         riskMapper.updateByTempId(template);
-        riskMapper.addRiskTemplateLog(logs);
+        if (CollUtil.isNotEmpty(logs)) {
+            riskMapper.addRiskTemplateLog(logs);
+        }
         return Result.resultOk(RepMessage.MODIFY_SUCCESS);
     }
 

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

@@ -11,6 +11,7 @@ import java.math.BigDecimal;
 
 /**
  * 默认的风控配置
+ * 前端配置项解析适配
  */
 @Data
 @ApiModel("默认风控配置")
@@ -91,5 +92,20 @@ public class DefaultRiskConfig {
     @ApiModelProperty("获得奖励的激励视频个数")
     private Integer hourTaskLimit;
 
+    @CustomField(desc = "?小时内", node = 2)
+    @ApiModelProperty("?小时内")
+    private Integer limitHour;
+
+    @CustomField(desc = "仅?个账号登陆", node = 2)
+    @ApiModelProperty("仅?个账号登陆")
+    private Integer limitCount;
+
+    @CustomField(desc = "?地区", node = 2)
+    @ApiModelProperty("?地区")
+    private String limitCity;
+
+    @CustomField(desc = "登陆用户不多于?个", node = 2)
+    @ApiModelProperty("登陆用户不多于?个")
+    private Integer limitCityCount;
 
 }

yt-middle/middle-platform/src/main/java/com/ytpm/middle/handle/DynamicFeignClientFactory.java

@@ -44,7 +44,7 @@ public class DynamicFeignClientFactory {
                 }
                 String url = instance.getUri().toString();
                 log.info("为服务{}构建FeignClient,目标地址为：{}", serviceName, url);
-                feignBuilder.requestInterceptor(globalFeignInterceptor).target(clazz, url);
+                return feignBuilder.requestInterceptor(globalFeignInterceptor).target(clazz, url);
             } catch (Exception e) {
                 lastException = e;
                 log.warn("第 {} 次尝试获取FeignClient失败，服务名：{}，错误信息：{}", retryCount + 1, serviceName, e.getMessage());

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

@@ -359,7 +359,7 @@ public class ApkServiceImpl implements ApkService {
         riskConfig = createRiskConfig(agentId, "limitCity",
                 StrUtil.format("{}地区", init335LimitCity), init335LimitCity, 2);
         configs.add(riskConfig);
-        riskConfig = createRiskConfig(agentId, "limitCount",
+        riskConfig = createRiskConfig(agentId, "limitCityCount",
                 StrUtil.format("登陆用户不多于{}", init335LimitUserCount), init335LimitUserCount, 2);
         configs.add(riskConfig);
         String templateId = IdUtil.getSnowflakeNextIdStr();

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

@@ -520,7 +520,7 @@ public class RiskServiceImpl implements RiskService {
         Map<String, String> configMap = configList.stream().collect(
                 Collectors.toMap(RiskConfigView::getFieldName, RiskConfigView::getConfigVal));
         int limitHour = Integer.parseInt(configMap.get("limitHour"));
-        int limitCount = Integer.parseInt(configMap.get("limitCount"));
+        int limitCount = Integer.parseInt(configMap.get("limitCityCount"));
         String limitCity = configMap.get("limitCity");
         if (StringUtils.isEmpty(limitCity)) {
             return;
@@ -535,7 +535,7 @@ public class RiskServiceImpl implements RiskService {
             return;
         }
         if (redisService.hasKey(passkey) && limitCount <= cityUserCount) {
-            log.warn(StrUtil.format("[risk 335] superiorId:{} appId:{} userId:{} limitCount:{}",
+            log.warn(StrUtil.format("[risk 335] superiorId:{} appId:{} userId:{} limitCityCount:{}",
                     userApp.getAppId(), dyzUser.getAppId(), dyzUser.getUserId(), limitCount));
             String errorMsg = RepMessage.RISK_IP_LIMIT_VALUE;
             if (StrUtil.isNotEmpty(iosIpLimitTip)) {