增加跨域请求

zhanglong · zhanglong · commit d68771726d2c · 2017-04-14T16:29:30.000+08:00
diff --git a/src/main/java/com/cetc/TokenInterceptor.java b/src/main/java/com/cetc/TokenInterceptor.java
@@ -41,6 +41,17 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 		startTimeThreadLocal.set(beginTime);// 线程绑定变量（该数据只有当前请求的线程可见）
 		String reqJson = "";
 		String getReqParm = "";
+		
+		//增加跨域请求
+		if(request.getHeader("Origin")!=null&&
+				(request.getHeader("Origin").equals("http://localhost:8000")||
+			     request.getHeader("Origin").equals("http://10.111.10.42:8000")) 
+			){
+			logger.debug("需要跨域请求{}", request.getRequestURI());
+			response.setHeader("Access-Control-Allow-Origin",request.getHeader("Origin"));
+		};
+		
+		
 		if (request.getRequestURI().contains("user/login")) {
 			JSONObject obj = new JSONObject();
 			obj.put("userName", request.getParameter("userName"));
diff --git a/src/main/java/com/cetc/controller/UserController.java b/src/main/java/com/cetc/controller/UserController.java
@@ -8,24 +8,27 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.cetc.annotation.SystemControllerLog;
+import com.cetc.controller.base.BaseController;
 import com.cetc.model.RespDataVo;
 import com.cetc.service.UserService;
+import com.cetc.utils.JsonUtils;
 
 
 @RestController
 @RequestMapping("/user")
-public class UserController {
+public class UserController extends BaseController {
 	
 	private static Logger logger = Logger.getLogger(UserController.class);
 	
 	@Autowired
 	private UserService userService; 
 	
+	
 	@SystemControllerLog(description="登录系统")
 	@RequestMapping(value = "/login", method ={RequestMethod.GET})
 	public RespDataVo login(@RequestParam("userName")String usr,@RequestParam("userPwd")String pwd){
-		logger.info("用户登陆校验接口");
 		RespDataVo root=userService.getCheckUser(usr,pwd);
+		logger.debug(String.format("返回结果：%s",JsonUtils.objectToJson(root)));
 		return root;
 	}
 }
diff --git a/src/main/java/com/cetc/controller/base/BaseController.java b/src/main/java/com/cetc/controller/base/BaseController.java
@@ -0,0 +1,48 @@
+package com.cetc.controller.base;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.cetc.model.RespDataVo;
+
+@ControllerAdvice
+public class BaseController {
+
+	@ExceptionHandler({Exception.class})
+	@ResponseBody()
+	public RespDataVo exp(HttpServletRequest request,HttpServletResponse response, Exception ex) {
+		// 根据不同错误转向不同页面
+		RespDataVo jsonResp = new RespDataVo();
+		if (ex instanceof HttpRequestMethodNotSupportedException) {
+			HttpRequestMethodNotSupportedException reqEx = (HttpRequestMethodNotSupportedException) ex;
+			StringBuffer buffer = new StringBuffer();
+			String[] strArray=reqEx.getSupportedMethods();
+			String method="";
+			for (String str : strArray) {
+				method+=str+",";
+			}
+			buffer.append("不支持[ ").append(reqEx.getMethod()).append(" ],只支持[ ").append(method.substring(0, method.length()-1)).append(" ]");
+			jsonResp.setCode("0011");
+			jsonResp.setMsg(buffer.toString());
+			return jsonResp;
+		} else if(ex instanceof MissingServletRequestParameterException){
+			MissingServletRequestParameterException reqEx = (MissingServletRequestParameterException) ex;
+			StringBuffer buffer = new StringBuffer();
+			buffer.append("缺少参数：[").append(reqEx.getParameterName()).append("]");
+			jsonResp.setCode("0012");
+			jsonResp.setMsg(buffer.toString());
+			return jsonResp;
+		}else{
+			jsonResp.setCode("0013");
+			jsonResp.setMsg("服务器异常");
+			return jsonResp;
+		}
+
+	}
+}
diff --git a/src/main/java/com/cetc/controller/base/CorsConfigurerAdapter.java b/src/main/java/com/cetc/controller/base/CorsConfigurerAdapter.java
@@ -0,0 +1,13 @@
+package com.cetc.controller.base;
+
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+public class CorsConfigurerAdapter extends WebMvcConfigurerAdapter {
+
+	@Override
+	public void addCorsMappings(CorsRegistry registry) {
+		registry.addMapping("user/login");
+	}
+	
+}
diff --git a/src/main/java/com/cetc/service/impl/UserServiceImpl.java b/src/main/java/com/cetc/service/impl/UserServiceImpl.java
@@ -2,7 +2,6 @@
 
 import java.util.Calendar;
 
-import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,38 +17,13 @@
 @Service("userService")
 public class UserServiceImpl implements UserService {
 
-	private static Logger logger = Logger.getLogger(UserServiceImpl.class);
-	
 	@Autowired
 	private UserRepository userRepository;
 	
-	
 	@SystemServiceLog(description ="查询用户")
 	@Override
 	public RespDataVo getCheckUser(String usr, String pwd) {
-//		RespDataVo root=new RespDataVo();
-//		String code = "1000";
-//		try {
-//			UserVo user=userRepository.getUserByNameAndPwd(usr,pwd);
-//			if(user!=null){//存在用户
-//				String token=Base64.encode((user.getUserId()+"_"+DateUtil.getDateFormat(Calendar.getInstance())+"_A123456a").getBytes());
-//				root.setToken(token);
-//				root.setData(user);
-//				root.setCode(code);
-//				root.setMsg(ValueTool.getValue().get(code));
-//			}else{
-//				code="1004";
-//				root.setCode(code);
-//				root.setMsg(ValueTool.getValue().get(code));
-//			}
-//		} catch (Exception e) {
-//			root.setCode("9999");
-//			root.setMsg(ValueTool.getValue().get("9999"));
-//			logger.error("校验用户错误", e);
-//		}
-//		return root;
 		RespDataVo root=new RespDataVo();
-		int a=1/0;
 		String code = "1000";
 			UserVo user=userRepository.getUserByNameAndPwd(usr,pwd);
 			if(user!=null){//存在用户
diff --git a/src/main/resources/spring/spring-bean.xml b/src/main/resources/spring/spring-bean.xml
@@ -27,7 +27,7 @@
 			expression="org.springframework.stereotype.Controller" />
 	</context:component-scan>
 
-	<bean id="schedulerFactoryBean" class="org.springframework.scheduling.quartz.SchedulerFactoryBean" />
+	<!-- <bean id="schedulerFactoryBean" class="org.springframework.scheduling.quartz.SchedulerFactoryBean" /> -->
 	
 	<!-- 启动对@AspectJ注解的支持 -->
 	<aop:aspectj-autoproxy/>
diff --git a/src/main/resources/spring/spring-mvc.xml b/src/main/resources/spring/spring-mvc.xml
@@ -36,6 +36,8 @@
 		<property name="suffix"      value=".jsp" />
 	</bean> 
 	
+	<bean class="com.cetc.controller.base.CorsConfigurerAdapter"></bean>
+	
 	<mvc:resources location="/js/" mapping="/js/**"></mvc:resources>
 	
 	<!-- 启动对@AspectJ注解的支持 -->
