wanghui 8 years ago
parent
commit
b00d8ec30d

+ 7 - 0
src/main/java/com/goafanti/app/controller/AppApiController.java

@@ -44,4 +44,11 @@ public class AppApiController extends BaseApiController {
 		}
 		return res;
 	}
+	
+	@RequestMapping(value = "/logout",method = RequestMethod.GET)
+	public Result logout(HttpServletRequest request){
+		Result res = new Result();
+		TokenManager.logout();
+		return res;
+	}
 }

+ 0 - 5
src/main/java/com/goafanti/common/bo/Result.java

@@ -3,11 +3,6 @@ package com.goafanti.common.bo;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-
-import org.apache.shiro.SecurityUtils;
-
-import com.goafanti.core.shiro.token.TokenManager;
-
 public class Result {
 	private Object		data;
 	private List<Error>	error	= new ArrayList<Error>();

+ 10 - 2
src/main/java/com/goafanti/common/error/SystemExceptionResolver.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.support.ResourcePropertySource;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
@@ -17,16 +18,22 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.filter.ShiroFilterUtils;
 
-public class SystemExceptionResolver extends SimpleMappingExceptionResolver {
+public class SystemExceptionResolver extends SimpleMappingExceptionResolver{
 	@Resource(name = "errorResource")
 	private ResourcePropertySource	errorResource;
-
+	@Value(value = "${app.name}")
+	private String appName;
 	@Autowired
 	private ShiroFilterUtils		shiroFilterUtils;
 
 	@Override
 	protected ModelAndView doResolveException(HttpServletRequest request, HttpServletResponse response, Object handler,
 			Exception ex) {
+		/*if(request.getHeader("User-Agent") != null && request.getHeader("User-Agent").indexOf(appName) > -1){
+			setExceptionMappings(new Properties());
+			return null;
+		}
+		*/
 		// Expose ModelAndView for chosen error view.
 		String viewName = determineViewName(ex, request);
 
@@ -85,4 +92,5 @@ public class SystemExceptionResolver extends SimpleMappingExceptionResolver {
 	public void setErrorResource(ResourcePropertySource errorResource) {
 		this.errorResource = errorResource;
 	}
+	
 }

+ 0 - 1
src/main/java/com/goafanti/core/shiro/token/UserRealm.java

@@ -62,7 +62,6 @@ public class UserRealm extends AuthorizingRealm {
 		} else {
 			User user = userService.selectByMobieAndType(token.getUsername(), token.getType());
 			if (null == user) {
-
 				throw new UnknownAccountException();
 			}
 			token.setId(user.getId());