修改返回值

ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/http/LoginResponse.java

@@ -0,0 +1,130 @@
+package com.baiye.http;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+
+/**
+ * @author
+ * 属性为 空（""） 或者为 NULL 都不序列化，则返回的json是没有这个字段的。这样对移动端会更省流量
+ * @param <T>
+ */
+@JsonSerialize
+@Getter
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+@NoArgsConstructor
+public class LoginResponse<T> implements Serializable {
+
+
+    private static final long serialVersionUID = -7237947628886320124L;
+
+    /**
+     * 成功还是失败的状态标识 0,成功 1,失败
+     */
+    private int status;
+
+    /**
+     * 返回信息
+     */
+    private String message;
+
+    /**
+     * 返回的结果数据
+     */
+    private T data;
+
+
+    /*
+        封装所有的构造器为私有的
+     */
+
+    private LoginResponse(int status) {
+        this.status = status;
+    }
+
+    private LoginResponse(int status, T data) { // ps: 当调用T为String类型时候,会默认调用下面的ServerResponse(int status, String message)类型的构造器
+        this.status = status;
+        this.data = data;
+    }
+
+    private LoginResponse(int status, String message, T data) {
+        this.status = status;
+        this.message = message;
+        this.data = data;
+    }
+
+    private LoginResponse(int status, String message) {
+        this.status = status;
+        this.message = message;
+    }
+
+    /*
+        对外开放调用的静态方法,用来调用私有构造器,来返回成功结果给前台
+     */
+
+    /**
+     * 返回成功码和默认的成功信息
+     */
+    public static <T> LoginResponse<T> createBySuccess() {
+        return new LoginResponse<>(ResponseCode.SUCCESS.getCode(),ResponseCode.SUCCESS.getDesc());
+    }
+
+    /**
+     * 返回成功码和成功信息
+     */
+    public static <T> LoginResponse<T> createBySuccessMessage(String message) {
+        return new LoginResponse<>(ResponseCode.SUCCESS.getCode(), message);
+    }
+
+    /**
+     * 返回成功码和数据
+     */
+    public static <T> LoginResponse<T> createBySuccess(T data) {
+        return new LoginResponse<>(ResponseCode.SUCCESS.getCode(), data);
+    }
+
+    /**
+     * 返回成功码和成功信息和数据
+     */
+    public static <T> LoginResponse<T> createBySuccess(String message, T data) {
+        return new LoginResponse<>(ResponseCode.SUCCESS.getCode(), message, data);
+    }
+
+    /*
+       对外开放调用的静态方法,用来调用私有构造器,来返回失败结果给前台
+    */
+
+    /**
+     * 返回错误码和错误描述
+     */
+    public static <T> LoginResponse<T> createByError(){
+        return new LoginResponse<>(ResponseCode.ERROR.getCode(),ResponseCode.ERROR.getDesc());
+    }
+
+    /**
+     * 返回错误码和错误信息(传入)
+     */
+    public static <T> LoginResponse<T> createByErrorMessage(String errorMessage){
+        return new LoginResponse<>(ResponseCode.ERROR.getCode(),errorMessage);
+    }
+
+    /**
+     * 返回错误码(传入)和错误信息(传入)
+     */
+    public static <T> LoginResponse<T> createByErrorCodeMessage(int errorCode, String errorMessage){
+        return new LoginResponse<>(errorCode,errorMessage);
+    }
+
+    /**
+     * 返回错误码(传入)和错误信息(传入)
+     */
+    public static <T> LoginResponse<T> createBySuccess(int successCode){
+        return new LoginResponse<>(successCode, ResponseCode.SUCCESS.getDesc());
+    }
+
+
+}

ad-platform-common/ad-platform-common-security/src/main/java/com/baiye/component/ResourceAuthExceptionEntryPoint.java

@@ -33,7 +33,7 @@ public class ResourceAuthExceptionEntryPoint implements AuthenticationEntryPoint
         Map<String,Object> result = new HashMap<>(6);
         result.put("code", HttpStatus.UNAUTHORIZED.value());
         if (e!=null){
-            result.put("msg","error");
+            result.put("message","error");
             result.put("data", "user does not exist ");
         }
         response.setStatus(HttpStatus.UNAUTHORIZED.value());

ad-platform-common/ad-platform-common-security/src/main/java/com/baiye/handle/CustomAuthenticationFailureHandler.java

@@ -1,6 +1,6 @@
 package com.baiye.handle;
 
-import com.baiye.http.CommonResponse;
+import com.baiye.http.LoginResponse;
 import com.baiye.http.ResponseCode;
 import com.baiye.util.ResponseUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -24,38 +24,38 @@ import java.io.IOException;
 public class CustomAuthenticationFailureHandler implements AuthenticationFailureHandler {
     @Override
     public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException {
-        CommonResponse<?> result;
+        LoginResponse<?> result;
         String username = request.getParameter("username");
         if (exception instanceof AccountExpiredException) {
             // 账号过期
             log.info("[登录失败] - 用户[{}]账号过期", username);
-            result = CommonResponse.createByErrorMessage(ResponseCode.USER_ACCOUNT_EXPIRED.getDesc());
+            result = LoginResponse.createByErrorMessage(ResponseCode.USER_ACCOUNT_EXPIRED.getDesc());
         } else if (exception instanceof BadCredentialsException) {
             // 密码错误
             log.info("[登录失败] - 用户[{}]密码错误", username);
-            result = CommonResponse.createByErrorMessage(ResponseCode.USER_PASSWORD_ERROR.getDesc());
+            result = LoginResponse.createByErrorMessage(ResponseCode.USER_PASSWORD_ERROR.getDesc());
         } else if (exception instanceof CredentialsExpiredException) {
             // 密码过期
             log.info("[登录失败] - 用户[{}]密码过期", username);
-            result = CommonResponse.createByErrorMessage(ResponseCode.USER_PASSWORD_EXPIRED.getDesc());
+            result = LoginResponse.createByErrorMessage(ResponseCode.USER_PASSWORD_EXPIRED.getDesc());
         } else if (exception instanceof DisabledException) {
             // 用户被禁用
             log.info("[登录失败] - 用户[{}]被禁用", username);
-            result = CommonResponse.createByErrorMessage(ResponseCode.USER_DISABLED.getDesc());
+            result = LoginResponse.createByErrorMessage(ResponseCode.USER_DISABLED.getDesc());
 
         } else if (exception instanceof LockedException) {
             // 用户被锁定
             log.info("[登录失败] - 用户[{}]被锁定", username);
-            result = CommonResponse.createByErrorMessage(ResponseCode.USER_LOCKED.getDesc());
+            result = LoginResponse.createByErrorMessage(ResponseCode.USER_LOCKED.getDesc());
 
         } else if (exception instanceof InternalAuthenticationServiceException) {
             // 内部错误
             log.error(String.format("[登录失败] - [%s]内部错误", username));
-            result = CommonResponse.createByErrorMessage(ResponseCode.USER_LOGIN_FAIL.getDesc());
+            result = LoginResponse.createByErrorMessage(ResponseCode.USER_LOGIN_FAIL.getDesc());
         } else {
             // 其他错误
             log.error(String.format("[登录失败] - [%s]其他错误", username), exception);
-            result = CommonResponse.createByErrorMessage(ResponseCode.USER_LOGIN_FAIL.getDesc());
+            result = LoginResponse.createByErrorMessage(ResponseCode.USER_LOGIN_FAIL.getDesc());
         }
         ResponseUtil.responseWriter(response, "UTF-8", HttpStatus.UNAUTHORIZED.value(), result);
     }