From 59db9888f2b75bbf98226f585ac75f28dab8f8b1 Mon Sep 17 00:00:00 2001
From: chenwj <654891551@qq.com>
Date: Wed, 18 Jan 2023 11:41:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20dtos=E5=92=8Cbiz=E5=B8=B8=E8=A7=84?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/biz/__init__.py  |  2 +-
 src/dtos/__init__.py | 29 ++++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/biz/__init__.py b/src/biz/__init__.py
index 1be3ff6..74a6e2e 100644
--- a/src/biz/__init__.py
+++ b/src/biz/__init__.py
@@ -2,10 +2,10 @@ import logging
 import time
 from traceback import format_exc
 
+import sqlalchemy
 from fastapi_sqlalchemy import db
 from jinja2 import Template
 from pymysql import err
-import sqlalchemy
 
 __author__ = 'Woodstock'
 
diff --git a/src/dtos/__init__.py b/src/dtos/__init__.py
index 3afeeda..df3a223 100644
--- a/src/dtos/__init__.py
+++ b/src/dtos/__init__.py
@@ -28,25 +28,44 @@ class PageItemModel(BaseModel):
     currentPage: int = 0
     items: List[BaseModel] = []
 
+
 class BaseResponse(BaseModel):
-    result: Union[dict, list, Any] = None
+    result: Any = None
     code: int = 200
     error: ErrorModel
 
+
 class ListResponse(BaseResponse):
     result: PageItemModel 
 
+
 class SuccessResponse(BaseResponse):
     result: dict = dict(success=True)
 
+
 class FailResponse(BaseResponse):
     result: dict = dict(success=False)
 
+
 class SendCaptchaSuccess(BaseResponse):
     result: dict = dict(success=True, token="<user_token:str>", image="<base64_str:str>")
 
-class BadRequestError(BaseResponse):
-    error: ErrorModel = ErrorModel(**dict(code=400, message="BAD REQUEST", details="请求参数有误"))
 
-class ServerInternalError(BaseResponse):
-    error: ErrorModel = ErrorModel(**dict(code=500, message="INTERNAL SERVER ERROR", details="服务器内部错误"))
\ No newline at end of file
+class BadRequestError(ErrorModel):
+    code = 400
+    message = "BAD REQUEST"
+    details = "请求参数错误"
+
+
+class BadRequestResponse(BaseResponse):
+    error: BadRequestError
+
+
+class ServerInternalError(ErrorModel):
+    code = 500
+    message = "INTERNAL SERVER ERROR"
+    details = "服务器内部错误"
+
+
+class ServerInternalResponse(BaseResponse):
+    error: ServerInternalError
\ No newline at end of file