统一Slf4j

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

@@ -33,7 +33,6 @@ public interface Constants {
     int THOUSAND_SECOND = 1000;
     int MILLIS_PER_SECOND = 1000;
     int MILLIS_OF_TEN_SECOND = 10000;
-    int HTTP_CODE_200 = 200;
     int PAGE_SIZE_MAX = 200;
     int PAGE_SIZE_DEFAULT = 30;
     int DAY_NO_MAX = 31;

src/main/java/cn/quantgroup/xyqb/aspect/accessable/IpValidateAdvisor.java

@@ -2,6 +2,7 @@ package cn.quantgroup.xyqb.aspect.accessable;
 
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.util.IpUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -20,10 +21,10 @@ import javax.servlet.http.HttpServletRequest;
  * @author renwc
  * @date 2017-12-01
  */
+@Slf4j
 @Aspect
 @Component
 public class IpValidateAdvisor {
-    private static final Logger LOGGER = LoggerFactory.getLogger(IpValidateAdvisor.class);
 
     @Pointcut("execution(public * cn.quantgroup.xyqb.controller.internal..*.*Controller.*(..)) " +
             " || execution(public * cn.quantgroup.xyqb.controller.dust..*.*Controller.*(..)) " +
@@ -40,8 +41,8 @@ public class IpValidateAdvisor {
         if (IpUtil.whiteOf(clientIp)) {
             return pjp.proceed();
         }
-        IpUtil.logIp(LOGGER, request);
-        LOGGER.error("Lock_ipv4: don't match white ip access:{}", clientIp);
+        IpUtil.logIp(log, request);
+        log.error("Lock_ipv4: don't match white ip access:{}", clientIp);
         return JsonResult.buildErrorStateResult("非法访问", null);
     }
 }

src/main/java/cn/quantgroup/xyqb/aspect/captcha/CaptchaFiniteValidateAdvisor.java

@@ -7,6 +7,7 @@ import cn.quantgroup.xyqb.thirdparty.jcaptcha.AbstractManageableImageCaptchaServ
 import cn.quantgroup.xyqb.util.IpUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import com.octo.captcha.service.CaptchaServiceException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -37,11 +38,11 @@ import java.util.UUID;
  * @version 1.0.0
  * @since 2017-11-07
  */
+@Slf4j
 @Aspect
 @Component
 public class CaptchaFiniteValidateAdvisor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CaptchaFiniteValidateAdvisor.class);
     private static final String SUPER_CAPTCHA_ID = UUID.nameUUIDFromBytes("__QG_APPCLIENT_AGENT__".getBytes(Charset.forName("UTF-8"))).toString();
     private static final String SUPER_CAPTCHA = "__SUPERQG__";
 
@@ -84,7 +85,7 @@ public class CaptchaFiniteValidateAdvisor {
         String phoneNo = phonePasswordMap.get(Constants.PHONE_NO);
         Long countErrorByPhone = getCount(phoneNo);
         if (countErrorByPhone == null) {
-            LOGGER.info("用户名或密码不正确, phoneNo={}, countErrorByPhone={}, clientIp={}", phoneNo, countErrorByPhone, IpUtil.getRemoteIP(request));
+            log.info("用户名或密码不正确, phoneNo={}, countErrorByPhone={}, clientIp={}", phoneNo, countErrorByPhone, IpUtil.getRemoteIP(request));
             return JsonResult.buildErrorStateResult("用户名或密码不正确", null);
         }
         if (countErrorByPhone > Constants.Image_Need_Count) {
@@ -92,7 +93,7 @@ public class CaptchaFiniteValidateAdvisor {
             String captchaId = Optional.ofNullable(request.getParameter(Constants.QG_CAPTCHA_ID)).orElse("");
             String captchaValue = request.getParameter(Constants.QG_CAPTCHA_VALUE);
             if (shouldSkipCaptchaValidate(registerFrom, captchaId, captchaValue)) {
-                LOGGER.info("使用超级图形验证码校验, registerFrom={}, clientIp={}", registerFrom, IpUtil.getRemoteIP(request));
+                log.info("使用超级图形验证码校验, registerFrom={}, clientIp={}", registerFrom, IpUtil.getRemoteIP(request));
                 return pjp.proceed();
             }
             if (StringUtils.isNotBlank(captchaValue)) {
@@ -103,7 +104,7 @@ public class CaptchaFiniteValidateAdvisor {
                 try {
                     validCaptcha = imageCaptchaService.validateResponseForID(Constants.IMAGE_CAPTCHA_KEY + captchaId, captcha);
                 } catch (CaptchaServiceException ex) {
-                    LOGGER.error("验证码校验异常, {}, {}", ex.getMessage(), ex);
+                    log.error("验证码校验异常, {}, {}", ex.getMessage(), ex);
                 }
                 if (validCaptcha) {
                     return pjp.proceed();
@@ -152,7 +153,7 @@ public class CaptchaFiniteValidateAdvisor {
     private Map<String, String> getHeaderParam(HttpServletRequest request) {
         String credential = request.getHeader("authorization");
         if (StringUtils.isBlank(credential) || !credential.startsWith(Constants.PASSWORD_HEADER)) {
-            LOGGER.info("参数无效, credential:{}", credential);
+            log.info("参数无效, credential:{}", credential);
             return null;
         }
         credential = credential.substring(Constants.PASSWORD_HEADER.length());
@@ -161,7 +162,7 @@ public class CaptchaFiniteValidateAdvisor {
         String[] credentialArr = credential.split(":");
         boolean headerParamValid = credentialArr.length == 2;
         if (!headerParamValid) {
-            LOGGER.info("参数无效, credential:{}", credential);
+            log.info("参数无效, credential:{}", credential);
             return null;
         }
         // 当前用户手机号和密码
@@ -169,10 +170,10 @@ public class CaptchaFiniteValidateAdvisor {
         String password = credentialArr[1];
         headerParamValid = headerParamValid && ValidationUtil.validatePhoneNo(phoneNo) && StringUtils.isNotBlank(password);
         if (!headerParamValid) {
-            LOGGER.info("参数无效, credential:{}, phoneNo:{}, password:{}", credential, phoneNo, password);
+            log.info("参数无效, credential:{}, phoneNo:{}, password:{}", credential, phoneNo, password);
             return null;
         }
-        LOGGER.info("账密登录, phoneNo:{}", phoneNo);
+        log.info("账密登录, phoneNo:{}", phoneNo);
         Map<String, String> phonePasswordMap = new HashMap<>(2);
         phonePasswordMap.put(Constants.PHONE_NO, phoneNo);
         phonePasswordMap.put("password", password);

src/main/java/cn/quantgroup/xyqb/aspect/captcha/CaptchaValidateAdvisor.java

@@ -5,6 +5,7 @@ import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.thirdparty.jcaptcha.AbstractManageableImageCaptchaService;
 import cn.quantgroup.xyqb.util.IpUtil;
 import com.octo.captcha.service.CaptchaServiceException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -36,11 +37,11 @@ import java.util.UUID;
  * 修改时间：15/11/17 14:49
  * 修改备注：
  */
+@Slf4j
 @Aspect
 @Component
 public class CaptchaValidateAdvisor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CaptchaValidateAdvisor.class);
     private static final String SUPER_CAPTCHA_ID = UUID.nameUUIDFromBytes("__QG_APPCLIENT_AGENT__".getBytes(Charset.forName("UTF-8"))).toString();
     private static final String SUPER_CAPTCHA = "__SUPERQG__";
 
@@ -79,7 +80,7 @@ public class CaptchaValidateAdvisor {
         String captchaId = Optional.ofNullable(request.getParameter(Constants.QG_CAPTCHA_ID)).orElse("");
         String captchaValue = request.getParameter(Constants.QG_CAPTCHA_VALUE);
         if (shouldSkipCaptchaValidate(registerFrom, captchaId, captchaValue)) {
-            LOGGER.info("使用超级图形验证码校验, registerFrom={}, clientIp={}", registerFrom, IpUtil.getRemoteIP(request));
+            log.info("使用超级图形验证码校验, registerFrom={}, clientIp={}", registerFrom, IpUtil.getRemoteIP(request));
             return pjp.proceed();
         }
         JsonResult result = JsonResult.buildSuccessResult("验证码不正确", "");
@@ -92,7 +93,7 @@ public class CaptchaValidateAdvisor {
             try {
                 validCaptcha = imageCaptchaService.validateResponseForID(Constants.IMAGE_CAPTCHA_KEY + captchaId, captcha);
             } catch (CaptchaServiceException ex) {
-                LOGGER.error("验证码校验异常, {}, {}", ex.getMessage(), ex);
+                log.error("验证码校验异常, {}, {}", ex.getMessage(), ex);
             }
             if (validCaptcha) {
                 return pjp.proceed();

src/main/java/cn/quantgroup/xyqb/aspect/lock/PasswordErrorFiniteValidateAdvisor.java

@@ -4,6 +4,7 @@ package cn.quantgroup.xyqb.aspect.lock;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.util.IpUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -28,12 +29,11 @@ import java.util.Objects;
  * @version 1.0.0
  * @since 2017-11-23
  */
+@Slf4j
 @Aspect
 @Component
 public class PasswordErrorFiniteValidateAdvisor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PasswordErrorFiniteValidateAdvisor.class);
-
     @Autowired
     @Qualifier("stringRedisTemplate")
     private RedisTemplate<String, String> redisTemplate;
@@ -71,15 +71,15 @@ public class PasswordErrorFiniteValidateAdvisor {
         }
         // 黑名单
         if (redisTemplate.opsForSet().isMember(Constants.IPV4_LOCK_BLACK, clientIp)) {
-            IpUtil.logIp(LOGGER, request);
-            LOGGER.info("Lock_ipv4: black ip access:{}", clientIp);
+            IpUtil.logIp(log, request);
+            log.info("Lock_ipv4: black ip access:{}", clientIp);
             return JsonResult.buildErrorStateResult("登录失败", null);
         }
         String lockIpv4Key = getLockIpv4Key(clientIp);
         String lock = redisTemplate.opsForValue().get(lockIpv4Key);
         if (Objects.equals(Boolean.TRUE.toString(), lock)) {
-            IpUtil.logIp(LOGGER, request);
-            LOGGER.info("Lock_ipv4: locked ip access:{}", clientIp);
+            IpUtil.logIp(log, request);
+            log.info("Lock_ipv4: locked ip access:{}", clientIp);
             return JsonResult.buildErrorStateResult("登录失败", null);
         }
         return pjp.proceed();

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

@@ -2,6 +2,7 @@ package cn.quantgroup.xyqb.aspect.logcaller;
 
 import cn.quantgroup.xyqb.util.IpUtil;
 import com.google.common.base.Stopwatch;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -21,13 +22,12 @@ import java.util.concurrent.TimeUnit;
  * 调用者记录
  * Created by Administrator on 2017/5/15.
  */
+@Slf4j
 @Aspect
 @Component
 @Order(value = Ordered.HIGHEST_PRECEDENCE)
 public class LogCallHttpAspect {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LogCallHttpAspect.class);
-
     @Pointcut(value = "execution(public * cn.quantgroup.xyqb.controller..*.*(..)) " +
             "&& !execution(* cn.quantgroup.xyqb.controller.ExceptionHandlingController.*(..))")
     private void logHttpCaller() {
@@ -50,7 +50,7 @@ public class LogCallHttpAspect {
         } finally {
             Stopwatch stop = stopwatch.stop();
             long elapsed = stop.elapsed(TimeUnit.MILLISECONDS);
-            LOGGER.info("[httpRequestLog],url:[{}],remoteIP:[{}],args:[{}],duration:[{}],exception:[{}]",
+            log.info("[httpRequestLog],url:[{}],remoteIP:[{}],args:[{}],duration:[{}],exception:[{}]",
                     request.getRequestURL(), remoteIP, args, elapsed, hasException);
         }
         return result;

src/main/java/cn/quantgroup/xyqb/config/captcha/CustomCaptchaService.java

@@ -5,9 +5,8 @@ import com.octo.captcha.Captcha;
 import com.octo.captcha.engine.CaptchaEngine;
 import com.octo.captcha.service.CaptchaServiceException;
 import com.octo.captcha.service.captchastore.CaptchaStore;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Locale;
 
@@ -22,10 +21,9 @@ import java.util.Locale;
  * 修改时间：15/11/17 19:41
  * 修改备注：
  */
+@Slf4j
 public class CustomCaptchaService extends AbstractManageableImageCaptchaService {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CustomCaptchaService.class);
-
     /*
     * 验证码管理策略:
     * 1, 生成验证码时, 会进行配额检查, 当达到配额时, 进行垃圾验证码清理
@@ -70,7 +68,7 @@ public class CustomCaptchaService extends AbstractManageableImageCaptchaService
             }
             valid = captcha.validateResponse(response);
         } catch (Exception ex) {
-            LOGGER.warn("can not get captcha from redis");
+            log.warn("can not get captcha from redis");
             valid = false;
         }
 

src/main/java/cn/quantgroup/xyqb/config/captcha/RedisCaptchaStore.java

@@ -5,6 +5,7 @@ import cn.quantgroup.xyqb.thirdparty.jcaptcha.SimpleCaptcha;
 import com.octo.captcha.Captcha;
 import com.octo.captcha.service.CaptchaServiceException;
 import com.octo.captcha.service.captchastore.CaptchaStore;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -25,9 +26,9 @@ import java.util.concurrent.TimeUnit;
  * 修改时间：15/12/17 06:39
  * 修改备注：
  */
+@Slf4j
 public class RedisCaptchaStore implements CaptchaStore {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(RedisCaptchaStore.class);
     private static final long DEFAULT_EXPIRED_IN = 120L;
     private static final TimeUnit DEFAULT_EXPIRED_TIMEUNIT = TimeUnit.SECONDS;
 
@@ -103,7 +104,7 @@ public class RedisCaptchaStore implements CaptchaStore {
         String captcharKey = buildCaptcharKey(captchaId);
         Long expire = stringRedisTemplate.getExpire(captcharKey, TimeUnit.SECONDS);
         Object value = stringRedisTemplate.opsForValue().get(captcharKey);
-        LOGGER.info("captchaId={},captchaCode={},expire={}秒", captcharKey, value, expire);
+        log.info("captchaId={},captchaCode={},expire={}秒", captcharKey, value, expire);
         stringRedisTemplate.delete(captcharKey);
         return value != null ? new SimpleCaptcha(captchaId, String.valueOf(value)) : null;
     }

src/main/java/cn/quantgroup/xyqb/controller/ExceptionHandlingController.java

@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.controller;
 import cn.quantgroup.xyqb.exception.*;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.util.IpUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -21,12 +22,11 @@ import java.util.Set;
  * Created by Miraculous on 15/7/6.
  * 出现异常，进入这个handler。
  */
+@Slf4j
 @ControllerAdvice
 @RestController
 public class ExceptionHandlingController implements IBaseController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionHandlingController.class);
-
     private static final JsonResult EXCEPTION_RESULT = new JsonResult("internal error", (long)HttpStatus.INTERNAL_SERVER_ERROR.value(), "");
 
     /**
@@ -37,7 +37,7 @@ public class ExceptionHandlingController implements IBaseController {
      */
     @ExceptionHandler(PasswordErrorLimitException.class)
     public JsonResult passwordErrorLimitException(PasswordErrorLimitException vce) {
-        LOGGER.info("throw PasswordErrorLimitException,msg={},businessCode={}, clientIp={}", vce.getMessage(), 2L, IpUtil.getRemoteIP(getRequest()));
+        log.info("throw PasswordErrorLimitException,msg={},businessCode={}, clientIp={}", vce.getMessage(), 2L, IpUtil.getRemoteIP(getRequest()));
         return JsonResult.buildErrorStateResult(vce.getMessage(), null, 2L);
     }
 
@@ -49,7 +49,7 @@ public class ExceptionHandlingController implements IBaseController {
      */
     @ExceptionHandler(VerificationCodeErrorException.class)
     public JsonResult verificationCodeErrorException(VerificationCodeErrorException vce) {
-        LOGGER.info("throw VerificationCodeErrorException,msg={},businessCode={}, clientIp={}", vce.getMessage(), 1L, IpUtil.getRemoteIP(getRequest()));
+        log.info("throw VerificationCodeErrorException,msg={},businessCode={}, clientIp={}", vce.getMessage(), 1L, IpUtil.getRemoteIP(getRequest()));
         return JsonResult.buildErrorStateResult(vce.getMessage(), null, 1L);
     }
 
@@ -62,7 +62,7 @@ public class ExceptionHandlingController implements IBaseController {
     @ExceptionHandler(UserNotExistException.class)
     @ResponseStatus(HttpStatus.UNAUTHORIZED)
     public JsonResult userNotExistException(UserNotExistException unee) {
-        LOGGER.info("throw UserNotExistException,msg={},businessCode={},code={}", unee.getMessage(), 1L, (long)HttpStatus.UNAUTHORIZED.value());
+        log.info("throw UserNotExistException,msg={},businessCode={},code={}", unee.getMessage(), 1L, (long)HttpStatus.UNAUTHORIZED.value());
         return new JsonResult(unee.getMessage(), (long)HttpStatus.UNAUTHORIZED.value(), null);
     }
 
@@ -74,7 +74,7 @@ public class ExceptionHandlingController implements IBaseController {
      */
     @ExceptionHandler(UserQueryLogException.class)
     public JsonResult userQueryLogException(UserQueryLogException uqle) {
-        LOGGER.info("throw UserQueryLogException,msg={},businessCode={},code={}", uqle.getMessage(), 1L, 0L);
+        log.info("throw UserQueryLogException,msg={},businessCode={},code={}", uqle.getMessage(), 1L, 0L);
         return JsonResult.buildErrorStateResult(uqle.getMessage(), null);
     }
 
@@ -87,7 +87,7 @@ public class ExceptionHandlingController implements IBaseController {
     @ExceptionHandler(WechatRelateUserException.class)
     @ResponseStatus(HttpStatus.UNAUTHORIZED)
     public JsonResult wechatRelateUserException(WechatRelateUserException wrue) {
-        LOGGER.info("throw WechatRelateUserException,msg={},businessCode={},code={}", wrue.getMessage(), 1L, (long)HttpStatus.UNAUTHORIZED.value());
+        log.info("throw WechatRelateUserException,msg={},businessCode={},code={}", wrue.getMessage(), 1L, (long)HttpStatus.UNAUTHORIZED.value());
         return new JsonResult(wrue.getMessage(), (long)HttpStatus.UNAUTHORIZED.value(), null);
     }
 
@@ -102,7 +102,7 @@ public class ExceptionHandlingController implements IBaseController {
         HttpServletRequest request = getRequest();
         String uri = request.getRequestURI();
         String registerFrom = request.getParameter("registerFrom");
-        LOGGER.error("[exception][global_exception]接口异常 URI:{}, registerFrom:{},error={}", uri, registerFrom, e);
+        log.error("[exception][global_exception]接口异常 URI:{}, registerFrom:{},error={}", uri, registerFrom, e);
         return EXCEPTION_RESULT;
     }
 
@@ -111,7 +111,7 @@ public class ExceptionHandlingController implements IBaseController {
         ConstraintViolationException exs = (ConstraintViolationException) exception;
         Set<ConstraintViolation<?>> constraintViolations = exs.getConstraintViolations();
         if (constraintViolations.isEmpty()) {
-            LOGGER.error("这里出了个错....", exception.getMessage());
+            log.error("这里出了个错....", exception.getMessage());
             return null;
         }
         String message = constraintViolations.iterator().next().getMessage();

src/main/java/cn/quantgroup/xyqb/controller/dust/UserAuthorizedController.java

@@ -4,6 +4,7 @@ import cn.quantgroup.xyqb.entity.UserAuthorized;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.UserAuthorizedParam;
 import cn.quantgroup.xyqb.service.auth.IUserAuthorizedService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,19 +15,18 @@ import javax.annotation.Resource;
 /**
  * @author xufei on 2018/1/5.
  */
+@Slf4j
 @RestController
 @RequestMapping("/user/auth")
 public class UserAuthorizedController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UserAuthorizedController.class);
-
     @Resource
     private IUserAuthorizedService userAuthorizedService;
 
 
     @RequestMapping(value = "/hasUserAuthorized")
     public JsonResult hasUserAuthorized(String idNo) {
-        LOGGER.info("[hasUserAuthorized]需要校验的用户的身份证号为idNo:{}", idNo);
+        log.info("[hasUserAuthorized]需要校验的用户的身份证号为idNo:{}", idNo);
         if (userAuthorizedService.hasUserAuthorized(idNo)) {
             return JsonResult.buildSuccessResult(null, true);
         } else {
@@ -37,13 +37,13 @@ public class UserAuthorizedController {
 
     @RequestMapping(value = "/createUserAuthorized")
     public JsonResult createUserAuthorized(UserAuthorizedParam userAuthorizedParam) {
-        LOGGER.info("[createUserAuthorized]创建实名账户,userAuthorizedParam:{},", userAuthorizedParam);
+        log.info("[createUserAuthorized]创建实名账户,userAuthorizedParam:{},", userAuthorizedParam);
         try {
             if (userAuthorizedService.checkUserAuthorizedParam(userAuthorizedParam)) {
                 return JsonResult.buildErrorStateResult("参数异常", null);
             }
         } catch (Exception e) {
-            LOGGER.info("[createUserAuthorized]创建实名账户失败e:{}", e);
+            log.info("[createUserAuthorized]创建实名账户失败e:{}", e);
             return JsonResult.buildErrorStateResult("参数异常", null);
         }
         UserAuthorized userAuthorized = userAuthorizedService.createUserAuthorized(userAuthorizedParam);
@@ -57,7 +57,7 @@ public class UserAuthorizedController {
 
     @RequestMapping(value = "/getUserAuthorizedId")
     public JsonResult getUserAuthorizedId(String userUuid) {
-        LOGGER.info("[getUserAuthorizedId]获取实名账户的id，userUuid:{}", userUuid);
+        log.info("[getUserAuthorizedId]获取实名账户的id，userUuid:{}", userUuid);
         return JsonResult.buildSuccessResult(null, userAuthorizedService.getUserAuthorizedId(userUuid));
     }
 }

src/main/java/cn/quantgroup/xyqb/controller/external/lock/LockIpv4Controller.java

@@ -5,6 +5,7 @@ import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,10 +27,10 @@ import java.util.concurrent.TimeUnit;
  * @version 1.0.0
  * @since 2017-11-25
  */
+@Slf4j
 @RestController
 @RequestMapping("/lock")
 public class LockIpv4Controller implements IBaseController {
-    private static final Logger LOGGER = LoggerFactory.getLogger(LockIpv4Controller.class);
     private static final String WORD = "Are you a robot monkey？（^_^）";
     @Autowired
     @Qualifier("stringRedisTemplate")
@@ -74,7 +75,7 @@ public class LockIpv4Controller implements IBaseController {
                                @RequestParam(required = false) String act,
                                HttpServletRequest request) {
         if (!ValidationUtil.validateIpv4(ip) || StringUtils.isBlank(act) || StringUtils.isBlank(key)) {
-            LOGGER.info("Lock_ipv4: fail to clear_or_lock ip:{}", ip);
+            log.info("Lock_ipv4: fail to clear_or_lock ip:{}", ip);
             return JsonResult.buildErrorStateResult(WORD, null);
         }
         if (Objects.equals(Boolean.TRUE.toString(), act) || Objects.equals(Boolean.FALSE.toString(), act)) {
@@ -86,7 +87,7 @@ public class LockIpv4Controller implements IBaseController {
                 return JsonResult.buildSuccessResult("Success", null);
             }
         }
-        LOGGER.info("Lock_ipv4: fail to clear_or_lock ip:{}", ip);
+        log.info("Lock_ipv4: fail to clear_or_lock ip:{}", ip);
         return JsonResult.buildErrorStateResult(WORD, null);
     }
 
@@ -113,10 +114,10 @@ public class LockIpv4Controller implements IBaseController {
                 minutes = Integer.valueOf(redisMinutes);
             }
             redisTemplate.opsForValue().set(lockIpv4Key, Boolean.TRUE.toString(), minutes, TimeUnit.MINUTES);
-            LOGGER.info("Lock_ipv4: locked ip Success. ip:{}, error overstep {} times in {} minutes, do lock {} minutes", ip, counts, Constants.IPV4_FAILED_COUNT_MINUTES, minutes);
+            log.info("Lock_ipv4: locked ip Success. ip:{}, error overstep {} times in {} minutes, do lock {} minutes", ip, counts, Constants.IPV4_FAILED_COUNT_MINUTES, minutes);
         } else {
             redisTemplate.delete(lockIpv4Key);
-            LOGGER.info("Lock_ipv4: unlocked ip Success. ip:{}", ip);
+            log.info("Lock_ipv4: unlocked ip Success. ip:{}", ip);
         }
     }
 
@@ -137,7 +138,7 @@ public class LockIpv4Controller implements IBaseController {
                                     @RequestParam(required = false) String type,
                                     HttpServletRequest request) {
         if (!ValidationUtil.validateIpv4(ip) || StringUtils.isBlank(key) || StringUtils.isBlank(act) || StringUtils.isBlank(type)) {
-            LOGGER.info("Lock_ipv4: fail to config hit list for ip:{}", ip);
+            log.info("Lock_ipv4: fail to config hit list for ip:{}", ip);
             return JsonResult.buildErrorStateResult(WORD, null);
         }
         boolean actOk = Objects.equals(Boolean.TRUE.toString(), act) || Objects.equals(Boolean.FALSE.toString(), act);
@@ -150,7 +151,7 @@ public class LockIpv4Controller implements IBaseController {
             configHitList(ip, operate, lock);
             return JsonResult.buildSuccessResult("Success", null);
         }
-        LOGGER.info("Lock_ipv4: fail to config hit list for ip:{}", ip);
+        log.info("Lock_ipv4: fail to config hit list for ip:{}", ip);
         return JsonResult.buildErrorStateResult(WORD, null);
     }
 
@@ -168,21 +169,21 @@ public class LockIpv4Controller implements IBaseController {
         if (operate) {
             if (lock) {
                 redisTemplate.opsForSet().add(Constants.IPV4_LOCK_BLACK, ip);
-                LOGGER.info("Lock_ipv4: add black-list item Success, ip:{}", ip);
+                log.info("Lock_ipv4: add black-list item Success, ip:{}", ip);
             } else {
                 redisTemplate.opsForSet().add(Constants.IPV4_LOCK_WHITE, ip);
-                LOGGER.info("Lock_ipv4: add white-list item Success, ip:{}", ip);
+                log.info("Lock_ipv4: add white-list item Success, ip:{}", ip);
             }
         } else {
             if (lock) {
                 redisTemplate.opsForSet().remove(Constants.IPV4_LOCK_BLACK, ip);
-                LOGGER.info("Lock_ipv4: remove black-list item Success, ip:{}", ip);
+                log.info("Lock_ipv4: remove black-list item Success, ip:{}", ip);
             } else {
                 redisTemplate.opsForSet().remove(Constants.IPV4_LOCK_WHITE, ip);
-                LOGGER.info("Lock_ipv4: remove white-list item Success, ip:{}", ip);
+                log.info("Lock_ipv4: remove white-list item Success, ip:{}", ip);
             }
         }
-        LOGGER.info("Lock_ipv4: white-list:{},black-list:{}", JSONObject.toJSON(redisTemplate.opsForSet().members(Constants.IPV4_LOCK_WHITE)), JSONObject.toJSON(redisTemplate.opsForSet().members(Constants.IPV4_LOCK_BLACK)));
+        log.info("Lock_ipv4: white-list:{},black-list:{}", JSONObject.toJSON(redisTemplate.opsForSet().members(Constants.IPV4_LOCK_WHITE)), JSONObject.toJSON(redisTemplate.opsForSet().members(Constants.IPV4_LOCK_BLACK)));
     }
 
     /**
@@ -202,7 +203,7 @@ public class LockIpv4Controller implements IBaseController {
                                  @RequestParam(required = false) String minutes,
                                  HttpServletRequest request) {
         if (StringUtils.isBlank(key) || StringUtils.isBlank(act) || !StringUtils.isNumeric(counts) || !StringUtils.isNumeric(minutes)) {
-            LOGGER.info("Lock_ipv4: fail to config noun");
+            log.info("Lock_ipv4: fail to config noun");
             return JsonResult.buildErrorStateResult(WORD, null);
         }
         boolean actOk = Objects.equals(Boolean.TRUE.toString(), act) || Objects.equals(Boolean.FALSE.toString(), act);
@@ -219,7 +220,7 @@ public class LockIpv4Controller implements IBaseController {
                 return JsonResult.buildSuccessResult("Success", null);
             }
         }
-        LOGGER.info("Lock_ipv4: fail to config noun");
+        log.info("Lock_ipv4: fail to config noun");
         return JsonResult.buildErrorStateResult(WORD, null);
     }
 
@@ -234,16 +235,16 @@ public class LockIpv4Controller implements IBaseController {
         if (operate) {
             if (counts > 0) {
                 redisTemplate.opsForValue().set(Constants.IPV4_LOCK_ON_COUNTS_REDIS, String.valueOf(counts));
-                LOGGER.info("Lock_ipv4: config redis-param counts Success, counts:{}", counts);
+                log.info("Lock_ipv4: config redis-param counts Success, counts:{}", counts);
             }
             if (minutes > 0) {
                 redisTemplate.opsForValue().set(Constants.IPV4_LOCK_MINUTES_REDIS, String.valueOf(minutes));
-                LOGGER.info("Lock_ipv4: config redis-param minutes Success, minutes:{}", minutes);
+                log.info("Lock_ipv4: config redis-param minutes Success, minutes:{}", minutes);
             }
         } else {
             redisTemplate.delete(Constants.IPV4_LOCK_ON_COUNTS_REDIS);
             redisTemplate.delete(Constants.IPV4_LOCK_MINUTES_REDIS);
-            LOGGER.info("Lock_ipv4: remove redis-param counts、minutes Success, counts:{},minutes:{}, current default:[counts:{},minutes:{}]", Constants.IPV4_LOCK_ON_FAILED_COUNTS, Constants.IPV4_FAILED_LOCK_MINUTES);
+            log.info("Lock_ipv4: remove redis-param counts、minutes Success, counts:{},minutes:{}, current default:[counts:{},minutes:{}]", Constants.IPV4_LOCK_ON_FAILED_COUNTS, Constants.IPV4_FAILED_LOCK_MINUTES);
         }
     }
 

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

@@ -11,6 +11,7 @@ import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.util.DateUtils;
 import cn.quantgroup.xyqb.util.IpUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -29,11 +30,11 @@ import java.util.concurrent.TimeUnit;
 /**
  * Created by FrankChow on 15/7/6.
  */
+@Slf4j
 @RestController
 @RequestMapping("/api/sms")
 public class SmsController implements IBaseController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SmsController.class);
     private final static String RANDOM_CHARS = "0123456789";
     private static final long EXPIRE_MINUTES = 10;
     @Autowired
@@ -76,7 +77,7 @@ public class SmsController implements IBaseController {
                                       @RequestParam(required = false) String registerFrom,
                                       @RequestParam(required = false, defaultValue = "") String appName,
                                       @RequestParam(required = false) String smsMerchant) {
-        LOGGER.info("注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        log.info("注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
         String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
     }
@@ -96,7 +97,7 @@ public class SmsController implements IBaseController {
                                       @RequestParam(required = false) String registerFrom,
                                       @RequestParam(required = false, defaultValue = "") String appName,
                                       @RequestParam(required = false) String smsMerchant) {
-        LOGGER.info("重置密码-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        log.info("重置密码-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
         String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
     }
@@ -110,10 +111,10 @@ public class SmsController implements IBaseController {
     public JsonResult verifyPhoneNoH5New(@RequestParam String phoneNo, @RequestParam(required = false) String registerFrom,
                                          String usage) {
         if (!Objects.equals(PHONE_VOICE_MAX_PER_DAY_KEY_4, usage)) {
-            LOGGER.error("参数校验失败,用户注册语音验证码usage参数为{}", usage);
+            log.error("参数校验失败,用户注册语音验证码usage参数为{}", usage);
             return JsonResult.buildErrorStateResult("参数校验失败.", null);
         }
-        LOGGER.info("注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        log.info("注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
         String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2Voice(phoneNo, randomCode, usage);
     }
@@ -123,10 +124,10 @@ public class SmsController implements IBaseController {
     public JsonResult resetPasswordH5New(@RequestParam String phoneNo, @RequestParam(required = false) String registerFrom,
                                          String usage) {
         if (!Objects.equals(PHONE_VOICE_MAX_PER_DAY_KEY_5, usage)) {
-            LOGGER.error("参数校验失败,重置密码语音验证码usage参数为{}", usage);
+            log.error("参数校验失败,重置密码语音验证码usage参数为{}", usage);
             return JsonResult.buildErrorStateResult("参数校验失败.", null);
         }
-        LOGGER.info("重置密码-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        log.info("重置密码-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
         String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2Voice(phoneNo, randomCode, usage);
     }
@@ -139,10 +140,10 @@ public class SmsController implements IBaseController {
     public JsonResult sendLoginCodeNew(@RequestParam String phoneNo, @RequestParam(required = false) String registerFrom,
                                        String usage) {
         if (!Objects.equals(PHONE_VOICE_MAX_PER_DAY_KEY_6, usage)) {
-            LOGGER.error("参数校验失败,用户登录语音验证码usage参数为{}", usage);
+            log.error("参数校验失败,用户登录语音验证码usage参数为{}", usage);
             return JsonResult.buildErrorStateResult("参数校验失败.", null);
         }
-        LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        log.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
         String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2Voice(phoneNo, randomCode, usage);
     }
@@ -160,7 +161,7 @@ public class SmsController implements IBaseController {
                                     @RequestParam(required = false) String registerFrom,
                                     @RequestParam(required = false, defaultValue = "") String appName,
                                     @RequestParam(required = false) String smsMerchant) {
-        LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        log.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
         String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
     }
@@ -178,7 +179,7 @@ public class SmsController implements IBaseController {
                                      @RequestParam(required = false) String registerFrom,
                                      @RequestParam(required = false, defaultValue = "") String appName,
                                      @RequestParam(required = false) String smsMerchant) {
-        LOGGER.info("快速注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        log.info("快速注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
         String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
     }
@@ -223,7 +224,7 @@ public class SmsController implements IBaseController {
             deleteRetSendCode(phoneNo);//删除用户重置密码，多次错误逻辑
             return JsonResult.buildSuccessResult("发送成功", uniqueId);
         } catch (Exception e) {
-            LOGGER.error("发送短信验证码失败");
+            log.error("发送短信验证码失败");
             return JsonResult.buildErrorStateResult("发送失败", null);
         }
     }
@@ -252,7 +253,7 @@ public class SmsController implements IBaseController {
             deleteRetSendCode(phoneNo);//删除用户重置密码，多次错误逻辑
             return JsonResult.buildSuccessResult("发送成功", uniqueId);
         } catch (Exception e) {
-            LOGGER.error("发送语音短信验证码失败");
+            log.error("发送语音短信验证码失败");
             return JsonResult.buildErrorStateResult("发送失败", null);
         }
     }
@@ -265,10 +266,10 @@ public class SmsController implements IBaseController {
     public JsonResult sendLoginCodeVoiceNew(@RequestParam String phoneNo, @RequestParam(required = false) String registerFrom,
                                             String usage, @RequestParam(required = false) String deviceId) {
         if (!Objects.equals(PHONE_VOICE_MAX_PER_DAY_KEY_6, usage)) {
-            LOGGER.error("参数校验失败,用户登录语音验证码usage参数为{}", usage);
+            log.error("参数校验失败,用户登录语音验证码usage参数为{}", usage);
             return JsonResult.buildErrorStateResult("参数校验失败.", null);
         }
-        LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        log.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
         String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2VoiceNew(phoneNo, randomCode, usage, deviceId);
     }
@@ -289,7 +290,7 @@ public class SmsController implements IBaseController {
                                           @RequestParam(required = false) String deviceId,
                                           @RequestParam(required = false, defaultValue = "") String appName,
                                           @RequestParam(required = false) String smsMerchant) {
-        LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        log.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
         String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2New(phoneNo, randomCode, deviceId, true, appName, smsMerchant);
     }
@@ -310,7 +311,7 @@ public class SmsController implements IBaseController {
                                                @RequestParam(required = false) String deviceId,
                                                @RequestParam(required = false, defaultValue = "") String appName,
                                                @RequestParam(required = false) String smsMerchant) {
-        LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        log.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
         String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2New(phoneNo, randomCode, deviceId, false, appName, smsMerchant);
     }
@@ -331,7 +332,7 @@ public class SmsController implements IBaseController {
                                           @RequestParam(required = false) String deviceId,
                                           @RequestParam(required = false, defaultValue = "") String appName,
                                           @RequestParam(required = false) String smsMerchant) {
-        LOGGER.info("VCC-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
+        log.info("VCC-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
         String randomCode = getRandomCode(Constants.SMS_CODE_LEN_6);
         return sendVerificationCode2New(phoneNo, randomCode, deviceId, true, appName, smsMerchant);
     }
@@ -363,7 +364,7 @@ public class SmsController implements IBaseController {
             return JsonResult.buildErrorStateResult("手机号格式有误", null);
         }
         String clientIp = getIp();
-        LOGGER.info("请求短信新版本接口:phoneNo:{},deviceId:{},IP:{}", phoneNo, deviceId, clientIp);
+        log.info("请求短信新版本接口:phoneNo:{},deviceId:{},IP:{}", phoneNo, deviceId, clientIp);
         // 手机号计数器
         Long getPhoneVerificationCount = redisTemplate.opsForHash().increment(Constants.REDIS_SMS_CODE_COUNT, phoneNo, 1);
         redisTemplate.expire(Constants.REDIS_SMS_CODE_COUNT, DateUtils.getSeconds(), TimeUnit.SECONDS);
@@ -381,24 +382,24 @@ public class SmsController implements IBaseController {
         }
         // 手机号上限检查
         if (getPhoneVerificationCount > PHONE_MAX_PER_DAY) {
-            LOGGER.info("您手机号已经达到获取今天短信验证码上限:phoneNo:{},count:{}", phoneNo, getPhoneVerificationCount);
+            log.info("您手机号已经达到获取今天短信验证码上限:phoneNo:{},count:{}", phoneNo, getPhoneVerificationCount);
             return JsonResult.buildErrorStateResult("今天已获取20次短信验证码，请使用语音验证码或明天再试", null);
         }
         // 设备号上限检查
         if (getDeviceVerificationCount > DEVICE_MAX_PER_DAY) {
-            LOGGER.info("您设备已经达到获取今天验证码上限:deviceId:{},count:{}", deviceId, getDeviceVerificationCount);
+            log.info("您设备已经达到获取今天验证码上限:deviceId:{},count:{}", deviceId, getDeviceVerificationCount);
             return JsonResult.buildErrorStateResult("您设备已经达到获取今天验证码上限", null);
         }
         // IP上限检查
         if (!IpUtil.whiteOf(clientIp) && getIPVerificationCount > IP_MAX_PER_DAY) {
-            LOGGER.info("您当前ip已经达到获取今天短信验证码上限:ip:{},count:{}", clientIp, getIPVerificationCount);
+            log.info("您当前ip已经达到获取今天短信验证码上限:ip:{},count:{}", clientIp, getIPVerificationCount);
             return JsonResult.buildErrorStateResult("您当前ip已经达到获取今天短信验证码上限", null);
         }
 
         String key = Constants.REDIS_PREFIX_VERIFICATION_CODE + phoneNo;
         long expire = redisTemplate.getExpire(key, TimeUnit.MINUTES);
         if (expire >= EXPIRE_MINUTES - 1) {
-            LOGGER.info("sendVerificationCode2New1分钟内不能重复获取验证码:phoneNo:{},deviceId:{},ip:{}", phoneNo, deviceId, clientIp);
+            log.info("sendVerificationCode2New1分钟内不能重复获取验证码:phoneNo:{},deviceId:{},ip:{}", phoneNo, deviceId, clientIp);
             return JsonResult.buildErrorStateResult("1分钟内不能重复获取验证码", null);
         }
         String uniqueId = phoneNo + UUID.randomUUID().toString().replaceAll("-", "");
@@ -422,10 +423,10 @@ public class SmsController implements IBaseController {
             if (isApp && needImageVlidate(clientIp, deviceId, phoneNo)) {
                 return JsonResult.buildSuccessResult("发送成功", uniqueId, 3L);
             }
-            LOGGER.info("sendVerificationCode2New获取短信成功:phone:{},deviceId:{},ip:{}", phoneNo, deviceId, clientIp);
+            log.info("sendVerificationCode2New获取短信成功:phone:{},deviceId:{},ip:{}", phoneNo, deviceId, clientIp);
             return JsonResult.buildSuccessResult("发送成功", uniqueId);
         } catch (Exception e) {
-            LOGGER.error("发送短信验证码失败:phone:{},deviceId:{},ip:{}", phoneNo, deviceId, clientIp);
+            log.error("发送短信验证码失败:phone:{},deviceId:{},ip:{}", phoneNo, deviceId, clientIp);
             return JsonResult.buildErrorStateResult("发送失败", null);
         }
     }
@@ -441,7 +442,7 @@ public class SmsController implements IBaseController {
             return JsonResult.buildErrorStateResult("usage参数无效", null);
         }
         String clientIp = getIp();
-        LOGGER.info("请求短信新版本接口:phoneNo:{},deviceId:{},usage:{},IP:{}", phoneNo, deviceId, usage, clientIp);
+        log.info("请求短信新版本接口:phoneNo:{},deviceId:{},usage:{},IP:{}", phoneNo, deviceId, usage, clientIp);
         // 手机号计数器
         String verificationCountKey = Constants.REDIS_VOICE_CODE_COUNT + usage;
         Long getPhoneVerificationCount = redisTemplate.opsForHash().increment(verificationCountKey, phoneNo, 1);
@@ -462,17 +463,17 @@ public class SmsController implements IBaseController {
         }
         // 手机号上限检查
         if (getPhoneVerificationCount > PHONE_VOICE_MAX_PER_DAY) {
-            LOGGER.info("您手机号已经达到获取今天语音验证码上限，请使用短信验证码或明天再试:phoneNo:{},count:{}", phoneNo, getPhoneVerificationCount);
+            log.info("您手机号已经达到获取今天语音验证码上限，请使用短信验证码或明天再试:phoneNo:{},count:{}", phoneNo, getPhoneVerificationCount);
             return JsonResult.buildErrorStateResult("今天已获取5次语音验证码，请使用短信验证码或明天再试", null);
         }
         // 设备号上限检查
         if (getDeviceVerificationCount > DEVICE_MAX_PER_DAY) {
-            LOGGER.info("您设备已经达到获取今天语音验证码上限:deviceId:{},count:{}", deviceId, getDeviceVerificationCount);
+            log.info("您设备已经达到获取今天语音验证码上限:deviceId:{},count:{}", deviceId, getDeviceVerificationCount);
             return JsonResult.buildErrorStateResult("您设备已经达到获取今天语音验证码上限", null);
         }
         // IP上限检查
         if (!IpUtil.whiteOf(clientIp) && getIPVerificationCount > IP_MAX_PER_DAY) {
-            LOGGER.info("您当前ip已经达到获取今天短信验证码上限:ip:{},count:{}", clientIp, getIPVerificationCount);
+            log.info("您当前ip已经达到获取今天短信验证码上限:ip:{},count:{}", clientIp, getIPVerificationCount);
             return JsonResult.buildErrorStateResult("您当前ip已经达到获取今天语音验证码上限", null);
         }
 
@@ -494,7 +495,7 @@ public class SmsController implements IBaseController {
             }
             return JsonResult.buildSuccessResult("发送成功", uniqueId);
         } catch (Exception e) {
-            LOGGER.error("发送语音短信验证码失败");
+            log.error("发送语音短信验证码失败");
             return JsonResult.buildErrorStateResult("发送失败", null);
         }
     }

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

@@ -16,6 +16,7 @@ import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.util.IpUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,11 +35,11 @@ import static cn.quantgroup.xyqb.constant.UserConstant.USER_ERROR_OR_PASSWORD_ER
  * @author mengfan.feng
  * @time 2015-10-27 11:41
  */
+@Slf4j
 @RestController
 @RequestMapping("/app")
 public class AppController implements IBaseController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AppController.class);
     @Autowired
     private ISessionService sessionService;
     @Autowired
@@ -77,7 +78,7 @@ public class AppController implements IBaseController {
         if (!ValidationUtil.validatePhoneNo(phoneNo)) {
             return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
         }
-        LOGGER.info("第三方用户登录 [AppController] login --> loginFrom:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom, channelId, btRegisterChannelId, IpUtil.getRemoteIP(request), idNo, name);
+        log.info("第三方用户登录 [AppController] login --> loginFrom:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom, channelId, btRegisterChannelId, IpUtil.getRemoteIP(request), idNo, name);
         User user = userService.findByPhoneInDb(phoneNo);
         if (user == null) {
             user = userRegisterService.register(registerFrom, phoneNo, idNo, name, channelId, btRegisterChannelId);
@@ -94,7 +95,7 @@ public class AppController implements IBaseController {
         }
         LoginProperties loginProperties = new LoginProperties("", 4, channelId, registerFrom, appChannel, merchant.getId(), merchant.getName());
         AuthBean bean = sessionService.createSession(user, loginProperties);
-        LOGGER.info("第三方用户登录成功 [AppController] login --> loginFrom:{}, phoneNo:{},appChannel:{}", registerFrom, phoneNo, appChannel);
+        log.info("第三方用户登录成功 [AppController] login --> loginFrom:{}, phoneNo:{},appChannel:{}", registerFrom, phoneNo, appChannel);
         return JsonResult.buildSuccessResult("登录成功", bean);
     }
 
@@ -128,7 +129,7 @@ public class AppController implements IBaseController {
         if (!ValidationUtil.validatePhoneNo(phoneNo)) {
             return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
         }
-        LOGGER.info("第三方用户登录 [AppController] loginSuper --> loginFrom:{},phoneNo:{},appChannel:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom, phoneNo, appChannel, channelId, btRegisterChannelId, IpUtil.getRemoteIP(request), idNo, name);
+        log.info("第三方用户登录 [AppController] loginSuper --> loginFrom:{},phoneNo:{},appChannel:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom, phoneNo, appChannel, channelId, btRegisterChannelId, IpUtil.getRemoteIP(request), idNo, name);
         User user = userService.findByPhoneInDb(phoneNo);
         if (user == null) {
             try {
@@ -158,7 +159,7 @@ public class AppController implements IBaseController {
         context.setCreatedFrom(registerFrom);
         context.setAppChannel(appChannel);
         loginInfo.setLoginContext(context);
-        LOGGER.info("第三方用户获取信息登录成功 [AppController] loginSuper --> loginFrom:{}, phoneNo:{},appChannel:{},channelId:{}", registerFrom, phoneNo, appChannel, channelId);
+        log.info("第三方用户获取信息登录成功 [AppController] loginSuper --> loginFrom:{}, phoneNo:{},appChannel:{},channelId:{}", registerFrom, phoneNo, appChannel, channelId);
 
         return JsonResult.buildSuccessResult("登陆成功", loginInfo);
     }
@@ -187,7 +188,7 @@ public class AppController implements IBaseController {
         if (!ValidationUtil.validatePhoneNo(phoneNo)) {
             return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
         }
-        LOGGER.info("第三方用户登录 [AppController] login2 --> loginFrom:{},channelId:{}, requestIp:{}", registerFrom, channelId, IpUtil.getRemoteIP(request));
+        log.info("第三方用户登录 [AppController] login2 --> loginFrom:{},channelId:{}, requestIp:{}", registerFrom, channelId, IpUtil.getRemoteIP(request));
         User user = userService.findByPhoneInDb(phoneNo);
         if (user == null) {
             return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
@@ -197,7 +198,7 @@ public class AppController implements IBaseController {
         }
         LoginProperties loginProperties = new LoginProperties("", 4, channelId, registerFrom, appChannel, null, "");
         AuthBean bean = sessionService.createSession(user, loginProperties);
-        LOGGER.info("第三方用户登录成功 [AppController] login2 --> loginFrom:{}, phoneNo:{},appChannel:{}", registerFrom, phoneNo, appChannel);
+        log.info("第三方用户登录成功 [AppController] login2 --> loginFrom:{}, phoneNo:{},appChannel:{}", registerFrom, phoneNo, appChannel);
         return JsonResult.buildSuccessResult("登录成功", bean);
     }
 

src/main/java/cn/quantgroup/xyqb/controller/internal/user/center/UserCenterController.java

@@ -12,6 +12,7 @@ import cn.quantgroup.xyqb.service.user.*;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -24,11 +25,11 @@ import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 /**
  * Created by 11 on 2017/3/22.
  */
+@Slf4j
 @RestController
 @RequestMapping("/user/center")
 public class UserCenterController {
@@ -46,8 +47,6 @@ public class UserCenterController {
     @Autowired
     private IUserService userService;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UserCenterController.class);
-
     /**
      * 根据用户手机号查询昵称.
      *
@@ -58,7 +57,7 @@ public class UserCenterController {
     @ApiOperation(value = "查询昵称", notes = "查询用户昵称", httpMethod = "POST")
     public JsonResult queryUserNick(String phoneNo) {
         if (StringUtils.isEmpty(phoneNo)) {
-            LOGGER.error("手机号为空,phoneNo:{}", phoneNo);
+            log.error("手机号为空,phoneNo:{}", phoneNo);
             return JsonResult.buildErrorStateResult("参数不合法", null);
         }
         Long userId = queryUserId(phoneNo);
@@ -67,7 +66,7 @@ public class UserCenterController {
         }
         UserAttached userAttached = userCenterService.searchUserAttachedByUserId(userId);
         if (null != userAttached) {
-            LOGGER.info("获取用户昵称:{}", userAttached.getNick());
+            log.info("获取用户昵称:{}", userAttached.getNick());
             return JsonResult.buildSuccessResult(null, userAttached.getNick());
         }
         return JsonResult.buildSuccessResult(null, null);
@@ -84,7 +83,7 @@ public class UserCenterController {
     @ApiOperation(value = "保存昵称", notes = "保存用户昵称", httpMethod = "POST")
     public JsonResult saveUserNick(String phoneNo, String nick) {
         if (StringUtils.isEmpty(phoneNo)) {
-            LOGGER.error("手机号为空,phoneNo:{}", phoneNo);
+            log.error("手机号为空,phoneNo:{}", phoneNo);
             return JsonResult.buildErrorStateResult("参数不合法", null);
         }
         Long userId = queryUserId(phoneNo);
@@ -106,7 +105,7 @@ public class UserCenterController {
     @ApiOperation(value = "保存头像", notes = "保存用户头像", httpMethod = "POST")
     public JsonResult SaveUserAvatarAddr(String phoneNo, String avatarUrl) {
         if (StringUtils.isBlank(avatarUrl) || StringUtils.isBlank(phoneNo)) {
-            LOGGER.error("参数不合法:avatarUrl:{}, phoneNo:{}", avatarUrl, phoneNo);
+            log.error("参数不合法:avatarUrl:{}, phoneNo:{}", avatarUrl, phoneNo);
             return JsonResult.buildErrorStateResult("参数不合法", null);
         }
         Long userId = queryUserId(phoneNo);
@@ -118,7 +117,7 @@ public class UserCenterController {
         }
         UserAttached userAttached = userCenterService.saveUserAvatar(userId, avatarUrl);
         if (null == userAttached) {
-            LOGGER.error("保存用户头像昵称失败.");
+            log.error("保存用户头像昵称失败.");
             return JsonResult.buildErrorStateResult("信息保存失败,请稍后再试.", null);
         }
         return JsonResult.buildSuccessResult("保存成功", userAttached);
@@ -134,7 +133,7 @@ public class UserCenterController {
     @ApiOperation(value = "查询用户是否实名认证", notes = "查询用户是否实名认证", httpMethod = "POST")
     public JsonResult queryVerified(String phoneNo) {
         if (StringUtils.isEmpty(phoneNo)) {
-            LOGGER.error("手机号为空,phoneNo:{}", phoneNo);
+            log.error("手机号为空,phoneNo:{}", phoneNo);
             return JsonResult.buildErrorStateResult("参数不合法", null);
         }
         Long userId = queryUserId(phoneNo);
@@ -160,7 +159,7 @@ public class UserCenterController {
     @ApiOperation(value = "查询个人资料信息", notes = "查询个人资料信息", httpMethod = "POST")
     public JsonResult personalData(String phoneNo) {
         if (StringUtils.isBlank(phoneNo)) {
-            LOGGER.error("手机号为空,phoneNo:{}", phoneNo);
+            log.error("手机号为空,phoneNo:{}", phoneNo);
             return JsonResult.buildErrorStateResult("参数不合法", null);
         }
         Long userId = queryUserId(phoneNo);
@@ -202,27 +201,27 @@ public class UserCenterController {
     @ApiOperation(value = "保存用户联系人", notes = "保存用户联系人", httpMethod = "POST")
     public JsonResult saveUserContact(String phoneNo, String contactJson) {
         if (StringUtils.isEmpty(phoneNo)) {
-            LOGGER.error("保存联系人,参数错误. phoneNo:{}", phoneNo);
+            log.error("保存联系人,参数错误. phoneNo:{}", phoneNo);
             return JsonResult.buildErrorStateResult("参数有误.", null);
         }
         Long userId = queryUserId(phoneNo);
         if (null == userId || userId == 0L) {
-            LOGGER.error("保存联系人,未获取到用户id. userId:{}", userId);
+            log.error("保存联系人,未获取到用户id. userId:{}", userId);
             return JsonResult.buildErrorStateResult("该用户不存在", null);
         }
         if (StringUtils.isEmpty(contactJson)) {
-            LOGGER.error("保存联系人,联系人参数为空.contactJson:{}", contactJson);
+            log.error("保存联系人,联系人参数为空.contactJson:{}", contactJson);
             return JsonResult.buildErrorStateResult(null, null);
         }
         List<Contact> contacts = JSONObject.parseObject(contactJson, new TypeReference<List<Contact>>() {
         });
         if (CollectionUtils.isEmpty(contacts)) {
-            LOGGER.info("联系人不能空");
+            log.info("联系人不能空");
             return JsonResult.buildErrorStateResult(null, null);
         }
         for (Contact contact : contacts) {
             if (!contact.valid()) {
-                LOGGER.info("用户手机号或姓名错误, phoneNo:{},name:{}", contact.getPhoneNo(), contact.getName());
+                log.info("用户手机号或姓名错误, phoneNo:{},name:{}", contact.getPhoneNo(), contact.getName());
                 return JsonResult.buildErrorStateResult(null, null);
             }
         }
@@ -244,13 +243,13 @@ public class UserCenterController {
     @ApiOperation(value = "保存用户地址", notes = "保存用户地址", httpMethod = "POST")
     public JsonResult saveUserAddress(String phoneNo, String province, Long provinceCode, String city, Long cityCode, String address,
                                       Long districtCode, String district) {
-        LOGGER.info("保存用户地址信息, phoneNo:{}, province:{}, provinceCode:{}, city:{}, cityCode:{},district:{}, address:{}", phoneNo, province, provinceCode, city, cityCode, district, address);
+        log.info("保存用户地址信息, phoneNo:{}, province:{}, provinceCode:{}, city:{}, cityCode:{},district:{}, address:{}", phoneNo, province, provinceCode, city, cityCode, district, address);
         if (StringUtils.isEmpty(phoneNo) || provinceCode == null || cityCode == null || StringUtils.isBlank(address)) {
             return JsonResult.buildErrorStateResult("参数错误", null);
         }
         Long userId = queryUserId(phoneNo);
         if (null == userId || userId == 0L) {
-            LOGGER.error("保存联系人,未获取到用户id. userId:{}", userId);
+            log.error("保存联系人,未获取到用户id. userId:{}", userId);
             return JsonResult.buildErrorStateResult("该用户不存在", null);
         }
         //查询用户是否有保存地址信息
@@ -287,7 +286,7 @@ public class UserCenterController {
         }
         Long userId = queryUserId(phoneNo);
         if (null == userId || userId == 0L) {
-            LOGGER.error("保存联系人,未获取到用户id. userId:{}", userId);
+            log.error("保存联系人,未获取到用户id. userId:{}", userId);
             return JsonResult.buildErrorStateResult("该用户不存在", null);
         }
         Address address = addressService.findByUserId(userId);
@@ -308,7 +307,7 @@ public class UserCenterController {
         }
         Long userId = queryUserId(phoneNo);
         if (null == userId || userId == 0L) {
-            LOGGER.error("保存联系人,未获取到用户id. userId:{}", userId);
+            log.error("保存联系人,未获取到用户id. userId:{}", userId);
             return JsonResult.buildErrorStateResult("该用户不存在", null);
         }
         List<Contact> contacts = contactService.findByUserId(userId, true);
@@ -332,7 +331,7 @@ public class UserCenterController {
         }
         Long userId = queryUserId(phoneNo);
         if (null == userId || userId == 0L) {
-            LOGGER.error("保存用户经济信息,未获取到用户id. userId:{}", userId);
+            log.error("保存用户经济信息,未获取到用户id. userId:{}", userId);
             return JsonResult.buildErrorStateResult("该用户不存在", null);
         }
         //查询用户是否保存过.

src/main/java/cn/quantgroup/xyqb/service/auth/impl/UserAuthorizedServiceImpl.java

@@ -7,6 +7,7 @@ import cn.quantgroup.xyqb.repository.IUserAuthorizedRepository;
 import cn.quantgroup.xyqb.repository.IUserRepository;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.auth.IUserAuthorizedService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,9 +22,9 @@ import java.util.Objects;
 /**
  * @author xufei on 2018/1/5.
  */
+@Slf4j
 @Service
 public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
-    private static final Logger LOGGER = LoggerFactory.getLogger(UserAuthorizedServiceImpl.class);
     @Resource
     private IIdCardService iIdCardService;
 
@@ -41,12 +42,12 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
                 return Boolean.FALSE;
             }
         } catch (ParseException e) {
-            LOGGER.error("[hasUserAuthorized]参数异常e:{}", e);
+            log.error("[hasUserAuthorized]参数异常e:{}", e);
             return Boolean.FALSE;
         }
 
         UserAuthorized userAuthorized = userAuthorizedRepository.findByIdNo(idNo);
-        LOGGER.info("[hasUserAuthorized]查询实名账户userAuthorized:{}", userAuthorized);
+        log.info("[hasUserAuthorized]查询实名账户userAuthorized:{}", userAuthorized);
         return null != userAuthorized;
     }
 
@@ -86,10 +87,10 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
 
         try {
             userAuthorized = userAuthorizedRepository.save(userAuthorized);
-            LOGGER.info("[createUserAuthorized]创建实名账户成功,userAuthorized:{}", userAuthorized);
+            log.info("[createUserAuthorized]创建实名账户成功,userAuthorized:{}", userAuthorized);
             return userAuthorized;
         } catch (Exception e) {
-            LOGGER.error("[createUserAuthorized]创建实名账户异常e:{}", e);
+            log.error("[createUserAuthorized]创建实名账户异常e:{}", e);
             return null;
         }
     }
@@ -102,7 +103,7 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
         }
 
         UserAuthorized userAuthorized = userAuthorizedRepository.findByUserUuid(userUuid);
-        LOGGER.info("[getUserAuthorizedId]获取实名账户的id,userUuid:{},userAuthorized:{}", userUuid, userAuthorized);
+        log.info("[getUserAuthorizedId]获取实名账户的id,userUuid:{},userAuthorized:{}", userUuid, userAuthorized);
         if (null == userAuthorized) {
             return null;
         }

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

@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.service.captcha;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.util.encrypt.Md5Util;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpStatus;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -351,7 +352,7 @@ public class GeetestLib {
         // 建立与服务器的连接，并未发送数据
         connection.connect();
 
-        if (connection.getResponseCode() == Constants.HTTP_CODE_200) {
+        if (connection.getResponseCode() == HttpStatus.SC_OK) {
             // 发送数据到服务器并使用Reader读取返回的数据
             StringBuilder sBuffer = new StringBuilder();
 
@@ -402,7 +403,7 @@ public class GeetestLib {
         outputStreamWriter.flush();
         outputStreamWriter.close();
 
-        if (connection.getResponseCode() == Constants.HTTP_CODE_200) {
+        if (connection.getResponseCode() == HttpStatus.SC_OK) {
             // 发送数据到服务器并使用Reader读取返回的数据
             StringBuilder sBuffer = new StringBuilder();
 

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

@@ -4,6 +4,7 @@ import cn.quantgroup.tech.brave.service.ITechHttpClient;
 import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.util.PasswordUtil;
 import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.Charsets;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -52,11 +53,10 @@ import java.util.*;
  * @author mengfan.feng
  * @time 2015-08-13 10:19
  */
+@Slf4j
 @Service
 public class HttpServiceImpl implements IHttpService {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(HttpServiceImpl.class);
-
     private static final int TIME_OUT = 60 * 1000;  // 超时时间
     //注入brave-spring-boot-starter提供的techHttpClient
     @Resource
@@ -103,12 +103,12 @@ public class HttpServiceImpl implements IHttpService {
      */
     private String doHttp(RequestBuilder requestBuilder, String uri, Map<String, String> headers, Map<String, String> parameters) {
         if (StringUtils.isEmpty(uri)) {
-            LOGGER.info("uri cannot be empty, uri:{}", uri);
+            log.info("uri cannot be empty, uri:{}", uri);
             return null;
         }
 
         String method = requestBuilder.getMethod();
-        LOGGER.info("{}, uri:{}, headers:{}, parameters:{}", method, uri, headers, StringUtils.substring(PasswordUtil.filterPasswordToString(parameters), 0, 200));
+        log.info("{}, uri:{}, headers:{}, parameters:{}", method, uri, headers, StringUtils.substring(PasswordUtil.filterPasswordToString(parameters), 0, 200));
         HttpEntity httpEntity = null;
         CloseableHttpResponse httpResponse = null;
         try {
@@ -129,11 +129,11 @@ public class HttpServiceImpl implements IHttpService {
             httpEntity = httpResponse.getEntity();
             String response = EntityUtils.toString(httpEntity, Charsets.UTF_8);
 
-            LOGGER.info("{}, uri:{}, response:{}", method, uri, StringUtils.substring(response, 0, 200));
+            log.info("{}, uri:{}, response:{}", method, uri, StringUtils.substring(response, 0, 200));
 
             return response;
         } catch (Exception e) {
-            LOGGER.info("{}, uri:{}, headers:{}, parameters:{}", method, uri, headers, StringUtils.substring(PasswordUtil.filterPasswordToString(parameters), 0, 200), e);
+            log.info("{}, uri:{}, headers:{}, parameters:{}", method, uri, headers, StringUtils.substring(PasswordUtil.filterPasswordToString(parameters), 0, 200), e);
             return null;
         } finally {
             EntityUtils.consumeQuietly(httpEntity);
@@ -142,7 +142,7 @@ public class HttpServiceImpl implements IHttpService {
                     httpResponse.close();
                 }
             } catch (Exception e) {
-                LOGGER.error("{}, httpResponse.close error", method, e);
+                log.error("{}, httpResponse.close error", method, e);
             }
         }
     }

src/main/java/cn/quantgroup/xyqb/service/mq/impl/IRegisterMqServiceImpl.java

@@ -2,6 +2,7 @@ package cn.quantgroup.xyqb.service.mq.impl;
 
 import cn.quantgroup.xyqb.service.mq.IRegisterMqService;
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.Queue;
@@ -16,9 +17,9 @@ import java.io.Serializable;
 /**
  * Created by xuran on 2017/9/7.
  */
+@Slf4j
 @Service("registerMqService")
 public class IRegisterMqServiceImpl implements IRegisterMqService {
-    private static final Logger LOGGER = LoggerFactory.getLogger(IRegisterMqServiceImpl.class);
 
     @Autowired
     @Qualifier("registerRabbitTemplate")
@@ -40,12 +41,12 @@ public class IRegisterMqServiceImpl implements IRegisterMqService {
     @Async
     public void send(Serializable message) {
         if (null == message) {
-            LOGGER.error("广播用户注册消息不能为空");
+            log.error("广播用户注册消息不能为空");
         }
-        LOGGER.info("广播用户注册消息,message={}", message);
+        log.info("广播用户注册消息,message={}", message);
         String msg = JSONObject.toJSONString(message);
         registerRabTemplate.convertAndSend(msg);
-        LOGGER.info("广播用户注册消息,message={}", msg);
+        log.info("广播用户注册消息,message={}", msg);
     }
 
     /**
@@ -57,12 +58,12 @@ public class IRegisterMqServiceImpl implements IRegisterMqService {
     @Async
     public void send4Gdt(Serializable message) {
         if (null == message) {
-            LOGGER.error("广点通用户注册消息不能为空");
+            log.error("广点通用户注册消息不能为空");
         }
-        LOGGER.info("广点通用户注册消息,message={}", message);
+        log.info("广点通用户注册消息,message={}", message);
         String msg = JSONObject.toJSONString(message);
         registerRabbitTemplate4Gdt.convertAndSend(msg);
-        LOGGER.info("广点通用户注册消息,message={}", msg);
+        log.info("广点通用户注册消息,message={}", msg);
     }
 
 }

src/main/java/cn/quantgroup/xyqb/service/session/aspect/UserBtRegisterFillAspect.java

@@ -3,12 +3,11 @@ package cn.quantgroup.xyqb.service.session.aspect;
 import cn.quantgroup.xyqb.entity.UserBtRegister;
 import cn.quantgroup.xyqb.model.session.SessionValue;
 import cn.quantgroup.xyqb.service.user.IUserBtRegisterService;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -17,16 +16,17 @@ import org.springframework.stereotype.Component;
 /**
  * Created by Administrator on 2017/5/16.
  */
+@Slf4j
 @Aspect
 @Component
 @Order(value = Ordered.HIGHEST_PRECEDENCE)
 public class UserBtRegisterFillAspect {
-    private static final Logger LOGGER = LoggerFactory.getLogger(UserBtRegisterFillAspect.class);
 
     @Autowired
     private IUserBtRegisterService userBtRegisterService;
 
-    @Pointcut("@annotation(cn.quantgroup.xyqb.service.session.aspect.UserBtRegisterFill)") //生成还款计划的时候，去生成趸交服务费
+    /** 生成还款计划的时候，去生成趸交服务费 */
+    @Pointcut("@annotation(cn.quantgroup.xyqb.service.session.aspect.UserBtRegisterFill)")
     public void userBtRegisterFillCut() {
     }
 
@@ -36,7 +36,7 @@ public class UserBtRegisterFillAspect {
         try {
             args = fillUserBtRegister(args);
         } catch (Exception e) {
-            LOGGER.error("补充用户白条登录渠道信息失败", e);
+            log.error("补充用户白条登录渠道信息失败", e);
         }
         return pjp.proceed(args);
     }

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

@@ -4,6 +4,7 @@ import cn.quantgroup.user.enums.Relation;
 import cn.quantgroup.xyqb.entity.Contact;
 import cn.quantgroup.xyqb.repository.IContactRepository;
 import cn.quantgroup.xyqb.service.user.IContactService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,17 +15,15 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.sql.Timestamp;
-import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
 /**
  * Created by Miraculous on 2017/1/3.
  */
+@Slf4j
 @Service
 public class ContactServiceImpl implements IContactService {
-    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(ContactServiceImpl.class);
     @Autowired
     private IContactRepository contactRepository;
 
@@ -87,7 +86,7 @@ public class ContactServiceImpl implements IContactService {
         if (null != relation) {
             contact.setRelation(relation);
         }
-        LOGGER.info("修改前联系人信息:{}", contact);
+        log.info("修改前联系人信息:{}", contact);
         Timestamp now = new Timestamp(System.currentTimeMillis());
         contact.setUpdateAt(now);
         contact = save(contact);

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

@@ -7,6 +7,7 @@ import cn.quantgroup.xyqb.service.user.ILockIpv4Service;
 import cn.quantgroup.xyqb.util.DateUtils;
 import cn.quantgroup.xyqb.util.IpUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,9 +24,9 @@ import java.util.concurrent.TimeUnit;
  *
  * @author renwc
  */
+@Slf4j
 @Service
 public class LockIpv4ServiceImpl implements ILockIpv4Service {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ILockIpv4Service.class);
 
     @Autowired
     @Qualifier("stringRedisTemplate")
@@ -36,16 +37,16 @@ public class LockIpv4ServiceImpl implements ILockIpv4Service {
         // 密码错误时，给该账号添加计数器
         String key = Constants.REDIS_PASSWORD_ERROR_COUNT + phoneNo;
         if (!stringRedisTemplate.hasKey(key)) {
-            LOGGER.info("添加错误计数器，key={}", key);
+            log.info("添加错误计数器，key={}", key);
             stringRedisTemplate.opsForValue().set(key, String.valueOf(0), DateUtils.getSeconds(), TimeUnit.SECONDS);
         }
         // 密码错误计数
         Long errorCount = stringRedisTemplate.opsForValue().increment(key, 1L);
         if (errorCount > Constants.Image_Need_Count) {
-            LOGGER.info("用户名或密码不正确，phoneNo={}", phoneNo);
+            log.info("用户名或密码不正确，phoneNo={}", phoneNo);
             throw new PasswordErrorLimitException("用户名或密码不正确");
         } else if (Objects.equals(errorCount, Constants.Image_Need_Count)) {
-            LOGGER.info("请输入图形验证码，phoneNo={}", phoneNo);
+            log.info("请输入图形验证码，phoneNo={}", phoneNo);
             throw new PasswordErrorLimitException("请输入图形验证码");
         }
     }
@@ -64,7 +65,7 @@ public class LockIpv4ServiceImpl implements ILockIpv4Service {
                 stringRedisTemplate.opsForValue().set(ipv4Key, String.valueOf(0), Constants.IPV4_FAILED_COUNT_MINUTES, TimeUnit.MINUTES);
             }
             Long count = stringRedisTemplate.opsForValue().increment(ipv4Key, 1L);
-            LOGGER.info("Lock_ipv4: count deny ip access: ip={}, count={}", ipv4, count);
+            log.info("Lock_ipv4: count deny ip access: ip={}, count={}", ipv4, count);
             lockErrorIpv4(ipv4, count);
         }
     }
@@ -88,7 +89,7 @@ public class LockIpv4ServiceImpl implements ILockIpv4Service {
         }
         String lockIpv4Key = getLockIpv4Key(ip);
         stringRedisTemplate.opsForValue().set(lockIpv4Key, Boolean.TRUE.toString(), minutes, TimeUnit.MINUTES);
-        LOGGER.info("Lock_ipv4: locked error ip access:{}, error overstep {} times in {} minutes, do lock {} minutes", ip, counts, Constants.IPV4_FAILED_COUNT_MINUTES, minutes);
+        log.info("Lock_ipv4: locked error ip access:{}, error overstep {} times in {} minutes, do lock {} minutes", ip, counts, Constants.IPV4_FAILED_COUNT_MINUTES, minutes);
     }
 
     /**
@@ -105,7 +106,7 @@ public class LockIpv4ServiceImpl implements ILockIpv4Service {
                 stringRedisTemplate.opsForValue().set(ipv4Key, String.valueOf(0), Constants.IPV4_SUCCESS_COUNT_MINUTES, TimeUnit.MINUTES);
             }
             Long count = stringRedisTemplate.opsForValue().increment(ipv4Key, 1L);
-            LOGGER.info("Lock_ipv4: count success ip access: ip={}, count={}", ipv4, count);
+            log.info("Lock_ipv4: count success ip access: ip={}, count={}", ipv4, count);
             // 恢复规则，观察 // Todo -- 误伤业务方，暂时下线[比如网贷之家：121.40.207.133] -- lockSuccessIpv4(ipv4, count);
             lockSuccessIpv4(ipv4, count);
         }
@@ -120,7 +121,7 @@ public class LockIpv4ServiceImpl implements ILockIpv4Service {
         // 锁定时长
         String lockIpv4Key = getLockIpv4Key(ip);
         stringRedisTemplate.opsForValue().set(lockIpv4Key, Boolean.TRUE.toString(), Constants.IPV4_SUCCESS_LOCK_MINUTES, TimeUnit.MINUTES);
-        LOGGER.info("Lock_ipv4: locked success ip access:{}, success overstep {} times in {} minutes, do lock {} minutes", ip, Constants.IPV4_LOCK_ON_SUCCESS_COUNTS, Constants.IPV4_SUCCESS_COUNT_MINUTES, Constants.IPV4_SUCCESS_LOCK_MINUTES);
+        log.info("Lock_ipv4: locked success ip access:{}, success overstep {} times in {} minutes, do lock {} minutes", ip, Constants.IPV4_LOCK_ON_SUCCESS_COUNTS, Constants.IPV4_SUCCESS_COUNT_MINUTES, Constants.IPV4_SUCCESS_LOCK_MINUTES);
     }
 
     private static String getErrorIpKey(String ipv4) {