2021年6月9日-配置整改

4dkankan-user-application/src/main/resources/application-dev.properties

@@ -1,5 +1,4 @@
-#应用名
-spring.application.name=4dkankan-user
+
 #注册中心
 spring.cloud.nacos.discovery.server-addr=8.135.98.231:8848
 spring.cloud.nacos.discovery.namespace=31b3ac3b-ba06-4be7-9cbf-69a8df190dfe
@@ -41,3 +40,6 @@ logging.path=/home/tomcat/4dkankan-user-8010/4dkankan-user-log
 logging.config=classpath:logback-spring.xml
 logging.level.com.fdkankan=debug
 
+
+#权限校验开关
+isOpenAuth = false

4dkankan-user-application/src/main/resources/application-pro.properties

@@ -1,5 +1,4 @@
-#应用名
-spring.application.name=4dkankan-user
+
 #注册中心
 spring.cloud.nacos.discovery.server-addr=10.71.9.205:80
 

4dkankan-user-application/src/main/resources/application-test.properties

@@ -1,14 +1,13 @@
-#应用名
-spring.application.name=4dkankan-user
+
 #注册中心
-spring.cloud.nacos.discovery.server-addr=10.71.5.163:80
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:80
 
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.druid.url=jdbc:mysql://10.71.184.146:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=user_4dkankan_rw
-spring.datasource.druid.password=y2b9a42wRwGNKkJjCm1o
+spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.username=root
+spring.datasource.password=4DAGE168!a
 
 
 spring.datasource.druid.initial-size=5
@@ -27,10 +26,10 @@ spring.datasource.druid.stat-view-servlet.enabled=true
 
 #logging.file=log/xiaoan.log
 
-spring.redis.cluster.nodes=10.71.184.237:7000,10.71.184.181:7000,10.71.184.217:7000,10.71.184.188:7000,10.71.184.222:7000,10.71.184.200:7000
+spring.redis.cluster.nodes=10.1.152.54:6379
 spring.redis.database=0
-spring.redis.password=QBzhHTxfcYLTs0n5J5VQ
-spring.redis.timeout=3000ms
+spring.redis.password=
+spring.redis.timeout=5000ms
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 spring.redis.jedis.pool.max-active=8

4dkankan-user-application/src/main/resources/application-uat.properties

@@ -0,0 +1,41 @@
+
+#注册中心
+spring.cloud.nacos.discovery.server-addr=10.71.5.163:80
+
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.druid.url=jdbc:mysql://10.71.184.146:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.username=user_4dkankan_rw
+spring.datasource.druid.password=y2b9a42wRwGNKkJjCm1o
+
+
+spring.datasource.druid.initial-size=5
+spring.datasource.druid.min-idle=10
+spring.datasource.druid.max-active=20
+spring.datasource.druid.max-wait=60000
+spring.datasource.druid.time-between-eviction-runs-millis=60000
+spring.datasource.druid.min-evictable-idle-time-millis=30000
+spring.datasource.druid.max-evictable-idle-time-millis=90000
+spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
+spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=false
+spring.datasource.druid.test-on-return=false
+spring.datasource.druid.web-stat-filter.enabled=true
+spring.datasource.druid.stat-view-servlet.enabled=true
+
+#logging.file=log/xiaoan.log
+
+spring.redis.cluster.nodes=10.71.184.237:7000,10.71.184.181:7000,10.71.184.217:7000,10.71.184.188:7000,10.71.184.222:7000,10.71.184.200:7000
+spring.redis.database=0
+spring.redis.password=QBzhHTxfcYLTs0n5J5VQ
+spring.redis.timeout=3000ms
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1ms
+
+#log
+logging.path=/home/tomcat/4dkankan-user-8010/4dkankan-user-log
+logging.config=classpath:logback-spring.xml
+logging.level.com.fdkankan=debug

4dkankan-user-application/src/main/resources/application.properties

@@ -2,6 +2,9 @@ server.port=8010
 
 spring.profiles.active=dev
 
+#应用名
+spring.application.name=4dkankan-user
+
 #mybatis
 #mybatis.mapper-locations=classpath:mapper/*.xml
 #mybatis.type-aliases-package=com.xiaoan.dao.*

4dkankan-user-common/src/main/java/com/fdkankan/common/config/KankanGlobalConfig.java

@@ -0,0 +1,23 @@
+package com.fdkankan.common.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+/**
+ * 全局配置
+ * @author zhujh
+ */
+@Configuration
+@PropertySource("classpath:base.properties")
+@Data
+public class KankanGlobalConfig {
+
+    /**
+     * 是否打开鉴权
+     */
+    @Value("${isOpenAuth}")
+    private Boolean isOpenAuth;
+
+}

4dkankan-user-common/src/main/resources/base.properties

@@ -0,0 +1,2 @@
+#权限校验开关
+isOpenAuth = true

4dkankan-user-web/src/main/java/com/fdkankan/web/aop/CheckCurrenUserAspect.java

@@ -1,6 +1,7 @@
 package com.fdkankan.web.aop;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.config.KankanGlobalConfig;
 import com.fdkankan.common.constant.MsgCode;
 import com.fdkankan.common.exception.BaseRuntimeException;
 import com.github.pagehelper.util.StringUtil;
@@ -33,6 +34,9 @@ public class CheckCurrenUserAspect {
 	@Autowired
 	private RedisTemplate<String, String> redisTemplate;
 
+	@Autowired
+	private KankanGlobalConfig kankanGlobalConfig;
+
 
 	// Service层切点
 	@Pointcut("@annotation(com.fdkankan.web.aop.CheckCurrentUser)")
@@ -48,6 +52,11 @@ public class CheckCurrenUserAspect {
 	 */
 	@Before("checkUserAspect()")
 	public void doBefore(JoinPoint joinPoint) throws Exception {
+		// 本地调试不需要鉴权
+		if (!kankanGlobalConfig.getIsOpenAuth()) {
+			return;
+		}
+
 		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
 				.getRequest();
 		String token = request.getHeader("token");

4dkankan-user-web/src/main/java/com/fdkankan/web/aop/WebLogAspect.java

@@ -2,6 +2,7 @@ package com.fdkankan.web.aop;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.config.KankanGlobalConfig;
 import com.fdkankan.domain.dto.request.OperationRequest;
 import com.fdkankan.service.backend.feign.OperatorFeign;
 import lombok.extern.slf4j.Slf4j;
@@ -38,11 +39,19 @@ public class WebLogAspect {
     @Autowired
     private OperatorFeign operatorFeign;
 
+    @Autowired
+    private KankanGlobalConfig kankanGlobalConfig;
+
+
     @Pointcut("@annotation(com.fdkankan.web.aop.WebControllerLog)")//切入点描述 这个是controller包的切入点
     public void controllerLog(){}//签名，可以理解成这个切入点的一个名称
 
     @Before("controllerLog()") //在切入点的方法run之前要干的
     public void logBeforeController(JoinPoint joinPoint) throws Exception{
+        // 本地调试不需要记录日志
+        if (!kankanGlobalConfig.getIsOpenAuth()) {
+            return;
+        }
 
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
                 .getRequest();