Merge branch 'hotfix/refact' into 'master'

删除一些代码



See merge request !4

src/main/java/cn/quantgroup/user/enums/EducationEnum.java

@@ -21,10 +21,6 @@ public enum EducationEnum {
         this.name = name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/cn/quantgroup/user/enums/Gender.java

@@ -14,10 +14,6 @@ public enum Gender {
         this.name = name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/cn/quantgroup/user/enums/IdType.java

@@ -22,10 +22,6 @@ public enum IdType {
         this.name = name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/cn/quantgroup/user/enums/MaritalStatus.java

@@ -23,15 +23,10 @@ public enum MaritalStatus {
         return description;
     }
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("MaritalStatus{");
-        sb.append("description='").append(description).append('\'');
-        sb.append('}');
-        return sb.toString();
+        String sb = "MaritalStatus{" + "description='" + description + '\'' +
+                '}';
+        return sb;
     }
 }

src/main/java/cn/quantgroup/user/enums/OccupationEnum.java

@@ -23,10 +23,6 @@ public enum OccupationEnum {
         this.name = name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/cn/quantgroup/user/enums/Relation.java

@@ -25,15 +25,10 @@ public enum Relation {
         return description;
     }
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("Relation{");
-        sb.append("description='").append(description).append('\'');
-        sb.append('}');
-        return sb.toString();
+        String sb = "Relation{" + "description='" + description + '\'' +
+                '}';
+        return sb;
     }
 }

src/main/java/cn/quantgroup/xyqb/Bootstrap.java

@@ -28,13 +28,6 @@ public class Bootstrap {
 
     public static void main(String[] args) {
         SpringApplication springApplication = new SpringApplication(Bootstrap.class);
-        springApplication.addListeners(new ApplicationListener<ContextRefreshedEvent>() {
-            @Override
-            public void onApplicationEvent(ContextRefreshedEvent event) {
-                MotanSwitcherUtil.setSwitcherValue(MotanConstants.REGISTRY_HEARTBEAT_SWITCHER, true);
-                log.info("注册zookeeper成功");
-            }
-        });
         springApplication.run(args);
     }
 

src/main/java/cn/quantgroup/xyqb/aspect/logcaller/LogCallHttpAspect.java

 package cn.quantgroup.xyqb.aspect.logcaller;
 
-import cn.quantgroup.xyqb.util.ApplicationContextHolder;
 import cn.quantgroup.xyqb.util.IPUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -10,7 +9,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -29,7 +27,8 @@ public class LogCallHttpAspect {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LogCallHttpAspect.class);
 
-    @Pointcut("@annotation(cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller)")
+    @Pointcut(value = "execution(public * cn.quantgroup.xyqb.controller..*.*(..)) " +
+            "&& !execution(* cn.quantgroup.xyqb.controller.ExceptionHandlingController.*(..))")
     private void logHttpCaller() {
     }
 
@@ -41,9 +40,7 @@ public class LogCallHttpAspect {
             try {
                 HttpServletRequest request = attrs.getRequest();
                 String remoteIP = IPUtil.getRemoteIP(request);
-                LogCallHttpAspect logCallHttpAspect = ApplicationContextHolder.getBean(LogCallHttpAspect.class);
-                // 异步记录日志
-                logCallHttpAspect.asyncRecordIt(pjp, result, remoteIP);
+                this.asyncRecordIt(pjp, result, remoteIP);
             } catch (Exception e) {
                 LOGGER.error("打印http请求日志出错", e);
             }
@@ -58,12 +55,11 @@ public class LogCallHttpAspect {
      * @param result
      * @param remoteIP
      */
-    @Async("logExecutor")
-    public void asyncRecordIt(ProceedingJoinPoint pjp, Object result, String remoteIP) {
+    private void asyncRecordIt(ProceedingJoinPoint pjp, Object result, String remoteIP) {
         Object[] args = pjp.getArgs();
         String methodName = pjp.getSignature().getName();
         String targetName = pjp.getTarget().getClass().getName();
-        LOGGER.info("http api is called,from IP:[{}],method :[{}],args:[{}],response:[{}]", remoteIP, targetName.concat(".").concat(methodName), args, result);
+        LOGGER.info("http api is called,from IP:[{}],method :[{}],args:[{}]", remoteIP, targetName.concat(".").concat(methodName), args);
     }
 
 }

src/main/java/cn/quantgroup/xyqb/config/motan/MotanConfig.java

-package cn.quantgroup.xyqb.config.motan;
-
-import com.weibo.api.motan.config.springsupport.AnnotationBean;
-import com.weibo.api.motan.config.springsupport.BasicServiceConfigBean;
-import com.weibo.api.motan.config.springsupport.ProtocolConfigBean;
-import com.weibo.api.motan.config.springsupport.RegistryConfigBean;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Created by 11 on 2017/2/27.
- */
-@Configuration
-public class MotanConfig {
-
-    @Bean
-    public AnnotationBean motanAnnotationBean() {
-        AnnotationBean motanAnnotationBean = new AnnotationBean();
-        motanAnnotationBean.setPackage("cn.quantgroup.xyqb.controller.external.motan");
-        return motanAnnotationBean;
-    }
-
-    @Bean(name = "userMotan")
-    public ProtocolConfigBean protocolConfig1(
-            @Value("${protocol.isDefault}") Boolean isDefault, @Value("${protocol.name}") String name,
-            @Value("${protocol.contentLength}") int contentLength) {
-        ProtocolConfigBean config = new ProtocolConfigBean();
-        config.setDefault(isDefault);
-        config.setName(name);
-        config.setMaxContentLength(contentLength);
-        config.setMaxServerConnection(1000);
-        return config;
-    }
-
-
-    @Bean(name = "registryConfig")
-    public RegistryConfigBean registryConfig(@Value("${registry.protocol}") String registryProtocol,
-                                             @Value("${registry.address}") String registryAddress
-    ) {
-        RegistryConfigBean config = new RegistryConfigBean();
-        config.setRegProtocol(registryProtocol);
-        config.setAddress(registryAddress);
-        return config;
-    }
-
-    @Bean
-    public BasicServiceConfigBean baseServiceConfig(@Value("${motan.port}") int motanPort,
-                                                    @Value("${motan.user.group}") String userGroup,
-                                                    @Value("${motan.user.module}") String userModule,
-                                                    @Value("${motan.application:xyqbUserMotan}") String applicationName) {
-        BasicServiceConfigBean config = new BasicServiceConfigBean();
-        config.setExport("userMotan:" + motanPort);
-        config.setGroup(userGroup);
-        config.setVersion("1.0");
-        config.setAccessLog(true);
-        config.setShareChannel(true);
-        config.setModule(userModule);
-        config.setApplication(applicationName);
-        config.setRegistry("registryConfig");
-        return config;
-    }
-}

src/main/java/cn/quantgroup/xyqb/config/mq/LoanVestMQConfig.java

@@ -88,22 +88,4 @@ public class LoanVestMQConfig {
         template.setExchange(loanVestExchange);
         return template;
     }
-
-    //@Bean(name = "loanVestMsgQueue")
-    //public Queue loanStateMsgQueue() {
-    //    return new Queue(stateQueueName);
-    //}
-
-    //@Bean(name = "loanVestListenerContainer")
-    //public SimpleMessageListenerContainer loanVestSimpleMessageListenerContainer(@Qualifier("loanVestMQService") IVestService vestService, @Qualifier("vestFactory") ConnectionFactory vestFactory, @Qualifier("loanVestMsgQueue")Queue loanVestMsgQueue) {
-    //    SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
-    //    container.setConnectionFactory(vestFactory);
-    //    container.setQueues(loanVestMsgQueue);
-    //    container.setAcknowledgeMode(AcknowledgeMode.NONE);
-    //    container.setMessageListener(new MessageListenerAdapter(vestService));
-    //    container.start();
-    //    return container;
-    //
-    //}
-
 }

src/main/java/cn/quantgroup/xyqb/config/thread/AsyncConfig.java

-package cn.quantgroup.xyqb.config.thread;
-
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-import java.util.concurrent.Executor;
-
-
-/**
- * Created by xuran on 2017/11/8.
- */
-@Configuration
-@EnableAsync
-public class AsyncConfig {
-
-    /**
-     * 生成线程池
-     *
-     * @param corePoolSize
-     * @param maxPoolSize
-     * @param queueCapacity
-     * @param waitForCompleteOnShutdown
-     * @param prefix
-     * @return
-     */
-    private ThreadPoolTaskExecutor generateThreadPoolTaskExecutor(int corePoolSize, int maxPoolSize, int queueCapacity,
-                                                                  boolean waitForCompleteOnShutdown, int keepAliveSeconds,
-                                                                  boolean allowCoreThreadTimeOut, String prefix) {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(corePoolSize);
-        executor.setMaxPoolSize(maxPoolSize);
-        executor.setQueueCapacity(queueCapacity);
-        executor.setKeepAliveSeconds(keepAliveSeconds);
-        executor.setAllowCoreThreadTimeOut(allowCoreThreadTimeOut);
-        executor.setWaitForTasksToCompleteOnShutdown(waitForCompleteOnShutdown);
-        executor.setThreadNamePrefix(prefix);
-        executor.initialize();
-        return executor;
-    }
-
-    /**
-     * 日志线程池
-     *
-     * @return
-     */
-    @Bean(name = "logExecutor")
-    public Executor loanMqExecutor() {
-        return generateThreadPoolTaskExecutor(100, 2000, 2000, true, 30, true, "loanMqExecutor-");
-    }
-}

src/main/java/cn/quantgroup/xyqb/controller/external/captcha/NewCaptchaController.java

@@ -37,7 +37,7 @@ public class NewCaptchaController {
     @Value("${geetest.close:false}")
     private String geetestClose;
 
-    @LogHttpCaller
+
     @RequestMapping(value = "/captcha/new")
     public JsonResult getCaptcha(String phoneNo, String clientType, HttpServletRequest request) {
         String remoteIp = IPUtil.getRemoteIP(request);

src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java

@@ -48,7 +48,6 @@ import static cn.quantgroup.xyqb.constant.UserConstant.USER_ERROR_OR_PASSWORD_ER
  * Created by 11 on 2017/2/27.
  */
 @Slf4j
-@MotanService(basicService = "baseServiceConfig")
 public class MotanUserServiceImpl implements UserMotanService {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();

src/main/java/cn/quantgroup/xyqb/controller/external/queryLog/UserQueryLogController.java

@@ -471,7 +471,7 @@ public class UserQueryLogController {
         // 第二步，在webbook中添加一个sheet,对应Excel文件中的sheet
         HSSFSheet sheet = wb.createSheet("用户信息列表");
         // 第三步，在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制short
-        HSSFRow row = sheet.createRow((int) 0);
+        HSSFRow row = sheet.createRow(0);
         // 第四步，创建单元格，并设置值表头 设置表头居中
         HSSFCellStyle style = wb.createCellStyle();
         style.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 创建一个居中格式
@@ -499,7 +499,7 @@ public class UserQueryLogController {
         //List list = CreateSimpleExcelToDisk.getStudent();
 
         for (int i = 0; i < uqls.size(); i++) {
-            row = sheet.createRow((int) i + 1);
+            row = sheet.createRow(i + 1);
             UserQueryInfo user = uqls.get(i);
             // 第四步，创建单元格，并设置值
             if (user != null && row != null) {

src/main/java/cn/quantgroup/xyqb/controller/external/user/AppController.java

@@ -61,7 +61,7 @@ public class AppController implements IBaseController {
      * @param request
      * @return Token和phoneNo
      */
-    @LogHttpCaller
+
     @IpValidator
     @RequestMapping("/login")
     public JsonResult login(
@@ -119,7 +119,7 @@ public class AppController implements IBaseController {
      * @param request
      * @return 用户信息
      */
-    @LogHttpCaller
+
     @IpValidator
     @RequestMapping("/login_super")
     public JsonResult loginSuper(
@@ -186,7 +186,7 @@ public class AppController implements IBaseController {
      * @param request
      * @return Token和phoneNo
      */
-    @LogHttpCaller
+
     @IpValidator
     @RequestMapping("/login2")
     public JsonResult login2(

src/main/java/cn/quantgroup/xyqb/controller/external/user/UserApiController.java

@@ -83,7 +83,7 @@ public class UserApiController {
      * @return
      */
     @ApiOperation(notes = "检查token是否有效，如果有效，可选择是否延续生命期（延续后有效期24Hour）", value = "Check token and then prolong session", nickname = "checkToken")
-    @LogHttpCaller
+
     @IpValidator
     @RequestMapping(value = "/valid/{token}", method = RequestMethod.POST)
     public JsonResult checkToken(@ApiParam(value = "sid,session的id", required = true) @PathVariable("token") String token,

src/main/java/cn/quantgroup/xyqb/controller/internal/login/AuthInfoController.java

@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 public class AuthInfoController implements IBaseController {
 
 
-    @LogHttpCaller
+
     @RequestMapping("/info/login")
     public JsonResult loginInfo(HttpServletRequest request) {
         SessionStruct sessionStruct = getCurrentSessionFromRedis();

src/main/java/cn/quantgroup/xyqb/controller/internal/sms/SmsController.java

@@ -213,7 +213,7 @@ public class SmsController implements IBaseController {
 
     private JsonResult sendVerificationCode2Voice(String phoneNo, String usage) {
         String verificationCountKey = Constants.REDIS_VOICE_CODE_COUNT + phoneNo;
-        Long getVerificationCount = redisTemplate.opsForHash().increment(verificationCountKey, usage.toString(), 1);
+        Long getVerificationCount = redisTemplate.opsForHash().increment(verificationCountKey, usage, 1);
         redisTemplate.expire(verificationCountKey, DateUtils.getSeconds(), TimeUnit.SECONDS);
         if (getVerificationCount > 5) {
             return JsonResult.buildErrorStateResult("今天已获取5次语音验证码，请使用短信验证码或明天再试", null);

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserAuthorizedController.java

@@ -24,7 +24,7 @@ public class UserAuthorizedController {
     @Resource
     private IUserAuthorizedService userAuthorizedService;
 
-    @LogHttpCaller
+
     @RequestMapping(value = "/hasUserAuthorized")
     public JsonResult hasUserAuthorized(String idNo) {
         LOGGER.info("[hasUserAuthorized]需要校验的用户的身份证号为idNo:{}", idNo);
@@ -35,7 +35,7 @@ public class UserAuthorizedController {
         }
     }
 
-    @LogHttpCaller
+
     @RequestMapping(value = "/createUserAuthorized")
     public JsonResult createUserAuthorized(UserAuthorizedParam userAuthorizedParam) {
         LOGGER.info("[createUserAuthorized]创建实名账户,userAuthorizedParam:{},", userAuthorizedParam);
@@ -55,7 +55,7 @@ public class UserAuthorizedController {
         }
     }
 
-    @LogHttpCaller
+
     @RequestMapping(value = "/getUserAuthorizedId")
     public JsonResult getUserAuthorizedId(String userUuid) {
         LOGGER.info("[getUserAuthorizedId]获取实名账户的id，userUuid:{}", userUuid);

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -113,7 +113,7 @@ public class UserController implements IBaseController {
         return login(channelId, appChannel, createdFrom, userId, key, dimension, request);
     }
 
-    @LogHttpCaller
+
     @PasswordErrorFiniteValidator
     @RequestMapping("/login")
     public JsonResult login(
@@ -328,7 +328,7 @@ public class UserController implements IBaseController {
      * @param verificationCode
      * @return
      */
-    @LogHttpCaller
+
     @RequestMapping("/reset_password")
     public JsonResult resetPassword(@RequestParam String phoneNo,
                                     @RequestParam String password,
@@ -364,7 +364,7 @@ public class UserController implements IBaseController {
      * @param token - sid,session的id
      * @return
      */
-    @LogHttpCaller
+
     @RequestMapping("/exists_token")
     public JsonResult checkToken(@RequestParam String token) {
         if (StringUtils.isEmpty(token)) {

src/main/java/cn/quantgroup/xyqb/entity/enumerate/MaritalStatus.java

@@ -29,9 +29,8 @@ public enum MaritalStatus {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("MaritalStatus{");
-        sb.append("description='").append(description).append('\'');
-        sb.append('}');
-        return sb.toString();
+        String sb = "MaritalStatus{" + "description='" + description + '\'' +
+                '}';
+        return sb;
     }
 }

src/main/java/cn/quantgroup/xyqb/entity/enumerate/OccupationEnum.java

@@ -27,10 +27,6 @@ public enum OccupationEnum {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     @Override
     public String toString() {
         return name;

src/main/java/cn/quantgroup/xyqb/entity/enumerate/Relation.java

@@ -25,15 +25,10 @@ public enum Relation {
         return description;
     }
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("Relation{");
-        sb.append("description='").append(description).append('\'');
-        sb.append('}');
-        return sb.toString();
+        String sb = "Relation{" + "description='" + description + '\'' +
+                '}';
+        return sb;
     }
 }

src/main/java/cn/quantgroup/xyqb/service/captcha/GeetestLib.java

@@ -429,13 +429,13 @@ public class GeetestLib {
      * @time 2014年7月10日 下午3:30:01
      */
     private String md5Encode(String plainText) {
-        String re_md5 = new String();
+        String re_md5 = "";
         try {
             MessageDigest md = MessageDigest.getInstance("MD5");
             md.update(plainText.getBytes());
             byte b[] = md.digest();
             int i;
-            StringBuilder buf = new StringBuilder("");
+            StringBuilder buf = new StringBuilder();
             for (int offset = 0; offset < b.length; offset++) {
                 i = b[offset];
                 if (i < 0) {

src/main/java/cn/quantgroup/xyqb/service/http/impl/HttpServiceImpl.java

@@ -3,7 +3,6 @@ package cn.quantgroup.xyqb.service.http.impl;
 import cn.quantgroup.tech.brave.service.ITechHttpClient;
 import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.util.Utils;
-import com.google.common.base.Predicates;
 import com.google.common.collect.Maps;
 import org.apache.commons.codec.Charsets;
 import org.apache.commons.collections.MapUtils;
@@ -29,7 +28,6 @@ import org.apache.http.conn.ssl.SSLContextBuilder;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieOrigin;
 import org.apache.http.cookie.CookieSpecProvider;
-import org.apache.http.cookie.MalformedCookieException;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy;
 import org.apache.http.impl.client.StandardHttpRequestRetryHandler;
@@ -211,7 +209,7 @@ public class HttpServiceImpl implements IHttpService {
      */
     private void setParameter(RequestBuilder requestBuilder, Map<String, String> parameters, String method) {
         if (MapUtils.isNotEmpty(parameters)) {
-            parameters = Maps.filterValues(parameters, Predicates.notNull());
+            parameters = Maps.filterValues(parameters, s -> s != null);
 
             Set<Map.Entry<String, String>> entrys = parameters.entrySet();
             /************** Get 请求 **************/
@@ -244,7 +242,7 @@ public class HttpServiceImpl implements IHttpService {
                 .setHeader("Connection", "keep-alive");
 
         if (MapUtils.isNotEmpty(headers)) {
-            headers = Maps.filterValues(headers, Predicates.notNull());
+            headers = Maps.filterValues(headers, s -> s != null);
 
             Set<Map.Entry<String, String>> entrys = headers.entrySet();
             for (Map.Entry<String, String> entry : entrys) {

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserDetailServiceImpl.java

@@ -118,21 +118,18 @@ public class UserDetailServiceImpl implements IUserDetailService {
 
     private Specification<UserDetail> getSpecification(String name, String phoneNo, String idNo) {
         List<Predicate> list = new ArrayList<>();
-        Specification<UserDetail> specification = new Specification<UserDetail>() {
-            @Override
-            public Predicate toPredicate(Root<UserDetail> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
-                if (!StringUtils.isEmpty(name)) {
-                    list.add(criteriaBuilder.equal(root.get("name").as(String.class), name));
-                }
-                if (!StringUtils.isEmpty(phoneNo)) {
-                    list.add(criteriaBuilder.equal(root.get(Constants.PHONE_NO).as(String.class), phoneNo));
-                }
-                if (!StringUtils.isEmpty(idNo)) {
-                    list.add(criteriaBuilder.equal(root.get("idNo").as(String.class), idNo));
-                }
-                Predicate[] p = new Predicate[list.size()];
-                return criteriaBuilder.and(list.toArray(p));
+        Specification<UserDetail> specification = (root, criteriaQuery, criteriaBuilder) -> {
+            if (!StringUtils.isEmpty(name)) {
+                list.add(criteriaBuilder.equal(root.get("name").as(String.class), name));
+            }
+            if (!StringUtils.isEmpty(phoneNo)) {
+                list.add(criteriaBuilder.equal(root.get(Constants.PHONE_NO).as(String.class), phoneNo));
+            }
+            if (!StringUtils.isEmpty(idNo)) {
+                list.add(criteriaBuilder.equal(root.get("idNo").as(String.class), idNo));
             }
+            Predicate[] p = new Predicate[list.size()];
+            return criteriaBuilder.and(list.toArray(p));
         };
         return specification;
     }
@@ -148,24 +145,21 @@ public class UserDetailServiceImpl implements IUserDetailService {
 
     private Specification<UserDetail> valueInSpecification(List<Long> userId, List<String> phoneNo, List<String> idNo) {
         List<Predicate> list = new ArrayList<>();
-        Specification<UserDetail> specification = new Specification<UserDetail>() {
-            @Override
-            public Predicate toPredicate(Root<UserDetail> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
-                if (userId != null && userId.size() > 0) {
-                    criteriaQuery.where(root.get("userId").in(userId));
-                    list.add(criteriaQuery.getRestriction());
-                }
-                if (phoneNo != null && phoneNo.size() > 0) {
-                    criteriaQuery.where(root.get(Constants.PHONE_NO).in(phoneNo));
-                    list.add(criteriaQuery.getRestriction());
-                }
-                if (idNo != null && idNo.size() > 0) {
-                    criteriaQuery.where(root.get("idNo").in(idNo));
-                    list.add(criteriaQuery.getRestriction());
-                }
-                Predicate[] p = new Predicate[list.size()];
-                return criteriaBuilder.and(list.toArray(p));
+        Specification<UserDetail> specification = (root, criteriaQuery, criteriaBuilder) -> {
+            if (userId != null && userId.size() > 0) {
+                criteriaQuery.where(root.get("userId").in(userId));
+                list.add(criteriaQuery.getRestriction());
+            }
+            if (phoneNo != null && phoneNo.size() > 0) {
+                criteriaQuery.where(root.get(Constants.PHONE_NO).in(phoneNo));
+                list.add(criteriaQuery.getRestriction());
+            }
+            if (idNo != null && idNo.size() > 0) {
+                criteriaQuery.where(root.get("idNo").in(idNo));
+                list.add(criteriaQuery.getRestriction());
             }
+            Predicate[] p = new Predicate[list.size()];
+            return criteriaBuilder.and(list.toArray(p));
         };
         return specification;
     }

src/main/java/cn/quantgroup/xyqb/util/ValidationUtil.java

@@ -133,9 +133,7 @@ public class ValidationUtil {
     public static String getMd5Key(boolean lock) {
         Calendar today = Calendar.getInstance();
         int hour_24 = today.get(Calendar.HOUR_OF_DAY);
-        StringBuilder _key = new StringBuilder();
-        _key.append(Constants.CLEAR_LOCK_FOR_IPV4_KEY).append(lock).append(hour_24);
-        return MD5Util.build(_key.toString());
+        return MD5Util.build(Constants.CLEAR_LOCK_FOR_IPV4_KEY + lock + hour_24);
     }
 
 }