winCas代码优化

dongxl123 · May 15, 2019 · ceec8df · ceec8df
1 parent d6fa8c7
commit ceec8df
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/win-cas/src/main/java/com/winbaoxian/module/cas/config/WinCasClientConfiguration.java b/win-cas/src/main/java/com/winbaoxian/module/cas/config/WinCasClientConfiguration.java
@@ -2,6 +2,7 @@
 
 import com.winbaoxian.module.cas.adapter.WinCasClientConfigurer;
 import com.winbaoxian.module.cas.annotation.EnableWinCasClient;
+import com.winbaoxian.module.cas.constant.WinCasConstant;
 import com.winbaoxian.module.cas.filter.WinCasLogoutFilter;
 import org.apache.commons.collections.CollectionUtils;
 import org.jasig.cas.client.authentication.AuthenticationFilter;
@@ -20,10 +21,7 @@
 import org.springframework.util.StringUtils;
 
 import javax.servlet.Filter;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -92,7 +90,7 @@ public FilterRegistrationBean casSingleSignOutFilter() {
     public FilterRegistrationBean winCasLogoutFilter() {
         FilterRegistrationBean filterRegistration = new FilterRegistrationBean();
         filterRegistration.setFilter(new WinCasLogoutFilter());
-        filterRegistration.addUrlPatterns("/api/winCas/logout");
+        filterRegistration.addUrlPatterns(WinCasConstant.API_LOGOUT_URL);
         filterRegistration.setOrder(1);
         filterRegistration.setMatchAfter(true);
         return filterRegistration;
@@ -118,13 +116,13 @@ public FilterRegistrationBean casAuthenticationFilter() {
         if (CollectionUtils.isNotEmpty(authenticationUrlPatterns)) {
             authnFilter.setUrlPatterns(authenticationUrlPatterns);
         }
+        List<String> allUrlIgnorePatterns = new ArrayList<>();
+        allUrlIgnorePatterns.add(WinCasConstant.API_LOGOUT_URL);
         List<String> authenticationUrlIgnorePatterns = configProps.getAuthenticationUrlIgnorePatterns();
         if (CollectionUtils.isNotEmpty(authenticationUrlIgnorePatterns)) {
-            authenticationUrlIgnorePatterns.add("/api/winCas/logout");
-            authnFilter.getInitParameters().put(ConfigurationKeys.IGNORE_PATTERN.getName(), String.join("|", authenticationUrlIgnorePatterns));
-        } else {
-            authnFilter.getInitParameters().put(ConfigurationKeys.IGNORE_PATTERN.getName(), "/api/winCas/logout");
+            allUrlIgnorePatterns.addAll(authenticationUrlIgnorePatterns);
         }
+        authnFilter.getInitParameters().put(ConfigurationKeys.IGNORE_PATTERN.getName(), String.join("|", allUrlIgnorePatterns));
         if (configProps.getGateway() != null) {
             authnFilter.getInitParameters().put(ConfigurationKeys.GATEWAY.getName(), String.valueOf(configProps.getGateway()));
         }

diff --git a/win-cas/src/main/java/com/winbaoxian/module/cas/constant/WinCasConstant.java b/win-cas/src/main/java/com/winbaoxian/module/cas/constant/WinCasConstant.java
@@ -0,0 +1,7 @@
+package com.winbaoxian.module.cas.constant;
+
+public interface WinCasConstant {
+
+    String API_LOGOUT_URL = "/api/winCas/logout";
+
+}