update 验证码

nb-auth/pom.xml

@@ -13,6 +13,10 @@
 
 
     <dependencies>
+        <dependency>
+            <groupId>com.anji-plus</groupId>
+            <artifactId>spring-boot-starter-captcha</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>delay-queue-common</artifactId>

nb-auth/src/main/java/com/nb/auth/granter/TokenParameter.java

@@ -1,5 +1,6 @@
 package com.nb.auth.granter;
 
+import com.anji.captcha.model.vo.CaptchaVO;
 import com.nb.auth.enums.GrantTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,7 +28,8 @@ public class TokenParameter implements Serializable {
     @ApiModelProperty("验证码，web账密登录、疼痛小管家手机验证码时使用")
     String code;
 
-    @ApiModelProperty("验证码key，web账密登录时使用")
+    @ApiModelProperty(value = "验证码key，web账密登录时使用",hidden = true)
+    @Deprecated
     String codeKey;
 
     @ApiModelProperty("第三方应用登陆时使用")
@@ -39,6 +41,8 @@ public class TokenParameter implements Serializable {
     @ApiModelProperty("第三方应用登录时使用的时间戳，用来获取签名")
     String timestamp;
 
+    @ApiModelProperty("行为验证码，web账密登录时使用")
+    CaptchaVO captcha;
     public void setGrantType(String grantType) {
         this.grantType = GrantTypeEnum.valueOfCode(grantType);
     }

nb-auth/src/main/java/com/nb/auth/sa/SaTokenConfig.java

@@ -61,8 +61,8 @@ public class SaTokenConfig {
         IGNORE_URL.add("/v2/api-docs/*");
         IGNORE_URL.add("/v2/api-docs");
         IGNORE_URL.add("/v1/**");
-        IGNORE_URL.add("/assist/captcha/**");
-        IGNORE_URL.add("/authority/captcha/**");
+//        IGNORE_URL.add("/assist/captcha/**");
+        IGNORE_URL.add("/**/captcha/**");
         IGNORE_URL.add("/system/curl/**");
         IGNORE_URL.add("/system/sysConfig/getTime");
         IGNORE_URL.add("/system/sysDept/**");

nb-service/app-assistant/src/main/java/com/nb/app/assistant/controller/CaptchaController.java → nb-service/app-assistant/src/main/java/com/nb/app/assistant/controller/AssistCaptchaController.java

@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/assist/captcha")
 @Api(tags = "验证码")
-public class CaptchaController {
+public class AssistCaptchaController {
     private final CaptchaUtil captchaUtil;
 
     private final ResetPswUtil resetPswUtil;

nb-service/web-service/pom.xml

@@ -13,7 +13,6 @@
 
 
     <dependencies>
-
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>app-doctor-api</artifactId>

pom.xml

@@ -43,6 +43,7 @@
         <aliyun.iot.verison>7.31.0</aliyun.iot.verison>
         <aliyun.sdk.verison>4.5.6</aliyun.sdk.verison>
         <jms.verison>0.56.0</jms.verison>
+        <anji.captcha.version>1.3.0</anji.captcha.version>
     </properties>
 
     <modules>
@@ -319,6 +320,11 @@
                 <version>${captcha.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.anji-plus</groupId>
+                <artifactId>spring-boot-starter-captcha</artifactId>
+                <version>${anji.captcha.version}</version>
+            </dependency>
 
             <!--阿里云物联网sdk-->
             <!-- https://mvnrepository.com/artifact/com.aliyun/aliyun-java-sdk-iot -->