From c636a7a6722b12fb252b15995a8ab078b582f9c1 Mon Sep 17 00:00:00 2001
From: Li Shengzhao <shengzhan@uwantsoft.com>
Date: Mon, 4 Apr 2016 19:32:54 +0800
Subject: [PATCH] =?UTF-8?q?(118)=20-=20Add=20java-config(=E9=9B=B6?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE)=20=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sos/config/MethodSecurityConfig.java      | 25 +++++++++++++++++++
 .../sos/config/WebSecurityConfigurer.java     | 11 +-------
 2 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/com/monkeyk/sos/config/MethodSecurityConfig.java

diff --git a/src/main/java/com/monkeyk/sos/config/MethodSecurityConfig.java b/src/main/java/com/monkeyk/sos/config/MethodSecurityConfig.java
new file mode 100644
index 0000000..966d16c
--- /dev/null
+++ b/src/main/java/com/monkeyk/sos/config/MethodSecurityConfig.java
@@ -0,0 +1,25 @@
+package com.monkeyk.sos.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
+import org.springframework.security.oauth2.provider.expression.OAuth2MethodSecurityExpressionHandler;
+
+/**
+ * 2016/4/4
+ *
+ * @author Shengzhao Li
+ */
+@Configuration
+@EnableGlobalMethodSecurity(prePostEnabled = true, proxyTargetClass = true)
+public class MethodSecurityConfig extends GlobalMethodSecurityConfiguration {
+
+
+    @Override
+    protected MethodSecurityExpressionHandler createExpressionHandler() {
+        return new OAuth2MethodSecurityExpressionHandler();
+//        return new DefaultMethodSecurityExpressionHandler();
+    }
+
+}
diff --git a/src/main/java/com/monkeyk/sos/config/WebSecurityConfigurer.java b/src/main/java/com/monkeyk/sos/config/WebSecurityConfigurer.java
index 862ba1e..e3f7a6c 100644
--- a/src/main/java/com/monkeyk/sos/config/WebSecurityConfigurer.java
+++ b/src/main/java/com/monkeyk/sos/config/WebSecurityConfigurer.java
@@ -184,14 +184,5 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter {
 //    }
 
 
-//    @Configuration
-//    @EnableGlobalMethodSecurity(prePostEnabled = true, proxyTargetClass = true)
-//    protected static class MethodSecurityConfig extends GlobalMethodSecurityConfiguration {
-//
-//
-//        @Override
-//        protected MethodSecurityExpressionHandler createExpressionHandler() {
-//            return new OAuth2MethodSecurityExpressionHandler();
-//        }
-//    }
+
 }