LeoDu030314 преди 4 години
родител
ревизия
fd06d2ad7c
променени са 4 файла, в които са добавени 9 реда и са изтрити 11 реда
  1. 2 2
      backend_refactor/app.py
  2. 0 1
      backend_refactor/route/code.py
  3. 5 6
      backend_refactor/route/upload.py
  4. 2 2
      backend_refactor/route/util.py

+ 2 - 2
backend_refactor/app.py

@@ -21,13 +21,13 @@ app.register_blueprint(route.upload.bp, url_prefix=VERSION_PREFIX)
 @app.errorhandler(413)
 def error_handler(e):
     logging.exception(e)
-    return make_response(413, "entity too large, max acceptable: " + str(MAX_CONTENT_LENGTH) + " bytes", {}, 413)
+    return make_response(413, "entity too large, max acceptable: " + str(MAX_CONTENT_LENGTH) + " bytes", {})
 
 
 @app.errorhandler(Exception)
 def error_handler(e):
     logging.exception(e)
-    return make_response(500, "unknown internal server error.", {}, 500)
+    return make_response(500, "unknown internal server error.", {})
 
 
 if __name__ == '__main__':

+ 0 - 1
backend_refactor/route/code.py

@@ -1 +0,0 @@
-UPLOAD_INVALID_FORMAT = -10001

+ 5 - 6
backend_refactor/route/upload.py

@@ -4,7 +4,6 @@ import uuid
 from flask import request, Blueprint
 
 from config import UPLOAD_DIR
-from route import code
 from route.util import make_response
 
 from PIL import Image
@@ -15,11 +14,11 @@ bp = Blueprint("upload", __name__, url_prefix='/')
 def upload(type):
     # 检查是否正确上传了文件
     if 'file' not in request.files:
-        return make_response(400, "no file part.", {}, 400)
+        return make_response(400, "no file part.", {})
 
     file = request.files['file']
     if file.filename == '':
-        return make_response(400, "no selected file.", {}, 400)
+        return make_response(400, "no selected file.", {})
 
     # 随机 uuid 名称
     random_name = str(uuid.uuid4())
@@ -34,15 +33,15 @@ def upload(type):
             img.save(open(UPLOAD_DIR + random_name + ".jpg", "wb"))
         except Exception as e:
             logging.exception(e)
-            return make_response(code.UPLOAD_INVALID_FORMAT, "cannot identify image file.", {})
+            return make_response(400, "cannot identify image file.", {})
     elif type == "video":
         if not file.filename.endswith(".mp4"):
-            return make_response(code.UPLOAD_INVALID_FORMAT, "only mp4 videos are accepted.", {})
+            return make_response(400, "only mp4 videos are accepted.", {})
         file.save(UPLOAD_DIR + random_name + ".mp4")
     else:
         assert False, "unknown upload format"
 
-    return make_response(0, "success", {"uuid": random_name})
+    return make_response(201, "success", {"uuid": random_name})
 
 
 @bp.route("/photos", methods=["POST"])

+ 2 - 2
backend_refactor/route/util.py

@@ -1,11 +1,11 @@
 from flask import Response, jsonify
 
 
-def make_response(status: int, msg: str, return_data: dict, http_status_code=200) -> Response:
+def make_response(http_status_code: int, msg: str, return_data: dict) -> Response:
     """
     标准请求返回
     :return: Response
     """
-    ret = jsonify({"code": status, "msg": msg, "data": return_data})
+    ret = jsonify(code=http_status_code, msg=msg, data=return_data)
     ret.status_code = http_status_code
     return ret