Răsfoiți Sursa

RESULT 提交

zjy 1 lună în urmă
părinte
comite
5c36e8df2e

+ 37 - 0
alien-entity/src/main/java/shop/alien/entity/result/APPConstant.java

@@ -0,0 +1,37 @@
+package shop.alien.entity.result;
+
+/**
+ * 常量
+ *
+ * @author ssk
+ * @since 1.0.0
+ */
+public interface APPConstant {
+
+    String AAA = "AAA";
+
+    String CAS = "CAS";
+
+    String basePackage = "com.pcitc";
+
+    String ACCEPT_DEPT_UNIFORMITY = "AcceptDeptUniformity";
+
+    /**
+     * 默认为空消息
+     */
+    String DEFAULT_NULL_MESSAGE = "暂无承载数据";
+    /**
+     * 默认成功消息
+     */
+    String DEFAULT_SUCCESS_MESSAGE = "操作成功";
+    /**
+     * 默认失败消息
+     */
+    String DEFAULT_FAILURE_MESSAGE = "操作失败";
+    /**
+     * 默认未授权消息
+     */
+    String DEFAULT_UNAUTHORIZED_MESSAGE = "签名认证失败";
+
+    int SC_OK = 200;
+}

+ 1 - 1
alien-entity/src/main/java/shop/alien/entity/result/IResultCode.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
 /**
  * 业务代码接口
  *
- * @author Chill
+ * @author ssk
  */
 public interface IResultCode extends Serializable {
 

+ 11 - 20
alien-entity/src/main/java/shop/alien/entity/result/R.java

@@ -2,8 +2,9 @@ package shop.alien.entity.result;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.ToString;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
@@ -14,9 +15,10 @@ import java.util.Optional;
 /**
  * 统一API响应结果封装
  *
- * @author Chill
+ * @author ssk
  */
-@Data
+@Getter
+@Setter
 @ToString
 @NoArgsConstructor
 @ApiModel
@@ -24,22 +26,10 @@ public class R<T> implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    static String DEFAULT_NULL_MESSAGE = "暂无承载数据";
-
-    static String DEFAULT_SUCCESS_MESSAGE = "操作成功";
-
-    static String DEFAULT_FAILURE_MESSAGE = "操作失败";
-
-    @ApiModelProperty(value = "状态码")
     private int code;
-
-    @ApiModelProperty(value = "是否成功")
     private boolean success;
-
-    @ApiModelProperty(value = "数据对象")
+    @ApiModelProperty(value = "对象")
     private T data;
-
-    @ApiModelProperty(value = "消息提示")
     private String msg;
 
     private R(IResultCode resultCode) {
@@ -95,7 +85,7 @@ public class R<T> implements Serializable {
      * @return R
      */
     public static <T> R<T> data(T data) {
-        return data(data, DEFAULT_SUCCESS_MESSAGE);
+        return data(data, APPConstant.DEFAULT_SUCCESS_MESSAGE);
     }
 
     /**
@@ -107,7 +97,7 @@ public class R<T> implements Serializable {
      * @return R
      */
     public static <T> R<T> data(T data, String msg) {
-        return data(ResultCode.SUCCESS.getCode(), data, msg);
+        return data(APPConstant.SC_OK, data, msg);
     }
 
     /**
@@ -120,7 +110,7 @@ public class R<T> implements Serializable {
      * @return R
      */
     public static <T> R<T> data(int code, T data, String msg) {
-        return new R<>(code, data, data == null ? DEFAULT_NULL_MESSAGE : msg);
+        return new R<>(code, data, data == null ? APPConstant.DEFAULT_NULL_MESSAGE : msg);
     }
 
     /**
@@ -168,6 +158,7 @@ public class R<T> implements Serializable {
         return new R<>(ResultCode.FAILURE, msg);
     }
 
+
     /**
      * 返回R
      *
@@ -210,7 +201,7 @@ public class R<T> implements Serializable {
      * @return R
      */
     public static <T> R<T> status(boolean flag) {
-        return flag ? success(DEFAULT_SUCCESS_MESSAGE) : fail(DEFAULT_FAILURE_MESSAGE);
+        return flag ? success(APPConstant.DEFAULT_SUCCESS_MESSAGE) : fail(APPConstant.DEFAULT_FAILURE_MESSAGE);
     }
 
 }

+ 32 - 84
alien-entity/src/main/java/shop/alien/entity/result/ResultCode.java

@@ -1,13 +1,30 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package shop.alien.entity.result;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import javax.servlet.http.HttpServletResponse;
+
+
 /**
  * 业务代码枚举
  *
  * @author ssk
- * @date 2019-05-08 14:04
  */
 @Getter
 @AllArgsConstructor
@@ -16,137 +33,68 @@ public enum ResultCode implements IResultCode {
     /**
      * 操作成功
      */
-    SUCCESS(200, "操作成功"),
+    SUCCESS(HttpServletResponse.SC_OK, "操作成功"),
 
     /**
      * 业务异常
      */
-    FAILURE(400, "业务异常"),
+    FAILURE(HttpServletResponse.SC_BAD_REQUEST, "业务异常"),
 
     /**
      * 请求未授权
      */
-    UN_AUTHORIZED(401, "请求未授权"),
+    UN_AUTHORIZED(HttpServletResponse.SC_UNAUTHORIZED, "请求未授权"),
 
     /**
      * 404 没找到请求
      */
-    NOT_FOUND(404, "404 没找到请求"),
+    NOT_FOUND(HttpServletResponse.SC_NOT_FOUND, "404 没找到请求"),
 
     /**
      * 消息不能读取
      */
-    MSG_NOT_READABLE(400, "消息不能读取"),
+    MSG_NOT_READABLE(HttpServletResponse.SC_BAD_REQUEST, "消息不能读取"),
 
     /**
      * 不支持当前请求方法
      */
-    METHOD_NOT_SUPPORTED(405, "不支持当前请求方法"),
+    METHOD_NOT_SUPPORTED(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "不支持当前请求方法"),
 
     /**
      * 不支持当前媒体类型
      */
-    MEDIA_TYPE_NOT_SUPPORTED(415, "不支持当前媒体类型"),
+    MEDIA_TYPE_NOT_SUPPORTED(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, "不支持当前媒体类型"),
 
     /**
      * 请求被拒绝
      */
-    REQ_REJECT(403, "请求被拒绝"),
+    REQ_REJECT(HttpServletResponse.SC_FORBIDDEN, "请求被拒绝"),
 
     /**
      * 服务器异常
      */
-    INTERNAL_SERVER_ERROR(500, "服务器异常"),
+    INTERNAL_SERVER_ERROR(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "服务器异常"),
 
     /**
      * 缺少必要的请求参数
      */
-    PARAM_MISS(400, "缺少必要的请求参数"),
+    PARAM_MISS(HttpServletResponse.SC_BAD_REQUEST, "缺少必要的请求参数"),
 
     /**
      * 请求参数类型错误
      */
-    PARAM_TYPE_ERROR(400, "请求参数类型错误"),
+    PARAM_TYPE_ERROR(HttpServletResponse.SC_BAD_REQUEST, "请求参数类型错误"),
 
     /**
      * 请求参数绑定错误
      */
-    PARAM_BIND_ERROR(400, "请求参数绑定错误"),
+    PARAM_BIND_ERROR(HttpServletResponse.SC_BAD_REQUEST, "请求参数绑定错误"),
 
     /**
      * 参数校验失败
      */
-    PARAM_VALID_ERROR(400, "参数校验失败"),
-
-
-    CONTINUE(100, "Continue"),
-    SWITCHING_PROTOCOLS(101, "Switching Protocols"),
-    PROCESSING(102, "Processing"),
-    CHECKPOINT(103, "Checkpoint"),
-    OK(200, "OK"),
-    CREATED(201, "Created"),
-    ACCEPTED(202, "Accepted"),
-    NON_AUTHORITATIVE_INFORMATION(203, "Non-Authoritative Information"),
-    NO_CONTENT(204, "No Content"),
-    RESET_CONTENT(205, "Reset Content"),
-    PARTIAL_CONTENT(206, "Partial Content"),
-    MULTI_STATUS(207, "Multi-Status"),
-    ALREADY_REPORTED(208, "Already Reported"),
-    IM_USED(226, "IM Used"),
-    MULTIPLE_CHOICES(300, "Multiple Choices"),
-    MOVED_PERMANENTLY(301, "Moved Permanently"),
-    FOUND(302, "Found"),
-    MOVED_TEMPORARILY(302, "Moved Temporarily"),
-    SEE_OTHER(303, "See Other"),
-    NOT_MODIFIED(304, "Not Modified"),
-    USE_PROXY(305, "Use Proxy"),
-    TEMPORARY_REDIRECT(307, "Temporary Redirect"),
-    PERMANENT_REDIRECT(308, "Permanent Redirect"),
-    BAD_REQUEST(400, "Bad Request"),
-    UNAUTHORIZED(401, "Unauthorized"),
-    PAYMENT_REQUIRED(402, "Payment Required"),
-    FORBIDDEN(403, "Forbidden"),
-    //    NOT_FOUND(404, "Not Found"),
-    METHOD_NOT_ALLOWED(405, "Method Not Allowed"),
-    NOT_ACCEPTABLE(406, "Not Acceptable"),
-    PROXY_AUTHENTICATION_REQUIRED(407, "Proxy Authentication Required"),
-    REQUEST_TIMEOUT(408, "Request Timeout"),
-    CONFLICT(409, "Conflict"),
-    GONE(410, "Gone"),
-    LENGTH_REQUIRED(411, "Length Required"),
-    PRECONDITION_FAILED(412, "Precondition Failed"),
-    PAYLOAD_TOO_LARGE(413, "Payload Too Large"),
-    REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"),
-    URI_TOO_LONG(414, "URI Too Long"),
-    REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"),
-    UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"),
-    REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested range not satisfiable"),
-    EXPECTATION_FAILED(417, "Expectation Failed"),
-    I_AM_A_TEAPOT(418, "I'm a teapot"),
-    INSUFFICIENT_SPACE_ON_RESOURCE(419, "Insufficient Space On Resource"),
-    METHOD_FAILURE(420, "Method Failure"),
-    DESTINATION_LOCKED(421, "Destination Locked"),
-    UNPROCESSABLE_ENTITY(422, "Unprocessable Entity"),
-    LOCKED(423, "Locked"),
-    FAILED_DEPENDENCY(424, "Failed Dependency"),
-    TOO_EARLY(425, "Too Early"),
-    UPGRADE_REQUIRED(426, "Upgrade Required"),
-    PRECONDITION_REQUIRED(428, "Precondition Required"),
-    TOO_MANY_REQUESTS(429, "Too Many Requests"),
-    REQUEST_HEADER_FIELDS_TOO_LARGE(431, "Request Header Fields Too Large"),
-    UNAVAILABLE_FOR_LEGAL_REASONS(451, "Unavailable For Legal Reasons"),
-    //    INTERNAL_SERVER_ERROR(500, "Internal Server Error"),
-    NOT_IMPLEMENTED(501, "Not Implemented"),
-    BAD_GATEWAY(502, "Bad Gateway"),
-    SERVICE_UNAVAILABLE(503, "Service Unavailable"),
-    GATEWAY_TIMEOUT(504, "Gateway Timeout"),
-    HTTP_VERSION_NOT_SUPPORTED(505, "HTTP Version not supported"),
-    VARIANT_ALSO_NEGOTIATES(506, "Variant Also Negotiates"),
-    INSUFFICIENT_STORAGE(507, "Insufficient Storage"),
-    LOOP_DETECTED(508, "Loop Detected"),
-    BANDWIDTH_LIMIT_EXCEEDED(509, "Bandwidth Limit Exceeded"),
-    NOT_EXTENDED(510, "Not Extended"),
-    NETWORK_AUTHENTICATION_REQUIRED(511, "Network Authentication Required");
+    PARAM_VALID_ERROR(HttpServletResponse.SC_BAD_REQUEST, "参数校验失败"),
+    ;
 
     /**
      * code编码