From c9d187d3ea6572aa5c3d4ef95c0777445f42af73 Mon Sep 17 00:00:00 2001
From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Tue, 17 Mar 2020 08:59:54 +0800
Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8=E5=A4=84?=
 =?utf8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../dlpay/exception/BadRequestError.java      | 26 +++++++++++++++++++
 .../dlpay/exception/ConflictError.java        | 26 +++++++++++++++++++
 .../dlpay/exception/InternalServerError.java  | 26 +++++++++++++++++++
 .../dlpay/framework/framework_util.kt         |  6 ++++-
 4 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 payapi/src/main/java/com/supwisdom/dlpay/exception/BadRequestError.java
 create mode 100644 payapi/src/main/java/com/supwisdom/dlpay/exception/ConflictError.java
 create mode 100644 payapi/src/main/java/com/supwisdom/dlpay/exception/InternalServerError.java

diff --git a/payapi/src/main/java/com/supwisdom/dlpay/exception/BadRequestError.java b/payapi/src/main/java/com/supwisdom/dlpay/exception/BadRequestError.java
new file mode 100644
index 00000000..a32465a1
--- /dev/null
+++ b/payapi/src/main/java/com/supwisdom/dlpay/exception/BadRequestError.java
@@ -0,0 +1,26 @@
+package com.supwisdom.dlpay.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.BAD_REQUEST)
+public class BadRequestError extends RuntimeException {
+  public BadRequestError() {
+  }
+
+  public BadRequestError(String message) {
+    super(message);
+  }
+
+  public BadRequestError(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public BadRequestError(Throwable cause) {
+    super(cause);
+  }
+
+  public BadRequestError(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+    super(message, cause, enableSuppression, writableStackTrace);
+  }
+}
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/exception/ConflictError.java b/payapi/src/main/java/com/supwisdom/dlpay/exception/ConflictError.java
new file mode 100644
index 00000000..2cc0de57
--- /dev/null
+++ b/payapi/src/main/java/com/supwisdom/dlpay/exception/ConflictError.java
@@ -0,0 +1,26 @@
+package com.supwisdom.dlpay.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.CONFLICT)
+public class ConflictError extends RuntimeException {
+  public ConflictError() {
+  }
+
+  public ConflictError(String message) {
+    super(message);
+  }
+
+  public ConflictError(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public ConflictError(Throwable cause) {
+    super(cause);
+  }
+
+  public ConflictError(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+    super(message, cause, enableSuppression, writableStackTrace);
+  }
+}
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/exception/InternalServerError.java b/payapi/src/main/java/com/supwisdom/dlpay/exception/InternalServerError.java
new file mode 100644
index 00000000..4eb51683
--- /dev/null
+++ b/payapi/src/main/java/com/supwisdom/dlpay/exception/InternalServerError.java
@@ -0,0 +1,26 @@
+package com.supwisdom.dlpay.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+public class InternalServerError extends RuntimeException {
+  public InternalServerError() {
+  }
+
+  public InternalServerError(String message) {
+    super(message);
+  }
+
+  public InternalServerError(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public InternalServerError(Throwable cause) {
+    super(cause);
+  }
+
+  public InternalServerError(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+    super(message, cause, enableSuppression, writableStackTrace);
+  }
+}
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/framework_util.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/framework_util.kt
index a4d76190..f37cae1d 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/framework_util.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/framework/framework_util.kt
@@ -28,6 +28,10 @@ class ResponseBodyBuilder private constructor() {
             return ResponseEntity.ok(create().fail(bean, code, msg))
         }
 
+        fun <T> ok(bean: T): ResponseEntity<T> {
+            return ResponseEntity.ok(bean)
+        }
+
         fun <T> fail(status: HttpStatus, bean: T): ResponseEntity<T> {
             return ResponseEntity.status(status).body(bean)
         }
@@ -44,7 +48,7 @@ class ResponseBodyBuilder private constructor() {
             return fail(HttpStatus.NOT_FOUND, msg)
         }
 
-        fun notFound(error: ErrorResponse) : ResponseEntity<ErrorResponse> {
+        fun notFound(error: ErrorResponse): ResponseEntity<ErrorResponse> {
             return fail(HttpStatus.NOT_FOUND, error)
         }
 
-- 
2.17.1