Merge remote-tracking branch 'origin/master'

README.md

@@ -1 +1,24 @@
 #spring-oauth-server
+
+
+<strong>Spring与Oauth2的整合示例</strong>
+
+项目用Maven管理
+
+
+使用的技术与版本号
+<ol>
+ <li>Spring (3.1.1.RELEASE)</li>
+ <li>Spring Security (3.1.0.RELEASE)</li>
+ <li>MyBatis (3.2.1)</li>
+ <li>spring-security-oauth2 (1.0.5.RELEASE)</li>
+</ol>
+
+<p>
+ 与该项目相关的博客请访问 <a target="_blank" href="http://blog.csdn.net/monkeyking1987/article/details/16828059">http://blog.csdn.net/monkeyking1987/article/details/16828059</a>
+</p>
+
+
+<p>
+ 欢迎发邮件到<a href="mailto:monkeyk1987@gmail.com">monkeyk1987@gmail.com</a>一起讨论.
+</p>