wip:(重构接口实现方式)

applications/__init__.py

@@ -1,22 +1,24 @@
 import os
 
 from flask import Flask, Blueprint
-from common.flask_uploads import configure_uploads
 
+import config
+from applications.view import init_view
+from common import register_api
+from common.flask_uploads import configure_uploads
 from common.utils.upload import photos
 from extensions import init_plugs
-from applications.view import init_view
-import config
 
 api_bp: Blueprint = Blueprint('api', __name__, url_prefix='/api/v1')
 
 from .rights import register_rights_api
-from .system import register_system_api
+from .system import FilePhotoAPI, LoginAPI
 from .users import register_users_api
 
 register_rights_api(api_bp)
 register_users_api(api_bp)
-register_system_api(api_bp)
+register_api(LoginAPI, 'login_api', '/passport/login', pk='_id', app=api_bp)
+register_api(FilePhotoAPI, 'photo_api', '/file/photo', pk='photo_id', app=api_bp)
 
 
 def init_api(app: Flask) -> None:

applications/system/__init__.py

@@ -1,12 +1,6 @@
-from flask_restful import Api
+from flask import Blueprint
 
-from .file import FilePhotosResource, FilePhotoResource
-from .passport import LoginResource
+from .file import FilePhotoAPI
+from .passport import LoginAPI
 
 
-def register_system_api(api_bp):
-    sys_api = Api(api_bp)
-
-    sys_api.add_resource(FilePhotosResource, '/file/photos')
-    sys_api.add_resource(FilePhotoResource, '/file/photo/<int:photo_id>')
-    sys_api.add_resource(LoginResource, '/passport/login')

applications/system/file.py

@@ -1,26 +1,40 @@
-import os
-
-from flask import request, jsonify, current_app
-from flask_restful import Resource
+from flask import request, jsonify
+from flask.views import MethodView
 from sqlalchemy import desc
 
 from common.utils.http import fail_api, success_api, table_api
 from common.utils.upload import upload_one, delete_photo_by_id
-from extensions import db
 from models import PhotoModel
 
 
-class FilePhotosResource(Resource):
+class FilePhotoAPI(MethodView):
 
-    def get(self):
-        page = request.args.get('page', type=int)
-        limit = request.args.get('limit', type=int)
-        photo_paginate = PhotoModel.query.order_by(desc(PhotoModel.create_at)
-                                                   ).paginate(page=page,
-                                                              per_page=limit,
-                                                              error_out=False)
-        data = [
-            {
+    def get(self, photo_id):
+        if photo_id is None:
+            page = request.args.get('page', type=int)
+            limit = request.args.get('limit', type=int)
+            photo_paginate = PhotoModel.query.order_by(desc(PhotoModel.create_at)
+                                                       ).paginate(page=page,
+                                                                  per_page=limit,
+                                                                  error_out=False)
+            data = [
+                {
+                    'id': item.id,
+                    'name': item.name,
+                    'href': item.href,
+                    'mime': item.mime,
+                    'size': item.size,
+                    'ext': item.ext if hasattr(item, 'ext') else "",
+                    'create_at': str(item.create_at),
+                } for item in photo_paginate.items
+            ]
+            return table_api(result={'items': data,
+                                     'total': photo_paginate.total, },
+                             code=0)
+        else:
+            # 显示一张图片
+            item = PhotoModel.query.get(photo_id)
+            return table_api(result={'items': {
                 'id': item.id,
                 'name': item.name,
                 'href': item.href,
@@ -28,11 +42,9 @@ class FilePhotosResource(Resource):
                 'size': item.size,
                 'ext': item.ext if hasattr(item, 'ext') else "",
                 'create_at': str(item.create_at),
-            } for item in photo_paginate.items
-        ]
-        return table_api(result={'items': data,
-                                 'total': photo_paginate.total, },
-                         code=0)
+            },
+                'total': 1, },
+                code=0)
 
     def post(self):
         if 'file' in request.files:
@@ -50,28 +62,12 @@ class FilePhotosResource(Resource):
             return jsonify(res)
         return fail_api()
 
-    def delete(self):
-        """图片批量删除"""
-        # TODO bugs 图片删除失败
-        ids = request.form.getlist('ids[]')
-        photo_name = PhotoModel.query.filter(PhotoModel.id.in_(ids)).all()
-        upload_url = current_app.config.get("UPLOADED_PHOTOS_DEST")
-        for p in photo_name:
-            os.remove(upload_url + '/' + p.name)
-        photo = PhotoModel.query.filter(PhotoModel.id.in_(ids)).delete(synchronize_session=False)
-        db.session.commit()
-        if photo:
-            return success_api(message="删除成功")
-        else:
-            return fail_api(message="删除失败")
-
-
-class FilePhotoResource(Resource):
-    """图片数据"""
-
     def delete(self, photo_id):
         res = delete_photo_by_id(photo_id)
         if res:
             return success_api(message="删除成功")
         else:
             return fail_api(message="删除失败")
+
+    def put(self, photo_id):
+        pass

applications/system/passport.py

@@ -1,7 +1,8 @@
 from flask import render_template, make_response
 from flask import session, redirect, url_for
+from flask.views import MethodView
 from flask_login import current_user, login_user
-from flask_restful import Resource, reqparse
+from flask_restful import reqparse
 
 from common.gen_captcha import add_auth_session
 from common.utils.http import fail_api, success_api
@@ -9,7 +10,7 @@ from common.utils.rights import record_logging
 from models import UserModel
 
 
-class LoginResource(Resource):
+class LoginAPI(MethodView):
 
     def get(self):
         if current_user.is_authenticated: