From 2b7304e61575acc97d0b483057dae6549d903e05 Mon Sep 17 00:00:00 2001 From: zhengxinonly Date: Mon, 26 Jul 2021 04:21:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor(rest-api):=E8=B0=83=E6=95=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/api/file.py | 57 ++++++++++++-------------- applications/templates/file/photo.html | 44 ++++++++++---------- 2 files changed, 48 insertions(+), 53 deletions(-) diff --git a/applications/api/file.py b/applications/api/file.py index dd0a26e..59e28ff 100644 --- a/applications/api/file.py +++ b/applications/api/file.py @@ -15,8 +15,18 @@ from applications.models import Photo file_api = Api(api_bp, prefix='/file') -@file_api.resource('/upload') -class Upload(Resource): +@file_api.resource('/photos') +class FilePhotos(Resource): + + @authorize("admin:file:main", log=True) + def get(self): + page = request.args.get('page', type=int) + limit = request.args.get('limit', type=int) + photo_paginate = Photo.query.order_by(desc(Photo.create_time)).paginate(page=page, per_page=limit, + error_out=False) + data = marshal(photo_paginate.items, photo_fields) + return table_api(data=data, count=photo_paginate.total, code=0) + @authorize("admin:file:add", log=True) def post(self): if 'file' in request.files: @@ -36,34 +46,8 @@ class Upload(Resource): @authorize("admin:file:delete", log=True) def delete(self): - _id = request.form.get('id') - res = delete_photo_by_id(_id) - if res: - return success_api(msg="删除成功") - else: - return fail_api(msg="删除失败") - - -@file_api.resource('/table') -class FileTable(Resource): - """图片数据""" - - @authorize("admin:file:main", log=True) - def get(self): - page = request.args.get('page', type=int) - limit = request.args.get('limit', type=int) - photo_paginate = Photo.query.order_by(desc(Photo.create_time)).paginate(page=page, per_page=limit, - error_out=False) - data = marshal(photo_paginate.items, photo_fields) - return table_api(data=data, count=photo_paginate.total, code=0) - - -@file_api.resource('/batch_remove') -class FileBatchRemove(Resource): - """图片批量删除""" - - @authorize("admin:file:delete", log=True) - def post(self): + """图片批量删除""" + # TODO bugs 图片删除失败 ids = request.form.getlist('ids[]') photo_name = Photo.query.filter(Photo.id.in_(ids)).all() upload_url = current_app.config.get("UPLOADED_PHOTOS_DEST") @@ -75,3 +59,16 @@ class FileBatchRemove(Resource): return success_api(msg="删除成功") else: return fail_api(msg="删除失败") + + +@file_api.resource('/photo/') +class FileTable(Resource): + """图片数据""" + + @authorize("admin:file:delete", log=True) + def delete(self, photo_id): + res = delete_photo_by_id(photo_id) + if res: + return success_api(msg="删除成功") + else: + return fail_api(msg="删除失败") diff --git a/applications/templates/file/photo.html b/applications/templates/file/photo.html index 0663154..35bd096 100644 --- a/applications/templates/file/photo.html +++ b/applications/templates/file/photo.html @@ -35,26 +35,20 @@