From 8af85e80663836a2f893be7c6feaefdf92bc93a6 Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期一, 19 九月 2022 20:30:46 +0800
Subject: [PATCH] !234 【轻量级 PR】使用 `@SaIgnore` 替换 `@Anonymous ` Merge pull request !234 from MichelleChung/dev
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java | 4 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 10 +++++-----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java | 4 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 4 ++--
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java | 7 +++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java | 4 ++--
6 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
index 60c632a..94630e2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -1,11 +1,11 @@
package com.ruoyi.web.controller.common;
+import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.captcha.AbstractCaptcha;
import cn.hutool.captcha.generator.CodeGenerator;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
-import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.R;
@@ -35,7 +35,7 @@
*
* @author Lion Li
*/
-@Anonymous
+@SaIgnore
@Slf4j
@Validated
@RequiredArgsConstructor
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
index 1d98892..6982574 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
@@ -1,6 +1,6 @@
package com.ruoyi.web.controller.system;
-import com.ruoyi.common.annotation.Anonymous;
+import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
@@ -24,7 +24,7 @@
/**
* 璁块棶棣栭〉锛屾彁绀鸿
*/
- @Anonymous
+ @SaIgnore
@GetMapping("/")
public String index() {
return StringUtils.format("娆㈣繋浣跨敤{}鍚庡彴绠＄悊妗嗘灦锛屽綋鍓嶇増鏈細v{}锛岃閫氳繃鍓嶇鍦板潃璁块棶銆�", ruoyiConfig.getName(), ruoyiConfig.getVersion());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index d4d0570..65e11f2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,6 +1,6 @@
package com.ruoyi.web.controller.system;
-import com.ruoyi.common.annotation.Anonymous;
+import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysMenu;
@@ -47,7 +47,7 @@
* @param loginBody 鐧诲綍淇℃伅
* @return 缁撴灉
*/
- @Anonymous
+ @SaIgnore
@PostMapping("/login")
public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
Map<String, Object> ajax = new HashMap<>();
@@ -64,7 +64,7 @@
* @param smsLoginBody 鐧诲綍淇℃伅
* @return 缁撴灉
*/
- @Anonymous
+ @SaIgnore
@PostMapping("/smsLogin")
public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
Map<String, Object> ajax = new HashMap<>();
@@ -80,7 +80,7 @@
* @param xcxCode 灏忕▼搴廲ode
* @return 缁撴灉
*/
- @Anonymous
+ @SaIgnore
@PostMapping("/xcxLogin")
public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
Map<String, Object> ajax = new HashMap<>();
@@ -93,7 +93,7 @@
/**
* 閫�鍑虹櫥褰�
*/
- @Anonymous
+ @SaIgnore
@PostMapping("/logout")
public R<Void> logout() {
loginService.logout();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
index 5c3a677..2644582 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
@@ -1,6 +1,6 @@
package com.ruoyi.web.controller.system;
-import com.ruoyi.common.annotation.Anonymous;
+import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.RegisterBody;
@@ -28,7 +28,7 @@
/**
* 鐢ㄦ埛娉ㄥ唽
*/
- @Anonymous
+ @SaIgnore
@PostMapping("/register")
public R<Void> register(@Validated @RequestBody RegisterBody user) {
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java
index fe28100..51eaf08 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java
@@ -1,5 +1,7 @@
package com.ruoyi.common.annotation;
+import cn.dev33.satoken.annotation.SaIgnore;
+
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -10,7 +12,9 @@
* 鍖垮悕璁块棶涓嶉壌鏉冩敞瑙�
*
* @author ruoyi
+ * @deprecated 灏嗗湪鍚庣画鐗堟湰浣跨敤Sa-Token娉ㄨВ {@link SaIgnore} 浠ｆ浛
*/
+@Deprecated
@Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java
index b77f237..99d2eae 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ExcludeUrlProperties.java
@@ -1,5 +1,7 @@
package com.ruoyi.framework.config.properties;
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.dev33.satoken.interceptor.SaInterceptor;
import cn.hutool.core.util.ReUtil;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.utils.spring.SpringUtils;
@@ -13,6 +15,8 @@
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import org.springframework.web.util.pattern.PathPattern;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.regex.Pattern;
@@ -20,7 +24,10 @@
* 璁剧疆娉ㄨВ鍏佽鍖垮悕璁块棶鐨剈rl
*
* @author Lion Li
+ * @deprecated 灏嗗湪鍚庣画鐗堟湰浣跨敤Sa-Token娉ㄨВ {@link SaIgnore} 浠ｆ浛锛�
+ * 搴曞眰杩囨护鏂规硶璇﹁ {@link SaInterceptor#preHandle(HttpServletRequest, HttpServletResponse, Object)}
*/
+@Deprecated
@Lazy
@Component
public class ExcludeUrlProperties implements InitializingBean {
--
Gitblit v1.9.3