精简代码，只影响log内容，未动业务逻辑

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

@@ -150,10 +150,10 @@ public class CaptchaFiniteValidateAdvisor {
   }
 
   /**
-   * 单次令牌参数解析
+   * 账密参数解析
    *
-   * @param request 当前请求，其首部行必须包含形如【SingleToken 13461067662:0123456789abcdef】的UTF-8编码的Base64加密参数
-   * @return 令牌参数Map 或 null
+   * @param request 当前请求
+   * @return 账密参数Map 或 null
    */
   private Map<String, String> getHeaderParam(HttpServletRequest request) {
     String verificationHeader = "Basic ";

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

@@ -66,7 +66,6 @@ public class CaptchaValidateAdvisor {
   private void needCaptchaValidate() {
   }
 
-
   /**
    * 在受图形验证码保护的接口方法执行前, 执行图形验证码校验
    *

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

@@ -83,8 +83,7 @@ public class AppController implements IBaseController {
       return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
     }
 
-    String requestIp = IPUtil.getRemoteIP(request);
-    LOGGER.info("app/login第三方用户登录, loginFrom:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom,channelId,btRegisterChannelId, requestIp,idNo,name);
+    LOGGER.info("app/login第三方用户登录, loginFrom:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom,channelId,btRegisterChannelId, IPUtil.getRemoteIP(request),idNo,name);
     User user = userService.findByPhoneInDb(phoneNo);
     if (user == null) {
       user = register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId);
@@ -129,8 +128,7 @@ public class AppController implements IBaseController {
       return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
     }
 
-    String requestIp = IPUtil.getRemoteIP(request);
-    LOGGER.info("第三方用户登录, loginFrom:{},channelId:{}, requestIp:{}", registerFrom,channelId, requestIp);
+    LOGGER.info("第三方用户登录, loginFrom:{},channelId:{}, requestIp:{}", registerFrom,channelId, IPUtil.getRemoteIP(request));
     User user = userService.findByPhoneInDb(phoneNo);
 
     if (user == null) {
@@ -168,8 +166,7 @@ public class AppController implements IBaseController {
       return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
     }
 
-    String requestIp = IPUtil.getRemoteIP(request);
-    LOGGER.info("app/login_super第三方用户登录, loginFrom:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom,channelId,btRegisterChannelId, requestIp,idNo,name);
+    LOGGER.info("app/login_super第三方用户登录, loginFrom:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom,channelId,btRegisterChannelId, IPUtil.getRemoteIP(request),idNo,name);
     User user = userService.findByPhoneInDb(phoneNo);
     if (user == null) {
       user = register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId);

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

@@ -422,8 +422,7 @@ public class InnerController implements IBaseController {
       return JsonResult.buildErrorStateResult("修改联系人不存在", null);
     }
     contact = contactService.saveContact(name, phoneNo, relation, contact);
-    String ip= IPUtil.getRemoteIP(request);
-    LOGGER.info("修改后联系人信息:{},修改原因：{},操作ip:{}",contact,reason,ip);
+    LOGGER.info("修改后联系人信息:{},修改原因：{},操作ip:{}",contact,reason,IPUtil.getRemoteIP(request));
 
     return JsonResult.buildSuccessResult("修改联系人成功", contact);
   }

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

@@ -235,12 +235,11 @@ public class SmsController implements IBaseController {
     String verificationPhoneCountKey = Constants.REDIS_SMS_CODE_COUNT + phoneNo;
     Long getPhoneVerificationCount = redisTemplate.opsForHash().increment(verificationPhoneCountKey, Constants.REDIS_SMS_CODE_COUNT, 1);
     redisTemplate.expire(verificationPhoneCountKey, DateUtils.getSeconds(), TimeUnit.SECONDS);
-
+    String clientIp = getIp();
     if (getPhoneVerificationCount > PHONE_MAX_PER_DAY) {
-      LOGGER.info("您手机号已经达到获取今天短信验证码上限:phoneNo:{},deviceId:{},ip:{}",phoneNo,deviceId,getIp());
+      LOGGER.info("您手机号已经达到获取今天短信验证码上限:phoneNo:{},deviceId:{},ip:{}",phoneNo,deviceId,clientIp);
       return JsonResult.buildErrorStateResult("今天已获取20次短信验证码，请使用语音验证码或明天再试", null);
     }
-    String clientIp = getIp();
     // Todo - 运维解决真实IP获取问题后，打开这段代码，实现按IP限制短信验证码获取量
     // Todo - 另：当前的计数器计数方式为乐观累加，而且还是提前计数，会导致边界值问题，即临界次数会提前一次记满，并且在后续请求到达时计数器会继续计数
     /*
@@ -251,13 +250,13 @@ public class SmsController implements IBaseController {
         return JsonResult.buildErrorStateResult("您当前ip已经达到获取今天验证码上限", null);
       }
     }*/
-    LOGGER.info("请求短信新版本接口:phoneNo:{},deviceId:{},IP:{}",phoneNo,deviceId,getIp());
+    LOGGER.info("请求短信新版本接口:phoneNo:{},deviceId:{},IP:{}",phoneNo,deviceId,clientIp);
     if (!StringUtils.isEmpty(deviceId)) {
       String verificationDeviceCountKey = Constants.REDIS_SMS_DEVICE_COUNT + deviceId;
       Long getDeviceVerificationCount = redisTemplate.opsForHash().increment(verificationDeviceCountKey, Constants.REDIS_SMS_DEVICE_COUNT, 1);
       redisTemplate.expire(verificationDeviceCountKey, DateUtils.getSeconds(), TimeUnit.SECONDS);
       if (getDeviceVerificationCount > DEVICE_MAX_PER_DAY) {
-        LOGGER.info("您设备已经达到获取今天短信验证码上限:phoneNo:{},deviceId:{},ip:{}",phoneNo,verificationDeviceCountKey,getIp());
+        LOGGER.info("您设备已经达到获取今天短信验证码上限:phoneNo:{},deviceId:{},ip:{}",phoneNo,verificationDeviceCountKey,clientIp);
         return JsonResult.buildErrorStateResult("您设备已经达到获取今天短信验证码上限", null);
       }
     }
@@ -265,7 +264,7 @@ public class SmsController implements IBaseController {
     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,getIp());
+      LOGGER.info("sendVerificationCode2New1分钟内不能重复获取验证码:phoneNo:{},deviceId:{},ip:{}",phoneNo,deviceId,clientIp);
       return JsonResult.buildErrorStateResult("1分钟内不能重复获取验证码", null);
     }
     String randomCode = smsIsDebug ? "0000" : String.valueOf(random.nextInt(8999) + 1000);
@@ -280,10 +279,10 @@ public class SmsController implements IBaseController {
       if(isApp && needImageVlidate(clientIp,deviceId,phoneNo)){
         return JsonResult.buildSuccessResult("发送成功", uniqueId,0003L);
       }
-      LOGGER.info("sendVerificationCode2New获取短信成功:phone:{},deviceId:{},ip:{}",phoneNo,deviceId,getIp());
+      LOGGER.info("sendVerificationCode2New获取短信成功:phone:{},deviceId:{},ip:{}",phoneNo,deviceId,clientIp);
       return JsonResult.buildSuccessResult("发送成功", uniqueId);
     } catch (Exception e) {
-      LOGGER.error("发送短信验证码失败:phone:{},deviceId:{},ip:{}",phoneNo,deviceId,getIp());
+      LOGGER.error("发送短信验证码失败:phone:{},deviceId:{},ip:{}",phoneNo,deviceId,clientIp);
       return JsonResult.buildErrorStateResult("发送失败", null);
     }
   }