修改常量的命名

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

@@ -100,11 +100,11 @@ public interface Constants {
   String FN_GEETEST_VALIDATE = "geetest_validate";
   String FN_GEETEST_SECCODE = "geetest_seccode";
   /** 验证类型请求参数名 */
-  String TEST_PARAM = "testType";
+  String VERIFY_PARAM = "verifyType";
   /** 验证类型 - 极验 */
-  String TEST_TYPE_GT = "gt";
+  String VERIFY_TYPE_GT = "gt";
   /** 验证类型 - 量化派图形验证 */
-  String TEST_TYPE_QG = "qg";
+  String VERIFY_TYPE_QG = "qg";
   // -- End -- 验证码常量组
 
 }

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

@@ -51,7 +51,7 @@ public class CaptchaNewValidateAdvisor {
     private Object doCaptchaValidate(ProceedingJoinPoint pjp) throws Throwable {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         // 验证码类别：gt - 极验，qg - 量化派图形验证
-        if (Objects.equals(Constants.TEST_TYPE_GT, request.getParameter(Constants.TEST_PARAM))) {
+        if (Objects.equals(Constants.VERIFY_TYPE_GT, request.getParameter(Constants.VERIFY_PARAM))) {
             if(gtValid(request)){
                 return pjp.proceed();
             }else{

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

@@ -11,13 +11,11 @@ import cn.quantgroup.xyqb.util.IPUtil;
 import cn.quantgroup.xyqb.util.PasswordUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.json.JSONObject;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -46,11 +44,11 @@ public class NewCaptchaController {
         Map<String, String> data = new HashMap<String, String>();
         // 优先获取极验
         Map<String, String> imgMap = geetestCaptchaService.fetchGeetestCaptcha(PasswordUtil.MD5(phoneNo), IPUtil.getRemoteIP(request), ClientType.valueByName(clientType));
-        data.put(Constants.TEST_PARAM, Constants.TEST_TYPE_GT);
+        data.put(Constants.VERIFY_PARAM, Constants.VERIFY_TYPE_GT);
         // 备选方案：量化派图形验证码
         if(Objects.isNull(imgMap) || imgMap.isEmpty()){
             imgMap = quantgroupCaptchaService.fetchQuantgroupCaptcha(request.getLocale());
-            data.put(Constants.TEST_PARAM, Constants.TEST_TYPE_QG);
+            data.put(Constants.VERIFY_PARAM, Constants.VERIFY_TYPE_QG);
         }
         // 返回结果
         if(Objects.isNull(imgMap) || imgMap.isEmpty()){