chore: 分支合并

src/main/java/com/youlai/system/core/security/config/SecurityConfig.java

@@ -75,8 +75,10 @@ public class SecurityConfig {
                         "/doc.html",
                         "/swagger-resources/**",
                         "/v3/api-docs/**",
+                        "/swagger-ui/**",
                         "/swagger-ui.html",
-                        "/ws/**"
+                        "/ws/**",
+                        "/ws-app/**"
                 );
     }
 

src/main/java/com/youlai/system/model/dto/CaptchaResult.java

@@ -19,6 +19,6 @@ public class CaptchaResult {
     private String verifyCodeKey;
 
     @Schema(description = "验证码图片Base64字符串")
-    private String verifyCodeBase64;
+    private String captchaImgBase64;
 
 }

src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java

@@ -99,7 +99,7 @@ public class AuthServiceImpl implements AuthService {
 
         return CaptchaResult.builder()
                 .verifyCodeKey(verifyCodeKey)
-                .verifyCodeBase64(captchaBase64)
+                .captchaImgBase64(captchaBase64)
                 .build();
     }