Merge branch 'master' of https://github.com/gf-huanchupk/SpringBootLearning

Author: gf-huanchupk

README.md

@@ -0,0 +1,79 @@
+
+>转载请标明出处： 
+> https://blog.csdn.net/u010562966/article/details/88995076
+> 本文出自[程序员果果的博客](https://blog.csdn.net/u010562966)
+> 
+
+### 源码
+- github | Spring Boot 系列 ：[https://github.com/gf-huanchupk/SpringBootLearning](https://github.com/gf-huanchupk/SpringBootLearning),记得star哦！
+- github | Spring Cloud 系列 ：[https://github.com/gf-huanchupk/SpringCloudLearning](https://github.com/gf-huanchupk/SpringCloudLearning),记得star哦！
+
+
+### Spring Boot 系列
+
+- [Spring Boot 教程 | Spring Boot 自定义 starter](https://mp.weixin.qq.com/s/F_1j-ng49QNlbj04Q9bqFQ)
+- [Spring Boot 教程 | Spring Boot 整合 mybatis-plus](https://mp.weixin.qq.com/s/ITZIPCttey-iYCyhIa8uSw)
+- [Spring Boot 教程 | Spring Boot 整合 spring cache](https://mp.weixin.qq.com/s/nqozEsvl5ZMaREMv2gZKlQ)
+- [Spring Boot 教程 | Spring Boot 整合 rabbitmq](https://mp.weixin.qq.com/s/ZhP8zF3GyiIm0fPiTDLWxA)
+- [Spring Boot 教程 | Spring Boot 整合 elasticsearch](https://mp.weixin.qq.com/s/f9eE7jsPNWAr1gQ0iF-kDw)
+- [Spring Boot 教程 | Spring Boot 整合 docker](https://mp.weixin.qq.com/s/IWDpC9i8P3ZDFDYTsKARag)
+- [Spring Boot 教程 | Spring Boot 整合 elk](https://mp.weixin.qq.com/s/k6UUCD-Rn96po2dw6maSxQ)
+- [Spring Boot 教程 | Spring Boot Admin 2.0 详解](https://mp.weixin.qq.com/s/JSJH32N_bCzaWjZTubUDTA)
+- [Spring Boot 教程 | Spring Boot 整合 apollo](https://mp.weixin.qq.com/s/8UR13rTY2elAGedfFC8EiQ)
+- [Spring Boot 教程 | Spring Boot Security 详解](https://mp.weixin.qq.com/s/bSWs_3wIavdhHayDtKHpUg)
+- [Spring Boot 教程 | Spring Boot Security 整合 OAuth2 设计安全API接口服务](https://mp.weixin.qq.com/s/0PAUErDh0qmcR4SUsTn15Q)
+- [Spring Boot 教程 | Spring Boot Security 整合 JWT 实现 无状态的分布式API接口](https://mp.weixin.qq.com/s/QO5L1-RCR-jmIuHlZIfkqQ)
+
+### Spring Cloud 系列
+
+- [第一篇 : 服务的注册与发现（Eureka）](https://mp.weixin.qq.com/s/Ahg6Z5PL9UAhaKSQjUOg3g)
+- [第二篇 : 服务消费者（rest+ribbon）](https://mp.weixin.qq.com/s/LanJnx04KaAuSkeomaE5Uw)
+- [第三篇 : 服务消费者（Feign）](https://mp.weixin.qq.com/s/2_OxTx1_6PfQx3z7baxocw)
+- [第四篇 : 断路器（Hystrix）](https://mp.weixin.qq.com/s/XhjHZ9fD2s34Eb665O6npQ)
+- [第五篇 : 路由网关（Zuul）](https://mp.weixin.qq.com/s/GYu_BRxuhmGl7dQnlnsEmQ)
+- [第六篇 : 分布式配置中心（Spring Cloud Config）](https://mp.weixin.qq.com/s/Pbcc3B3vzrMUKgbpijrJFQ)
+- [第七篇 : 高可用的分布式配置中心（Spring Cloud Config）](https://mp.weixin.qq.com/s/yj0snlPFobakq3akc_FJGw)
+- [第八篇 : 消息总线（Spring Cloud Bus）	8 months ago](https://mp.weixin.qq.com/s/a2NLClc56BXJxrIiCXODUw)
+- [第九篇 : 服务链路追踪（Spring Cloud Sleuth）](https://mp.weixin.qq.com/s/a2NLClc56BXJxrIiCXODUw)
+- [第十篇 : 高可用的服务注册中心](https://mp.weixin.qq.com/s/A75d2Ec5-IwoGxbJEWj41w)
+- [第十一篇 : 断路器监控（Hystrix Dashboard）](https://mp.weixin.qq.com/s/Sv7agttPg2R1kyXMvxI-Gw)
+- [第十二篇 : 断路器聚合监控（Hystrix Turbine）](https://mp.weixin.qq.com/s/KyAdC-k_r9ldyozKmnyK3Q)
+- [第十三篇 : 路由网关（Gateway）](https://mp.weixin.qq.com/s/2twx-aCEM2GXluDUIubGZg)
+- [第十四篇 : 调用链监控 CAT 之 入门](https://mp.weixin.qq.com/s/G15cw9yXpq4cOFB2C29JYw)
+- [第十五篇 : 调用链监控 CAT 之 URL埋点实践](https://mp.weixin.qq.com/s/0tLjjlUtKTyOlH-5elj0Xw)
+- [第十六篇 : 微服务容错限流Hystrix入门](https://mp.weixin.qq.com/s/G15cw9yXpq4cOFB2C29JYw)
+- [第十七篇 : 微服务容错限流Hystrix之Dashboard](https://mp.weixin.qq.com/s/Nmqu2ul4aRT6iXecxrmt9A)
+- [第十八篇 : 微服务容错限流Hystrix之流聚合](https://mp.weixin.qq.com/s/2RNK2XkjTvd1sUM7oR-Jfw)
+
+### Dubbo 系列
+
+- [Dubbo 教程 | 第一篇 : Dubbo 搭建管理控制台](https://mp.weixin.qq.com/s/UYcmklod_2RLrx-ACHPyVw)
+- [Dubbo 教程 | 第二篇 : Dubbo 创建 提供者 消费者](https://mp.weixin.qq.com/s/2CRFwbc45oh5Nqd7eREAAg)
+- [Dubbo 教程 | 第三篇 : Dubbo 配置](https://mp.weixin.qq.com/s/Dld2DYSbSXmIQxFVE31RNQ)
+- [Dubbo 教程 | 第四篇 : Dubbo 高可用](https://mp.weixin.qq.com/s/f0vsJ8jcF24ji5UNlCq1zQ)
+
+### Docker 系列
+
+- [Docker 教程 | 第一篇 : Docker的基本概念和框架](https://mp.weixin.qq.com/s/8VM-c_UkxYcVw2Itiapw4w)
+- [Docker 教程 | 第二篇 : Docker 常用操作命令](https://mp.weixin.qq.com/s/S9VkzSJx_JOY8zDiC_nuEg)
+- [Docker 教程 | 第三篇 : Docker 获取和推送镜像](https://mp.weixin.qq.com/s/jN-8YgxDcAvwoiZ_BJQUKQ)
+- [Docker 教程 | 第四篇 : Docker 构建镜像](https://mp.weixin.qq.com/s/foVeANf0imgU4hfOempp3A)
+- [Docker 教程 | 第五篇 : Docker 容器的网络连接](https://mp.weixin.qq.com/s/DzF-ZwaY4QtlgM32I5wybg)
+- [Docker 教程 | 第六篇 : Docker 容器的数据管理](https://mp.weixin.qq.com/s/qg8eXHobNxzfPAaHB3U9cw)
+- [Docker 教程 | 第七篇 : Docker 私有仓库搭建](https://mp.weixin.qq.com/s/tBh6kT4I5XniCoFEcn7W9A)
+- [Docker 教程 | 第八篇 : 服务 Docker 化](https://mp.weixin.qq.com/s/E_gJFbRaWOE-mnVR1lsYfQ)
+- [Docker 教程 | 第九篇 : Docker Swarm 集群环境搭建](https://mp.weixin.qq.com/s/RSNL-V4jLE8YVMSWZlJ_Vw)
+- [Docker 教程 | 第十篇 : Docker Swarm 微服务部署](https://mp.weixin.qq.com/s/nWpbqAheuTh45dWsgszieA)
+
+### 关注我
+
+<div>
+    <p align="center">
+        <img src="https://img-blog.csdnimg.cn/20181219135239593.jpg" width="258" height="258"/>
+        <br>
+        欢迎扫码或微信搜索公众号《程序员果果》关注我，更多精彩内容不能错过 ~~
+    </p>
+    <p align="center" style="margin-top: 15px; font-size: 11px;color: #cc0000;">
+        <strong>（转载本站文章请注明作者和出处 <a href="https://blog.csdn.net/u010562966">程序员果果的博客</a>）</strong>
+    </p>
+</div>

springboot-security-oauth2/src/main/java/com/gf/config/AuthorizationServerConfiguration.java

@@ -63,26 +63,9 @@ public TokenStore tokenStore() {
 
     @Override
     public void configure(AuthorizationServerSecurityConfigurer security) throws Exception {
-        /**
-         * 配置oauth2服务跨域
-         */
-        CorsConfigurationSource source = new CorsConfigurationSource() {
-            @Override
-            public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
-                CorsConfiguration corsConfiguration = new CorsConfiguration();
-                corsConfiguration.addAllowedHeader("*");
-                corsConfiguration.addAllowedOrigin(request.getHeader( HttpHeaders.ORIGIN));
-                corsConfiguration.addAllowedMethod("*");
-                corsConfiguration.setAllowCredentials(true);
-                corsConfiguration.setMaxAge(3600L);
-                return corsConfiguration;
-            }
-        };
-
-        security.tokenKeyAccess("permitAll()")
+       security.tokenKeyAccess("permitAll()")
                 .checkTokenAccess("permitAll()")
-                .allowFormAuthenticationForClients()
-                .addTokenEndpointAuthenticationFilter(new CorsFilter(source));
+                .allowFormAuthenticationForClients();
     }
 
     @Override

springboot-security-oauth2/src/main/java/com/gf/config/MyFilterSecurityInterceptor.java

@@ -14,6 +14,8 @@
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 
@@ -32,13 +34,20 @@ public void setMyAccessDecisionManager(MyAccessDecisionManager myAccessDecisionM
 
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-
         FilterInvocation fi = new FilterInvocation(servletRequest, servletResponse, filterChain);
-        invoke(fi);
+        HttpServletResponse response = (HttpServletResponse)servletResponse;
+        HttpServletRequest request = (HttpServletRequest)servletRequest;
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+        response.setHeader("Access-Control-Allow-Headers", ":x-requested-with,content-type");
+        filterChain.doFilter(servletRequest,servletResponse);
+        if (!request.getRequestURI().equals("/oauth/token")) {
+            invoke(fi);
+        }
+
     }
 
     public void invoke(FilterInvocation fi) throws IOException, ServletException {
-
         InterceptorStatusToken token = super.beforeInvocation(fi);
         try {
             //执行下一个拦截器