commit

src/main/java/com/api/config/WebMvcConfig.java

@@ -30,6 +30,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
     @Autowired
     private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver;
 
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(authorizationInterceptor).addPathPatterns("/api/**");

src/main/java/com/api/controller/ApiTestController.java

@@ -26,7 +26,7 @@ import springfox.documentation.annotations.ApiIgnore;
  * @author Mark sunlightcs@gmail.com
  */
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/api/api")
 @Api(tags="测试接口")
 public class ApiTestController {
 
@@ -44,6 +44,7 @@ public class ApiTestController {
         return R.ok().put("userId", userId);
     }
 
+    @Login
     @GetMapping("notToken")
     @ApiOperation("忽略Token验证测试")
     public R notToken(){

src/main/java/com/api/interceptor/AuthorizationInterceptor.java

@@ -13,6 +13,9 @@ import com.common.exception.RRException;
 import com.api.annotation.Login;
 import com.api.entity.TokenEntity;
 import com.api.service.TokenService;
+import com.common.utils.HttpContextUtils;
+import com.common.utils.R;
+import com.google.gson.Gson;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -56,7 +59,17 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
 
         //token为空
         if(StringUtils.isBlank(token)){
-            throw new RRException("token不能为空");
+//            HttpServletResponse httpResponse = (HttpServletResponse) response;
+            response.setContentType("application/json;charset=utf-8");
+            response.setHeader("Access-Control-Allow-Credentials", "true");
+            response.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
+
+            R r = R.error("invalid token");
+            String json = new Gson().toJson(r);
+            response.getWriter().print(json);
+//            LogUtils logUtils = new LogUtils();
+//            logUtils.requestLog(r);
+            return false;
         }
 
         //查询token信息

src/main/java/com/common/exception/RRException.java

@@ -8,6 +8,10 @@
 
 package com.common.exception;
 
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.util.StringUtils;
+
 /**
  * 自定义异常
  *
@@ -15,46 +19,37 @@ package com.common.exception;
  */
 public class RRException extends RuntimeException {
 	private static final long serialVersionUID = 1L;
-	
-    private String msg;
-    private int code = 500;
-    
-    public RRException(String msg) {
-		super(msg);
-		this.msg = msg;
-	}
-	
-	public RRException(String msg, Throwable e) {
-		super(msg, e);
-		this.msg = msg;
-	}
-	
-	public RRException(String msg, int code) {
-		super(msg);
-		this.msg = msg;
-		this.code = code;
-	}
-	
-	public RRException(String msg, int code, Throwable e) {
-		super(msg, e);
-		this.msg = msg;
-		this.code = code;
-	}
+	@Getter
+	@Setter
+	private String errmsg;
+	@Getter
+	@Setter
+	private String errno = "5001";
 
-	public String getMsg() {
-		return msg;
+	public RRException(String errmsg) {
+		super(errmsg);
+		this.errmsg = errmsg;
 	}
 
-	public void setMsg(String msg) {
-		this.msg = msg;
+	public RRException(String errmsg, Throwable e) {
+		super(errmsg, e);
+		this.errmsg = errmsg;
 	}
 
-	public int getCode() {
-		return code;
+	public RRException(String errmsg, String errno) {
+		super(errmsg);
+		this.errmsg = errmsg;
+		if (!StringUtils.isEmpty(errno)) {
+			this.errno = errno;
+		}
 	}
 
-	public void setCode(int code) {
-		this.code = code;
+	public RRException(String errmsg, String errno, Throwable e) {
+		super(errmsg, e);
+		this.errmsg = errmsg;
+		if (!StringUtils.isEmpty(errno)) {
+			this.errno = errno;
+		}
 	}
 	
 	

src/main/java/com/common/utils/HttpContextUtils.java

@@ -18,4 +18,8 @@ public class HttpContextUtils {
 	public static HttpServletRequest getHttpServletRequest() {
 		return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
 	}
+	public static String getOrigin(){
+		HttpServletRequest request = getHttpServletRequest();
+		return request.getHeader("Origin");
+	}
 }

src/main/java/com/common/utils/R.java

@@ -8,6 +8,9 @@
 
 package com.common.utils;
 
+import com.alibaba.fastjson.JSON;
+
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -16,41 +19,52 @@ import java.util.Map;
  *
  * @author Mark sunlightcs@gmail.com
  */
-public class R extends HashMap<String, Object> {
+public class R<T> extends HashMap<String, Object> {
 	private static final long serialVersionUID = 1L;
-	
+	/**
+	 * 返回数据状态编码，为0表示成功
+	 */
+	private String errno;
+	/**
+	 * 返回数据说明
+	 */
+	private String errmsg;
+	/**
+	 * 返回数据
+	 */
+	private T result;
 	public R() {
-		put("code", 0);
-		put("msg", "success");
+		put("errno","0");
+		put("errmsg", "success");
 	}
-	
+
 	public static R error() {
-		return error(500, "未知异常，请联系管理员");
+		return error("未知异常，请联系管理员");
 	}
-	
+
 	public static R error(String msg) {
-		return error(500, msg);
+		return error("5001", msg);
 	}
-	
-	public static R error(int code, String msg) {
+
+	public static R error(String code, String msg) {
 		R r = new R();
-		r.put("code", code);
-		r.put("msg", msg);
+		r.put("errno", code);
+		r.put("errmsg", msg);
 		return r;
 	}
 
 	public static R ok(String msg) {
 		R r = new R();
-		r.put("msg", msg);
+		r.put("errmsg", msg);
 		return r;
 	}
-	
+
 	public static R ok(Map<String, Object> map) {
 		R r = new R();
 		r.putAll(map);
 		return r;
 	}
-	
+
 	public static R ok() {
 		return new R();
 	}
@@ -60,4 +74,14 @@ public class R extends HashMap<String, Object> {
 		super.put(key, value);
 		return this;
 	}
+
+	public R put(Object value) {
+		put("result", JSON.toJSON(value));
+		return this;
+	}
+
+	public R putEmptyList() {
+		super.put("result", Collections.emptyList());
+		return this;
+	}
 }

src/main/resources/application-dev.yml

@@ -1,4 +1,6 @@
 spring:
+  resources:
+    static-locations:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:

src/main/resources/templates/error.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>错误</title>
+</head>
+<body>
+<div style="margin-top: 20px;margin-left: 10px;text-align: center;">
+    <h1>
+        <span th:text="${errmsg}"></span>
+    </h1>
+</div>
+</body>
+</html>