Browse Source

取消对移动端的登录拦截

scr 8 years ago
parent
commit
6e12b6ae46

+ 4 - 1
donate-service/src/main/java/com/uas/service/donate/SSOConfiguration.java

@@ -9,6 +9,7 @@ import com.uas.service.donate.web.filter.SSOInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
@@ -21,6 +22,7 @@ import java.util.Properties;
  * @author hejq
  */
 @Configuration
+@EnableWebMvc
 public class SSOConfiguration extends WebMvcConfigurerAdapter {
 
     @Autowired
@@ -35,7 +37,8 @@ public class SSOConfiguration extends WebMvcConfigurerAdapter {
                 excludePathPatterns("/WEB-INF/**","/**/static/**", "/sso/login/**", "/sso/logout/**",
                         "/", "/project/**", "/activity/**","/carousels/**", "/message/**",
                         "/org/**", "/projectconclude/**", "/projectevolve/**", "/projectfinance/**",
-                        "/projectrecode/**", "/wxpay/**", "/alipay/**", "/mobile", "/index", "/activeCenter");
+                        "/projectrecode/**", "/wxpay/**", "/alipay/**", "/mobile", "/index", "/activeCenter",
+                        "/app/**");
     }
 
     @Bean

+ 3 - 1
donate-service/src/main/java/com/uas/service/donate/controller/AppController.java

@@ -1,6 +1,7 @@
 package com.uas.service.donate.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.uas.service.donate.core.model.Status;
 import com.uas.service.donate.model.*;
 import com.uas.service.donate.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +15,7 @@ import java.util.List;
  * 提供给移动端的控制器
  */
 @Controller
+@RequestMapping("/app")
 public class AppController {
 
     @Autowired
@@ -63,7 +65,7 @@ public class AppController {
     public ModelMap returnProjects(@RequestParam(value="area",defaultValue = "全部")String area,
                                    @RequestParam(value = "search",required = false)String search){
         ModelMap modelMap=new ModelMap();
-            if ("全部".equals(area)) {
+            if (Status.ALL.getPhrase().equals(area)) {
                 List<Project> projectList=projectService.findProjects();
                 modelMap.put("projectList",projectList);
             }else{

+ 0 - 1
donate-service/src/main/java/com/uas/service/donate/controller/AuthenticationController.java

@@ -21,5 +21,4 @@ public class AuthenticationController {
         }
         return SystemSession.getUser();
     }
-
 }

+ 1 - 1
donate-service/src/main/java/com/uas/service/donate/controller/IndexController.java

@@ -132,7 +132,7 @@ public class IndexController {
 		    Page<Project> projects = projectService.findAll(pageable);
 		    model.addAttribute("page", projects);
 	    } else {
-		    if (Status.ALL.getPhrase().equals(status)) {
+		    if (Status.LOADING.getPhrase().equals(status)) {
 			    Page<Project> projects = projectService.findInProcessArea(pageable, area);
 			    model.addAttribute("page", projects);
 		    } else if (Status.END.getPhrase().equals(status)) {