Merge branch 'dev0410' of https://git.oschina.net/songyue123456/comm-ques-bank.git into dev0410

cqb-starter/pom.xml

@@ -93,6 +93,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-eureka</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.common</groupId>
+            <artifactId>common-uac</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
     </dependencies>
 

cqb-starter/src/main/java/com/qmth/cqb/AccessControlConfig.java

@@ -0,0 +1,27 @@
+package com.qmth.cqb;
+
+import cn.com.qmth.examcloud.common.uac.AccessCtrlInterceptor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+/**
+ * prod环境开启权限验证
+ * Created by yuanpan on 2017/4/13.
+ */
+@Configuration
+//@Profile("prod")
+public class AccessControlConfig extends WebMvcConfigurerAdapter {
+
+
+    public AccessCtrlInterceptor getInterceptor() {
+        return new AccessCtrlInterceptor();
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(getInterceptor())
+                .addPathPatterns("/**")
+                .excludePathPatterns("/**/swagger-ui.html#/**");
+    }
+}

cqb-starter/src/main/java/com/qmth/cqb/App.java

@@ -11,6 +11,9 @@ import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 /**
  * 项目入口主程序
@@ -39,4 +42,20 @@ public class App {
         resolver.setMaxUploadSize(200*1024*1024);//上传文件大小 50M 50*1024*1024
         return resolver;
     }
+
+    @Bean
+    public WebMvcConfigurer corsConfigurer() {
+        return new WebMvcConfigurerAdapter() {
+            public void addCorsMappings(CorsRegistry registry) {
+                registry.addMapping("/**");
+
+//                registry.addMapping("/**")
+//                        .allowedOrigins("*")
+//                        .allowedMethods("GET", "HEAD", "POST", "PUT", "PATCH", "DELETE", "OPTIONS", "TRACE")
+//                        .allowedHeaders("*")
+//                        .exposedHeaders("access_token", "credentials", "refresh_token")
+//                        .allowCredentials(true).maxAge(3600);
+            }
+        };
+    }
 }

cqb-starter/src/main/resources/application-test.properties

@@ -1,3 +1,3 @@
-spring.data.mongodb.uri=mongodb://192.168.1.99:27017/comm-ques-bank
+spring.data.mongodb.uri=mongodb://192.168.1.74:27017/comm-ques-bank
 spring.data.mongodb.grid-fs-database=comm-ques-bank
 eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/