From 394935af53da986ae1108b3d08022279781f8f34 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 26 十月 2022 16:57:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/sys/TokenService.java | 6 +-----
src/main/java/com/lf/server/service/sys/BlacklistService.java | 1 -
src/main/java/com/lf/server/interceptor/AuthInterceptor.java | 16 ++++++++++------
src/main/java/com/lf/server/service/all/SysService.java | 25 +++++++++++++++++++++++++
src/main/java/com/lf/server/service/data/StyleService.java | 1 -
src/main/java/com/lf/server/service/sys/DepService.java | 1 -
src/main/java/com/lf/server/service/data/VerService.java | 1 -
src/main/java/com/lf/server/service/all/SignService.java | 2 +-
src/main/java/com/lf/server/config/WebConfig.java | 6 +++---
9 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/lf/server/config/WebConfig.java b/src/main/java/com/lf/server/config/WebConfig.java
index 263224b..529efac 100644
--- a/src/main/java/com/lf/server/config/WebConfig.java
+++ b/src/main/java/com/lf/server/config/WebConfig.java
@@ -4,7 +4,7 @@
import com.alibaba.fastjson.support.config.FastJsonConfig;
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
import com.lf.server.interceptor.AuthInterceptor;
-import com.lf.server.service.sys.TokenService;
+import com.lf.server.service.all.SysService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.converter.HttpMessageConverter;
@@ -21,7 +21,7 @@
@Configuration
public class WebConfig extends WebMvcConfigurationSupport {
@Autowired
- private TokenService tokenService;
+ private SysService sysService;
/**
* 鑾峰彇鎷︽埅鍣ㄥ璞�
@@ -29,7 +29,7 @@
* @return
*/
public AuthInterceptor getAuthBean() {
- return new AuthInterceptor(tokenService);
+ return new AuthInterceptor(sysService);
}
/**
diff --git a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
index 4389d7c..2b49a65 100644
--- a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
+++ b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
@@ -5,6 +5,7 @@
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
+import com.lf.server.service.all.SysService;
import com.lf.server.service.sys.TokenService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -22,7 +23,7 @@
*/
@Configuration
public class AuthInterceptor implements HandlerInterceptor {
- private TokenService tokenService;
+ private SysService sysService;
private static final Log log = LogFactory.getLog(AuthInterceptor.class);
@@ -34,8 +35,8 @@
private static final String NO_AUTH = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.NO_AUTH_ERROR, "鏃犳潈闄愯闂�"));
- public AuthInterceptor(TokenService tokenService) {
- this.tokenService = tokenService;
+ public AuthInterceptor(SysService sysService) {
+ this.sysService = sysService;
}
/**
@@ -55,12 +56,15 @@
return WebHelper.write2Page(response, NO_TOKEN);
}
- UserEntity ue = tokenService.getCurrentUser(request);
+ //String ip = WebHelper.getIpAddress(request);
+ //List<String> blackList=
+
+ UserEntity ue = sysService.tokenService.getCurrentUser(request);
if (ue == null) {
return WebHelper.write2Page(response, NO_LOGIN);
}
- if (tokenService.isUidDisable(ue)) {
+ if (sysService.tokenService.isUidDisable(ue)) {
return WebHelper.write2Page(response, USER_LOCK);
}
@@ -95,7 +99,7 @@
* 妫�鏌ユ潈闄�
*/
private boolean checkPerms(UserEntity ue, HttpServletRequest request) {
- List<String> list = tokenService.permsService.selectPerms(ue.getUid());
+ List<String> list = sysService.permsService.selectPerms(ue.getUid());
if (list == null || list.size() == 0) {
return false;
}
diff --git a/src/main/java/com/lf/server/service/all/SignService.java b/src/main/java/com/lf/server/service/all/SignService.java
index 143b422..bba4155 100644
--- a/src/main/java/com/lf/server/service/all/SignService.java
+++ b/src/main/java/com/lf/server/service/all/SignService.java
@@ -25,7 +25,7 @@
* 绛惧悕鏈嶅姟绫�
* @author WWW
*/
-@Service("sysService")
+@Service
public class SignService {
@Autowired
PropertiesConfig propertiesConfig;
diff --git a/src/main/java/com/lf/server/service/all/SysService.java b/src/main/java/com/lf/server/service/all/SysService.java
new file mode 100644
index 0000000..95f6234
--- /dev/null
+++ b/src/main/java/com/lf/server/service/all/SysService.java
@@ -0,0 +1,25 @@
+package com.lf.server.service.all;
+
+import com.lf.server.service.sys.BlacklistService;
+import com.lf.server.service.sys.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 绯荤粺鏈嶅姟绫�
+ * @author WWW
+ */
+@Service
+public class SysService {
+ @Autowired
+ public TokenService tokenService;
+
+ @Autowired
+ public RedisService redisService;
+
+ @Autowired
+ public PermsService permsService;
+
+ @Autowired
+ public BlacklistService blacklistService;
+}
diff --git a/src/main/java/com/lf/server/service/data/StyleService.java b/src/main/java/com/lf/server/service/data/StyleService.java
index 4228f84..35d7423 100644
--- a/src/main/java/com/lf/server/service/data/StyleService.java
+++ b/src/main/java/com/lf/server/service/data/StyleService.java
@@ -13,7 +13,6 @@
* @author sws
* @date 2022-09-26
*/
-
@Service
public class StyleService implements StyleMapper {
@Autowired
diff --git a/src/main/java/com/lf/server/service/data/VerService.java b/src/main/java/com/lf/server/service/data/VerService.java
index 2925e05..c791afa 100644
--- a/src/main/java/com/lf/server/service/data/VerService.java
+++ b/src/main/java/com/lf/server/service/data/VerService.java
@@ -12,7 +12,6 @@
* @author sws
* @date 2022-09-29
*/
-
@Service
public class VerService implements VerMapper {
@Autowired
diff --git a/src/main/java/com/lf/server/service/sys/BlacklistService.java b/src/main/java/com/lf/server/service/sys/BlacklistService.java
index f7d8fc7..f2fdcc2 100644
--- a/src/main/java/com/lf/server/service/sys/BlacklistService.java
+++ b/src/main/java/com/lf/server/service/sys/BlacklistService.java
@@ -1,6 +1,5 @@
package com.lf.server.service.sys;
-import com.lf.server.entity.all.MenusAuthEntity;
import com.lf.server.entity.all.RedisCacheKey;
import com.lf.server.entity.all.SettingData;
import com.lf.server.entity.sys.BlacklistEntity;
diff --git a/src/main/java/com/lf/server/service/sys/DepService.java b/src/main/java/com/lf/server/service/sys/DepService.java
index def2859..88d2ebc 100644
--- a/src/main/java/com/lf/server/service/sys/DepService.java
+++ b/src/main/java/com/lf/server/service/sys/DepService.java
@@ -12,7 +12,6 @@
* @author sws
* @date 2022-09-23
*/
-
@Service
public class DepService implements DepMapper {
@Autowired
diff --git a/src/main/java/com/lf/server/service/sys/TokenService.java b/src/main/java/com/lf/server/service/sys/TokenService.java
index 9d487f7..8678a50 100644
--- a/src/main/java/com/lf/server/service/sys/TokenService.java
+++ b/src/main/java/com/lf/server/service/sys/TokenService.java
@@ -8,7 +8,6 @@
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
import com.lf.server.mapper.sys.TokenMapper;
-import com.lf.server.service.all.PermsService;
import com.lf.server.service.all.RedisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -37,10 +36,7 @@
LoginService loginService;
@Autowired
- public RedisService redisService;
-
- @Autowired
- public PermsService permsService;
+ RedisService redisService;
@Override
public Integer selectCount(String name, Integer type) {
--
Gitblit v1.9.3