From d1c35f06e175e0ff63347a5ed5e09788163dccb7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:42 +0800
Subject: [PATCH] 修改权限控制逻辑
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java | 9 ----
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java | 12 ++++++
/dev/null | 31 ---------------
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/filter/AuthFilter.java | 9 ----
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java | 9 ----
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java | 9 ----
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java | 9 ----
7 files changed, 12 insertions(+), 76 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java
index e9dcae1..392bd32 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java
@@ -43,20 +43,11 @@
@Resource
private ISysUserService sysUserService;
- @Autowired
- private IgnoreWhiteProperties ignoreWhite;
-
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
HttpServletRequest request = (HttpServletRequest) servletRequest;
HttpServletResponse response = (HttpServletResponse) servletResponse;
- // 跳过不需要验证的路径
- String url = request.getRequestURI();
- if (StringUtils.matches(url, ignoreWhite.getWhites())) {
- filterChain.doFilter(request, response);
- return;
- }
String userid = request.getHeader("user_id");
if(StringUtils.isEmpty(userid)){
filterChain.doFilter(request, response);
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/IgnoreWhiteProperties.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/IgnoreWhiteProperties.java
deleted file mode 100644
index 697c631..0000000
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/IgnoreWhiteProperties.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.ruoyi.system.filter;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 放行白名单配置
- *
- * @author ruoyi
- */
-@Configuration
-@RefreshScope
-@ConfigurationProperties(prefix = "security.ignore")
-public class IgnoreWhiteProperties {
- /**
- * 放行白名单配置，网关不校验此处的白名单
- */
- private List<String> whites = new ArrayList<>();
-
- public List<String> getWhites() {
- return whites;
- }
-
- public void setWhites(List<String> whites) {
- this.whites = whites;
- }
-}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
index 12b3094..de9af48 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
@@ -67,4 +67,16 @@
appletUserDecodeData.setOpenId(openid);
return AjaxResult.success(appUserService.wxLogin(appletUserDecodeData,data.getInviteUserId()));
}
+
+
+ /**
+ * 测试用
+ * @param appletUserDecodeData
+ * @return
+ */
+ @ApiOperation(value = "通过code获得openid,获取用户信息",tags = {"微信小程序登录"})
+ @PostMapping("/openIdByJsCodeTest")
+ public AjaxResult<Map<String, Object>> openIdByJsCode(@RequestBody AppletUserDecodeData appletUserDecodeData) {
+ return AjaxResult.success(appUserService.wxLogin(appletUserDecodeData, null));
+ }
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
index 9acaeb0..68fa2ca 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
@@ -41,21 +41,12 @@
@Lazy
@Resource
private SysUserClient sysUserClient;
-
- @Autowired
- private IgnoreWhiteProperties ignoreWhite;
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
HttpServletRequest request = (HttpServletRequest) servletRequest;
HttpServletResponse response = (HttpServletResponse) servletResponse;
- // 跳过不需要验证的路径
- String url = request.getRequestURI();
- if (StringUtils.matches(url, ignoreWhite.getWhites())) {
- filterChain.doFilter(request, response);
- return;
- }
String userid = request.getHeader("user_id");
if(StringUtils.isEmpty(userid)){
filterChain.doFilter(request, response);
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/IgnoreWhiteProperties.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/IgnoreWhiteProperties.java
deleted file mode 100644
index a89b9f3..0000000
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/IgnoreWhiteProperties.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.ruoyi.account.filter;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 放行白名单配置
- *
- * @author ruoyi
- */
-@Configuration
-@RefreshScope
-@ConfigurationProperties(prefix = "security.ignore")
-public class IgnoreWhiteProperties {
- /**
- * 放行白名单配置，网关不校验此处的白名单
- */
- private List<String> whites = new ArrayList<>();
-
- public List<String> getWhites() {
- return whites;
- }
-
- public void setWhites(List<String> whites) {
- this.whites = whites;
- }
-}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/filter/AuthFilter.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/filter/AuthFilter.java
index a7892f8..b0304bb 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/filter/AuthFilter.java
@@ -42,20 +42,11 @@
@Resource
private SysUserClient sysUserClient;
- @Autowired
- private IgnoreWhiteProperties ignoreWhite;
-
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
HttpServletRequest request = (HttpServletRequest) servletRequest;
HttpServletResponse response = (HttpServletResponse) servletResponse;
- // 跳过不需要验证的路径
- String url = request.getRequestURI();
- if (StringUtils.matches(url, ignoreWhite.getWhites())) {
- filterChain.doFilter(request, response);
- return;
- }
String userid = request.getHeader("user_id");
if(StringUtils.isEmpty(userid)){
filterChain.doFilter(request, response);
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/filter/IgnoreWhiteProperties.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/filter/IgnoreWhiteProperties.java
deleted file mode 100644
index 153801a..0000000
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/filter/IgnoreWhiteProperties.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.ruoyi.chargingPile.filter;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 放行白名单配置
- *
- * @author ruoyi
- */
-@Configuration
-@RefreshScope
-@ConfigurationProperties(prefix = "security.ignore")
-public class IgnoreWhiteProperties {
- /**
- * 放行白名单配置，网关不校验此处的白名单
- */
- private List<String> whites = new ArrayList<>();
-
- public List<String> getWhites() {
- return whites;
- }
-
- public void setWhites(List<String> whites) {
- this.whites = whites;
- }
-}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
index a590248..6b55938 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
@@ -42,20 +42,11 @@
@Resource
private SysUserClient sysUserClient;
- @Autowired
- private IgnoreWhiteProperties ignoreWhite;
-
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
HttpServletRequest request = (HttpServletRequest) servletRequest;
HttpServletResponse response = (HttpServletResponse) servletResponse;
- // 跳过不需要验证的路径
- String url = request.getRequestURI();
- if (StringUtils.matches(url, ignoreWhite.getWhites())) {
- filterChain.doFilter(request, response);
- return;
- }
String userid = request.getHeader("user_id");
if(StringUtils.isEmpty(userid)){
filterChain.doFilter(request, response);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/IgnoreWhiteProperties.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/IgnoreWhiteProperties.java
deleted file mode 100644
index 01728a9..0000000
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/IgnoreWhiteProperties.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.ruoyi.order.filter;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 放行白名单配置
- *
- * @author ruoyi
- */
-@Configuration
-@RefreshScope
-@ConfigurationProperties(prefix = "security.ignore")
-public class IgnoreWhiteProperties {
- /**
- * 放行白名单配置，网关不校验此处的白名单
- */
- private List<String> whites = new ArrayList<>();
-
- public List<String> getWhites() {
- return whites;
- }
-
- public void setWhites(List<String> whites) {
- this.whites = whites;
- }
-}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java
index efd1149..dc20ae9 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java
@@ -42,20 +42,11 @@
@Resource
private SysUserClient sysUserClient;
- @Autowired
- private IgnoreWhiteProperties ignoreWhite;
-
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
HttpServletRequest request = (HttpServletRequest) servletRequest;
HttpServletResponse response = (HttpServletResponse) servletResponse;
- // 跳过不需要验证的路径
- String url = request.getRequestURI();
- if (StringUtils.matches(url, ignoreWhite.getWhites())) {
- filterChain.doFilter(request, response);
- return;
- }
String userid = request.getHeader("user_id");
if(StringUtils.isEmpty(userid)){
filterChain.doFilter(request, response);
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/IgnoreWhiteProperties.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/IgnoreWhiteProperties.java
deleted file mode 100644
index 90a242f..0000000
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/IgnoreWhiteProperties.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.ruoyi.other.filter;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 放行白名单配置
- *
- * @author ruoyi
- */
-@Configuration
-@RefreshScope
-@ConfigurationProperties(prefix = "security.ignore")
-public class IgnoreWhiteProperties {
- /**
- * 放行白名单配置，网关不校验此处的白名单
- */
- private List<String> whites = new ArrayList<>();
-
- public List<String> getWhites() {
- return whites;
- }
-
- public void setWhites(List<String> whites) {
- this.whites = whites;
- }
-}
--
Gitblit v1.7.1