diff --git a/pom.xml b/pom.xml
index 86b7d31..c086230 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,11 @@
sqlite-jdbc
3.32.3.2
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ true
+
org.springframework.boot
spring-boot-starter-test
diff --git a/src/main/java/com/common/base/config/FrameConfig.java b/src/main/java/com/common/base/config/FrameConfig.java
new file mode 100644
index 0000000..803e2ec
--- /dev/null
+++ b/src/main/java/com/common/base/config/FrameConfig.java
@@ -0,0 +1,14 @@
+package com.common.base.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "frame")
+public class FrameConfig {
+ private Boolean isRedisLogin = false;
+ private Integer loginTimeout = 4;
+ private Boolean showControllerLog = true;
+}
diff --git a/src/main/java/com/common/base/druid/DruidConfig.java b/src/main/java/com/common/base/druid/DruidConfig.java
index 4fd10bf..6616879 100644
--- a/src/main/java/com/common/base/druid/DruidConfig.java
+++ b/src/main/java/com/common/base/druid/DruidConfig.java
@@ -19,11 +19,6 @@ import java.util.Map;
@Configuration
public class DruidConfig implements WebMvcConfigurer {
- @ConfigurationProperties(prefix = "spring.datasource")
- @Bean
- public DataSource druid(){
- return new DruidDataSource();
- }
@ConfigurationProperties(prefix = "druid")
@Bean
diff --git a/src/main/java/com/common/base/log/RequestLogAspect.java b/src/main/java/com/common/base/log/RequestLogAspect.java
index 4df6262..49f19e1 100644
--- a/src/main/java/com/common/base/log/RequestLogAspect.java
+++ b/src/main/java/com/common/base/log/RequestLogAspect.java
@@ -1,6 +1,8 @@
package com.common.base.log;
import com.alibaba.fastjson.JSON;
+import com.common.base.config.FrameConfig;
+import com.common.base.druid.DruidAuth;
import com.common.base.log.model.RequestErrorInfo;
import com.common.base.log.model.RequestInfo;
import org.aspectj.lang.JoinPoint;
@@ -12,7 +14,10 @@ import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -30,12 +35,16 @@ import java.util.*;
public class RequestLogAspect {
private final static Logger LOGGER = LoggerFactory.getLogger(RequestLogAspect.class);
+ public RequestLogAspect(FrameConfig frameConfig) {
+ this.frameConfig = frameConfig;
+ }
+
@Pointcut("execution(public * com..*.controller..*(..))")
public void requestServer() {
}
- @Value("${show-controller-log}")
- public boolean flag;
+ final
+ FrameConfig frameConfig;
@Around("requestServer()")
public Object doAround(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
@@ -45,7 +54,7 @@ public class RequestLogAspect {
HttpServletRequest request = attributes.getRequest();
Object result = proceedingJoinPoint.proceed();
- if (flag) {
+ if (frameConfig.getShowControllerLog()) {
RequestInfo requestInfo = new RequestInfo();
requestInfo.setIp(request.getRemoteAddr());
requestInfo.setUrl(request.getRequestURL().toString());
diff --git a/src/main/java/com/common/base/shiro/CustomRealm.java b/src/main/java/com/common/base/shiro/CustomRealm.java
index f24e081..0c9cc9e 100644
--- a/src/main/java/com/common/base/shiro/CustomRealm.java
+++ b/src/main/java/com/common/base/shiro/CustomRealm.java
@@ -1,6 +1,7 @@
package com.common.base.shiro;
+import com.common.base.config.FrameConfig;
import com.common.base.shiro.service.ShiroService;
import com.common.base.shiro.service.SystemRealm;
import com.common.base.utils.RedisUtil;
@@ -8,6 +9,7 @@ import org.apache.shiro.authc.*;
import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.subject.PrincipalCollection;
+import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import java.util.Date;
@@ -21,6 +23,9 @@ public class CustomRealm extends AuthorizingRealm {
@Resource
private RedisUtil redisUtil;
+ @Autowired
+ FrameConfig frameConfig;
+
@Resource
private SystemRealm systemRealm;
@@ -35,8 +40,8 @@ public class CustomRealm extends AuthorizingRealm {
protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) {
String accessToken = (String) token.getPrincipal();
String userId;
- if (RedisUtil.isUseful) {
- Map