From 89bed3b1681ed1fa0ead6b9a4157491cb679325d Mon Sep 17 00:00:00 2001
From: LSZ <zhao@idsmanager.com>
Date: Mon, 15 Aug 2016 23:27:23 +0800
Subject: [PATCH] =?UTF-8?q?(158)=20-=20=E5=AF=B9=E9=85=8D=E7=BD=AE,?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BF=85=E8=A6=81=E7=9A=84=E5=9C=B0=E6=96=B9?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A,=E6=96=B9=E4=BE=BF?=
 =?UTF-8?q?=E7=90=86=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                              |  2 +-
 src/main/resources/spring/security.xml | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b7f7725..13e3124 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 #spring-oauth-server
 
 
-<strong>Spring与Oauth2的整合示例</strong>
+<strong>Spring与OAuth2的整合</strong>
 
 项目用Maven管理, 字符编码: UTF-8
 
diff --git a/src/main/resources/spring/security.xml b/src/main/resources/spring/security.xml
index 012c00a..d6f2942 100644
--- a/src/main/resources/spring/security.xml
+++ b/src/main/resources/spring/security.xml
@@ -8,8 +8,15 @@
                         http://www.springframework.org/schema/security
                         http://www.springframework.org/schema/security/spring-security-4.0.xsd http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
 
+
+    <!--
+     Spring Security + OAuth 的主配置文件
+    -->
+
+    <!-- 若需要调试, 可将debug 标签注释取消 -->
     <!--<debug/>-->
 
+    <!--  静态资源, 忽略 -->
     <!--static url pattern-->
     <http pattern="/resources/**" security="none"/>
     <http pattern="/oauth/rest_token" security="none"/>
@@ -20,9 +27,16 @@
     https://github.com/spring-projects/spring-security-oauth/blob/master/docs/oauth2.md
     -->
 
+    <!--
+        Spring MVC的注解配置, 注意: 该配置不能放置在 mkk-servlet.xml 文件中
+    -->
     <mvc:annotation-driven/>
     <mvc:default-servlet-handler/>
 
+    <!--
+     OAuth2 URL: /oauth/token   的处理与配置
+     一般使用时这里不需要修改, 直接使用即可
+    -->
     <http pattern="/oauth/token" create-session="stateless" authentication-manager-ref="oauth2AuthenticationManager"
           entry-point-ref="oauth2AuthenticationEntryPoint" use-expressions="false">
         <intercept-url pattern="/oauth/token" access="IS_AUTHENTICATED_FULLY"/>