Merge branch 'master-modify-background-bug-hf' into dev

xx-universal/xx-universal-server/pom.xml

@@ -99,6 +99,12 @@
             <version>0.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.xxfc.platform</groupId>
+            <artifactId>xx-app-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java

@@ -9,6 +9,8 @@ import com.github.wxiaoqi.security.common.constant.RestCode;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.app.entity.Cofig;
+import com.xxfc.platform.app.feign.ConfigFeign;
 import com.xxfc.platform.universal.biz.UserMessage;
 import com.xxfc.platform.universal.entity.IDCardInformation;
 import com.xxfc.platform.universal.entity.IdInformation;
@@ -17,6 +19,8 @@ import com.xxfc.platform.universal.service.PictureParsing.UserPictureParsing;
 import com.xxfc.platform.universal.service.authenticationInterface.UserAuthentication;
 import com.xxfc.platform.universal.utils.CertifHttpUtils;
 import com.xxfc.platform.universal.utils.Validation;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.map.HashedMap;
@@ -46,16 +50,22 @@ import java.util.*;
  */
 @Service
 @Slf4j
+@AllArgsConstructor
+@NoArgsConstructor
 public class CertificationService {
+
     @Value("${certification.frequency:2}")
     private Integer FREQUENCY;
+
+    @Autowired
+    private ConfigFeign configFeign;
+
     @Autowired
     private UserAuthentication authentication;
 
     @Autowired
     private IdInformationMapper idInformationMapper;
 
-
     @Autowired
     private UserFeign userFeign;
 
@@ -65,6 +75,9 @@ public class CertificationService {
     @Autowired
     private UserPictureParsing userPictureParsing;
 
+
+    private String AUTHENTICATION_TYPE="100";
+
     /**
      * 一、身份证图片进行实名认证
      *
@@ -112,7 +125,8 @@ public class CertificationService {
         Example exa = new Example(IdInformation.class);
         exa.createCriteria().andEqualTo("idNumber", number);
         List<IdInformation> idInformatics = idInformationMapper.selectByExample(exa);
-        if (CollectionUtils.isNotEmpty(idInformatics) && idInformatics.size() > FREQUENCY) {
+
+        if (CollectionUtils.isNotEmpty(idInformatics) && idInformatics.size() >getCofig() ) {
             log.error("该身份证已超过最大认证次数");
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "该身份证已超过最大认证次数");
         }
@@ -163,6 +177,25 @@ public class CertificationService {
 
     }
 
+    /**
+     * 获取认证次数
+     * @return
+     */
+    public Integer getCofig() {
+        List<Cofig> cofigs = null;
+        try {
+            cofigs = configFeign.getAllByType(AUTHENTICATION_TYPE).getData();
+            log.info("cofigs={}",cofigs);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+        }
+        if (CollectionUtils.isEmpty(cofigs)) {
+            return  FREQUENCY;
+        }
+        return Integer.valueOf(cofigs.get(0).getParams());
+    }
+
     /**
      * 二、认证通过保存到数据库当中
      *