优化log

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

@@ -171,16 +171,15 @@ public class CaptchaFiniteValidateAdvisor {
       LOGGER.info("参数无效, credential:{}", credential);
       return null;
     }
-    // 当前用户手机号
+    // 当前用户手机号和密码
     String phoneNo = credentialArr[0];
-    // 当前请求的SingleToken
     String password = credentialArr[1];
     headerParamValid = headerParamValid && ValidationUtil.validatePhoneNo(phoneNo) && StringUtils.isNotBlank(password);
     if (!headerParamValid) {
       LOGGER.info("参数无效, credential:{}, phoneNo:{}, password:{}", credential, phoneNo, password);
       return null;
     }
-    LOGGER.info("账密登录, phoneNo:{}, password:{}", phoneNo, password);
+    LOGGER.info("账密登录, phoneNo:{}", phoneNo);
     Map<String, String> phonePasswordMap = new HashMap<String, String>(2);
     phonePasswordMap.put("phoneNo", phoneNo);
     phonePasswordMap.put("password", password);

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

@@ -75,7 +75,7 @@ public class PasswordErrorFiniteValidateAdvisor {
     // 黑名单
     if(redisTemplate.opsForSet().isMember(Constants.IPV4_LOCK_BLACK, clientIp)){
       IPUtil.logIp(LOGGER, request);
-      LOGGER.info("Lock_ipv4: locked ip access:{}", clientIp);
+      LOGGER.info("Lock_ipv4: black ip access:{}", clientIp);
       return JsonResult.buildErrorStateResult("登录失败", null);
     }
     String lockIpv4Key = getLockIpv4Key(clientIp);

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

@@ -107,7 +107,7 @@ 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 access:{}, error overstep {} times in {} minutes, do lock {} minutes", ip, counts, Constants.IPV4_FAILED_COUNT_MINUTES, 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);
     }else{
       redisTemplate.delete(lockIpv4Key);
       LOGGER.info("Lock_ipv4: unlocked ip Success. ip:{}", ip);

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

@@ -349,7 +349,8 @@ public class SmsController implements IBaseController {
     try {
       smsService.getSmsSender().sendMsg(message);
       redisTemplate.opsForValue().set(key, uniqueId + ":" + randomCode, EXPIRE_MINUTES, TimeUnit.MINUTES);
-      deleteRetSendCode(phoneNo);//删除用户重置密码，多次错误逻辑
+      //删除用户重置密码，多次错误逻辑
+      deleteRetSendCode(phoneNo);
       if(needImageVlidate(clientIp,deviceId,phoneNo)){
 
         return JsonResult.buildSuccessResult("发送成功", uniqueId,0003L);

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

@@ -84,10 +84,7 @@ public class UserController implements IBaseController {
   @RequestMapping("/test")
   public JsonResult test() {
     HttpServletRequest request = getRequest();
-    String remoteAddr = request.getRemoteAddr();
-    String xRealIp = IPUtil.getRemoteIP(request);
-    String xOriginalClientIp = request.getHeader("x-original-client-ip");
-    LOGGER.info("Test ips:[client={}, old={}, new={}]", remoteAddr, xRealIp, xOriginalClientIp);
+    IPUtil.logIp(LOGGER, request);
     return JsonResult.buildSuccessResult("", getCurrentUserFromRedis());
   }
 
@@ -154,7 +151,7 @@ public class UserController implements IBaseController {
           @RequestParam(required = false,defaultValue = "xyqb") String key,
           HttpServletRequest request, String openId,
           @RequestParam(required = false) String dimension) {
-    LOGGER.info("user/login,请求参数channelId:{},appChannel:{},createdFrom:{},userId:{},key:{},openId:{},dimension:{},",channelId,appChannel,createdFrom,userId,key,openId,dimension);
+    LOGGER.info("login -> channelId:{},appChannel:{},createdFrom:{},userId:{},key:{},openId:{},dimension:{}",channelId,appChannel,createdFrom,userId,key,openId,dimension);
     Merchant merchant = merchantService.findMerchantByName(key);
     if (merchant == null) {
       return JsonResult.buildErrorStateResult("未知的连接", null);
@@ -175,7 +172,7 @@ public class UserController implements IBaseController {
           @RequestParam(required = false)Long btRegisterChannelId,
           @RequestParam(required = false) String dimension ,HttpServletRequest request) {
     Map<String, JsonResult> validMap = getHeaderParam(request);
-    LOGGER.info("user/login/fast,请求参数channelId:{},appChannel:{},createdFrom:{},btRegisterChannelId:{},key:{},dimension:{},",channelId,appChannel,createdFrom,btRegisterChannelId,key,dimension);
+    LOGGER.info("login/fast -> channelId:{},appChannel:{},createdFrom:{},btRegisterChannelId:{},key:{},dimension:{}",channelId,appChannel,createdFrom,btRegisterChannelId,key,dimension);
     if (null != validMap.get("fail")) {
       return validMap.get("fail");
     }
@@ -208,9 +205,9 @@ public class UserController implements IBaseController {
 
   private User registerFastWhenLogin(String phoneNo, Long channelId, Long registerFrom, String appChannel, Long btRegisterChannelId,String dimension) {
     String password = genRandomPwd();
-    LOGGER.info("用户快速注册, phoneNo:{}, channelId:{}, registerFrom:{},appChannel:{},btRegisterChannelId", phoneNo, channelId, registerFrom, appChannel,btRegisterChannelId);
+    LOGGER.info("用户快速注册：login/fast -> phoneNo:{}, channelId:{}, registerFrom:{},appChannel:{},btRegisterChannelId:{}", phoneNo, channelId, registerFrom, appChannel,btRegisterChannelId);
     if (!ValidationUtil.validatePhoneNo(phoneNo)) {
-      LOGGER.info("用户快速注册失败，手机号错误, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+      LOGGER.info("用户快速注册失败，手机号错误：login/fast -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       throw new UserNotExistException("手机号错误");
     }
     if (null == registerFrom) {
@@ -220,7 +217,7 @@ public class UserController implements IBaseController {
       registerFrom=222L;
     }
     User user=userService.registerAndReturn(phoneNo, password, registerFrom,btRegisterChannelId);
-    LOGGER.info("用户快速注册成功, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+    LOGGER.info("用户快速注册成功：login/fast -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
      MqUtils.sendRegisterMessage(channelId,dimension, user);
     return user;
   }
@@ -276,17 +273,17 @@ public class UserController implements IBaseController {
                                  @RequestParam(required = false) Long registerFrom, @RequestParam(required = false, defaultValue = "") String appChannel,
                                  @RequestParam(required = false)Long btRegisterChannelId,@RequestParam(required = false)String dimension) {
     String password = genRandomPwd();
-    LOGGER.info("用户快速注册, phoneNo:{}, verificationCode:{}, channelId:{}, registerFrom:{},appChannel:{},btRegisterChannelId:{},dimension:{}", phoneNo, verificationCode, channelId, registerFrom, appChannel,btRegisterChannelId,dimension);
+    LOGGER.info("用户快速注册：register/fast -> phoneNo:{}, verificationCode:{}, channelId:{}, registerFrom:{},appChannel:{},btRegisterChannelId:{},dimension:{}", phoneNo, verificationCode, channelId, registerFrom, appChannel,btRegisterChannelId,dimension);
     if (!ValidationUtil.validatePhoneNo(phoneNo)) {
-      LOGGER.info("用户快速注册失败，手机号错误, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+      LOGGER.info("用户快速注册失败，手机号错误：register/fast -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("手机号错误", null);
     }
     if (StringUtils.isEmpty(password)) {
-      LOGGER.info("用户快速注册失败，密码不能为空, registerFrom:{}, phoneNo:{}, password:{}", registerFrom, phoneNo, password);
+      LOGGER.info("用户快速注册失败，密码不能为空：register/fast -> registerFrom:{}, phoneNo:{}, password:{}", registerFrom, phoneNo, password);
       return JsonResult.buildErrorStateResult("密码不能为空", null);
     }
     if (password.length() < 6 || password.length() > 12) {
-      LOGGER.info("用户快速注册失败，密码长度须在6位至12位之间, registerFrom:{}, phoneNo:{}, password:{}", registerFrom, phoneNo, password);
+      LOGGER.info("用户快速注册失败，密码长度须在6位至12位之间：register/fast -> registerFrom:{}, phoneNo:{}, password:{}", registerFrom, phoneNo, password);
       return JsonResult.buildErrorStateResult("密码应为6-12位", null);
     }
     if (null == registerFrom) {
@@ -294,14 +291,14 @@ public class UserController implements IBaseController {
     }
     smsValidForFastLogin(phoneNo, verificationCode);
     if (userService.exist(phoneNo)) {
-      LOGGER.info("用户快速注册失败，该手机号已经被注册, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+      LOGGER.info("用户快速注册失败，该手机号已经被注册：register/fast -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("该手机号已经被注册", null);
     }
     if (!userService.register(phoneNo, password, registerFrom, getIp(), channelId,btRegisterChannelId,dimension)) {
-      LOGGER.info("用户快速注册失败，请稍后重试, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+      LOGGER.info("用户快速注册失败，请稍后重试：register/fast -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("注册失败，请稍后重试", null);
     }
-    LOGGER.info("用户快速注册成功, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+    LOGGER.info("用户快速注册成功：register/fast -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
     return JsonResult.buildSuccessResult(null, null);
   }
 
@@ -320,17 +317,17 @@ public class UserController implements IBaseController {
                              @RequestParam String verificationCode, @RequestParam(required = false) Long channelId,
                              @RequestParam(required = false) Long registerFrom,
                              @RequestParam(required = false)Long btRegisterChannelId,@RequestParam(required = false)String dimension) {
-    LOGGER.info("[/user/register]用户注册, phoneNo:{}, verificationCode:{}, channelId:{}, registerFrom:{},btRegisterChannelId:{},dimension:{}", phoneNo, verificationCode, channelId, registerFrom,btRegisterChannelId,dimension);
+    LOGGER.info("用户注册：register -> phoneNo:{}, verificationCode:{}, channelId:{}, registerFrom:{},btRegisterChannelId:{},dimension:{}", phoneNo, verificationCode, channelId, registerFrom,btRegisterChannelId,dimension);
     if (!ValidationUtil.validatePhoneNo(phoneNo)) {
-      LOGGER.info("用户注册失败，手机号错误, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+      LOGGER.info("用户注册失败，手机号错误：register -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("手机号错误", null);
     }
     if (StringUtils.isEmpty(password)) {
-      LOGGER.info("用户注册失败，密码不能为空, registerFrom:{}, phoneNo:{}, password:{}", registerFrom, phoneNo, password);
+      LOGGER.info("用户注册失败，密码不能为空：register -> registerFrom:{}, phoneNo:{}, password:{}", registerFrom, phoneNo, password);
       return JsonResult.buildErrorStateResult("密码不能为空", null);
     }
     if (password.length() < 6 || password.length() > 12) {
-      LOGGER.info("用户注册失败，密码长度须在6位至12位之间, registerFrom:{}, phoneNo:{}, password:{}", registerFrom, phoneNo, password);
+      LOGGER.info("用户注册失败，密码长度须在6位至12位之间：register -> registerFrom:{}, phoneNo:{}, password:{}", registerFrom, phoneNo, password);
       return JsonResult.buildErrorStateResult("密码应为6-12位", null);
     }
     if (null == registerFrom) {
@@ -338,14 +335,14 @@ public class UserController implements IBaseController {
     }
     smsValidForRegister(phoneNo, verificationCode);
     if (userService.exist(phoneNo)) {
-      LOGGER.info("用户注册失败，该手机号已经被注册, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+      LOGGER.info("用户注册失败，该手机号已经被注册：register -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("该手机号已经被注册", null);
     }
     if (!userService.register(phoneNo, password, registerFrom, getIp(), channelId,btRegisterChannelId,dimension)) {
-      LOGGER.info("用户快速注册失败，请稍后重试, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+      LOGGER.info("用户快速注册失败，请稍后重试：register -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("注册失败，请稍后重试", null);
     }
-    LOGGER.info("用户注册成功, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
+    LOGGER.info("用户注册成功：register -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
     return JsonResult.buildSuccessResult(null, null);
   }
 
@@ -437,12 +434,15 @@ public class UserController implements IBaseController {
 
   private String genRandomPwd() {
     int pwdMax = PWD_BASE.length;
-    int i; // 生成的随机数
-    int count = 0; // 生成的密码的长度
+    // 生成的随机数
+    int i;
+    // 生成的密码的长度
+    int count = 0;
     StringBuffer pwd = new StringBuffer();
     Random r = new Random();
     while (count < 15) {
-      i = Math.abs(r.nextInt(pwdMax)); // 生成的数最大为36-1
+      // 生成的数最大为36-1
+      i = Math.abs(r.nextInt(pwdMax));
       if (i >= 0 && i < PWD_BASE.length) {
         pwd.append(PWD_BASE[i]);
         count++;
@@ -464,23 +464,6 @@ public class UserController implements IBaseController {
     return JsonResult.buildSuccessResult("token校验成功", userModel);
   }
 
-  private User registerFastWhenLogin(String phoneNo, Long channelId, Long registerFrom, String appChannel) {
-    String password = genRandomPwd();
-    LOGGER.info("用户快速注册, phoneNo:{}, verificationCode:{}, channelId:{}, registerFrom:{},appChannel:{}", phoneNo, channelId, registerFrom, appChannel);
-    if (!ValidationUtil.validatePhoneNo(phoneNo)) {
-      LOGGER.info("用户快速注册失败，手机号错误, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
-      throw new UserNotExistException("手机号错误");
-    }
-    if (null == registerFrom) {
-      registerFrom = 1L;
-    }
-    User newUser = userService.registerAndReturn(phoneNo, password, registerFrom);
-    if(newUser != null && newUser.getId() != null && newUser.getId() > 0){
-      LOGGER.info("用户快速注册成功, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
-    }
-    return newUser;
-  }
-
   private JsonResult loginWithHttpBasic(Long channelId, String appChannel, Long createdFrom, Merchant merchant, HttpServletRequest request, String openId,String dimension) {
     User user = verificateUserNameAndPassword(request, openId);
     if (user == null) {
@@ -516,7 +499,6 @@ public class UserController implements IBaseController {
     }
     String phoneNo = credentialArr[0];
     String pass = credentialArr[1];
-    LOGGER.info("用户正在登录... [{}]", phoneNo);
     User user = userService.findByPhoneWithCache(phoneNo);
     if (user == null || !user.getEnable()) {
       // 向该phoneNo添加错误计数器

src/main/java/cn/quantgroup/xyqb/interceptors/IPWhiteListInterceptor.java

 package cn.quantgroup.xyqb.interceptors;
 
 import cn.quantgroup.xyqb.util.IPUtil;
-import cn.quantgroup.xyqb.util.ValidationUtil;
-import com.google.common.collect.Sets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -10,16 +8,15 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Set;
 
 /**
+ * 内部服务白名单拦截器
  * Created by Administrator on 2017/5/9.
+ * @Modify by renwc
+ * @date 2017-12-06
  */
 public class IPWhiteListInterceptor implements HandlerInterceptor {
     private static final Logger LOGGER = LoggerFactory.getLogger(IPWhiteListInterceptor.class);
-
-    private static final String [] allowIPs = {"139.198.7.123"};
-    private static Set<String> allowIPSet = Sets.newHashSet(allowIPs);
     private Integer isDebug;
 
     public IPWhiteListInterceptor(Integer isDebug) {
@@ -32,10 +29,10 @@ public class IPWhiteListInterceptor implements HandlerInterceptor {
             return true;
         }
         String remoteIP = IPUtil.getRemoteIP(request);
-        if(IPUtil.whiteOf(remoteIP) || ValidationUtil.validateLocalIpv4(remoteIP) || allowIPSet.contains(remoteIP)) {
+        if(IPUtil.whiteOf(remoteIP)) {
             return true;
         }
-        LOGGER.info("非法IP尝试访问,ip:[{}]",remoteIP);
+        LOGGER.info("白名单不匹配拦截：ip={}",remoteIP);
         return false;
     }
 

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

@@ -26,10 +26,11 @@ public class IPUtil {
    * 172.20.0.0/16 - 3B私有云
    * 172.30.0.0/16 - 3C私有云
    */
-  private static final Set<String> whiteAddr = Sets.newHashSet();
+  private static final Set<String> WHITE_ADDRESS = Sets.newHashSet();
+  private static final String LOCAL_ADDRESS = "127.0.0.1";
   static {
     String[] ips = {"172.16.", "172.20.", "172.30.", "192.168.3.", "192.168.4."};
-    whiteAddr.addAll(Arrays.asList(ips));
+    WHITE_ADDRESS.addAll(Arrays.asList(ips));
   }
 
   /**
@@ -39,7 +40,7 @@ public class IPUtil {
    */
   public static final boolean whiteOf(String ipv4){
     if(ValidationUtil.validateIpv4(ipv4)){
-      for(String ipField : whiteAddr){
+      for(String ipField : WHITE_ADDRESS){
         if(ipv4.startsWith(ipField)){
           return true;
         }
@@ -71,7 +72,7 @@ public class IPUtil {
    */
   public static String getRemoteIP(HttpServletRequest request) {
     String ip = request.getHeader("x-original-client-ip");
-    if (ValidationUtil.validateIpv4(ip) && !ip.startsWith("127.")) {
+    if (ValidationUtil.validateIpv4(ip) && !Objects.equals(LOCAL_ADDRESS, ip)) {
       return ip;
     }