From 52bd4ff046a8f7d1217d4fb3384a642dd11de1f9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 27 May 2021 13:20:00 +0800
Subject: [PATCH] api拦截器配置,yml修改

---
 screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java |   21 ++++++++--
 screen-api/src/main/resources/application-dev.yml                                  |   56 ++++++++++++++-------------
 screen-api/src/main/java/com/moral/api/interceptor/WebInterceptor.java             |    3 -
 3 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java b/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java
index 836ef67..dec9b13 100644
--- a/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java
+++ b/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java
@@ -1,18 +1,31 @@
 package com.moral.api.config.Interceptor;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.moral.api.interceptor.AuthenticationInterceptor;
+import java.util.ArrayList;
+
+import com.moral.api.interceptor.WebInterceptor;
 
 @Configuration
 public class WebAppConfiguration implements WebMvcConfigurer {
 
+    //������������������������
+    @Bean
+    @ConfigurationProperties("mvc.interceptor.exclude")
+    public ArrayList<String> getExcludePath(){
+        return new ArrayList<>();
+    }
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(new AuthenticationInterceptor())
-                .addPathPatterns("/**")
-                .excludePathPatterns("/**/login/**", "/**/logout/**", "/swagger-ui.html/**", "/swagger-resources/**","/**/verificationCode/**","/**/user/**");
+        InterceptorRegistration regisration = registry.addInterceptor(new WebInterceptor());
+        ArrayList<String> excludePath = getExcludePath();
+        regisration.addPathPatterns("/**/**");//������������������
+        regisration.excludePathPatterns(excludePath);//���������������������
     }
 }
diff --git a/screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java b/screen-api/src/main/java/com/moral/api/interceptor/WebInterceptor.java
similarity index 89%
rename from screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java
rename to screen-api/src/main/java/com/moral/api/interceptor/WebInterceptor.java
index 74e3059..90feb05 100644
--- a/screen-api/src/main/java/com/moral/api/interceptor/AuthenticationInterceptor.java
+++ b/screen-api/src/main/java/com/moral/api/interceptor/WebInterceptor.java
@@ -7,11 +7,10 @@
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import com.moral.redis.RedisUtil;
 import com.moral.util.TokenUtils;
 
 @Component
-public class AuthenticationInterceptor implements HandlerInterceptor {
+public class WebInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 968569c..3ec8fff 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -14,32 +14,28 @@
   profiles:
     active: dev
   application:
-    name: screen-api
+    name: screen-manage
   redis:
-    #cluster:
-    #nodes: 47.112.126.78:7001,47.112.126.78:7002,47.112.126.132:7003,47.112.126.132:7004,47.112.132.193:7005,47.112.132.193:7006
-    #password: test
-    #timeout: 500
-      host: 39.97.177.149
-      port: 6379
-      password: chenkaiyu111
-      timeout: 30000
-      jedis:
-        pool:
-          max-active: 256
-          max-wait: 30000
-          max-idle: 64
-          min-idle: 32
-      lettuce:
-        pool:
-          max-active: 256
-          max-idle: 64
-          max-wait: 30000
-          min-idle: 32
-  tokenRedis:
-    host: 39.97.177.149
+    host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
     port: 6379
-    password: chenkaiyu111
+    password: moral_123456
+    timeout: 30000
+    jedis:
+      pool:
+        max-active: 256
+        max-wait: 30000
+        max-idle: 64
+        min-idle: 32
+    lettuce:
+      pool:
+        max-active: 256
+        max-idle: 64
+        max-wait: 30000
+        min-idle: 32
+  tokenRedis:
+    host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+    port: 6379
+    password: moral_123456
     timeout: 30000
     database: 15
     pool:
@@ -57,9 +53,9 @@
     filters: stat
     type: com.alibaba.druid.pool.DruidDataSource
     max-wait: 60000
-    url: jdbc:mysql://39.97.177.149:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
-    password: chenkaiyu111
+    password: moral_123456
     test-on-borrow: false
     sql-script-encoding: utf-8
     pool-prepared-statements: true
@@ -113,7 +109,13 @@
 mvc:
   interceptor:
     exclude:
-      - /account/login
+      - /login
+      - /swagger-ui.html
+      - /swagger-resources/**
+      - /swagger-ui.html/**
+      - /webjars/**
+      - /verificationCode/**
+
 AES:
   KEY:
     AD42F7787B035B7580000EF93BE20BAD

--
Gitblit v1.8.0