feat: 改建文件上传

Author: colorful3

app/api/cms/file.py

@@ -2,9 +2,8 @@
     :copyright: © 2019 by the Lin team.
     :license: MIT, see LICENSE for more details.
 """
-from flask import request
+from flask import request, jsonify
 from lin import login_required
-from lin.exception import Success
 from lin.redprint import Redprint
 
 from app.extensions.file.local_uploader import LocalUploader
@@ -17,5 +16,5 @@
 def post_file():
     files = request.files
     uploader = LocalUploader(files)
-    uploader.upload()
-    return Success()
+    ret = uploader.upload()
+    return jsonify(ret)

app/api/cms/user.py

@@ -4,9 +4,10 @@
     :copyright: © 2019 by the Lin team.
     :license: MIT, see LICENSE for more details.
 """
+from collections import namedtuple
 from operator import and_
 
-from flask import jsonify
+from flask import jsonify, request, url_for
 from flask_jwt_extended import create_access_token, get_jwt_identity, get_current_user, \
     create_refresh_token, verify_jwt_refresh_token_in_request
 from lin.core import manager, route_meta, Log
@@ -16,8 +17,10 @@
 from lin.log import Logger
 from lin.redprint import Redprint
 
+from app.extensions.file.local_uploader import LocalUploader
 from app.libs.error_code import RefreshException
-from app.validators.forms import LoginForm, RegisterForm, ChangePasswordForm, UpdateInfoForm
+from app.validators.forms import LoginForm, RegisterForm, ChangePasswordForm, UpdateInfoForm, \
+    AvatarUpdateForm
 
 user_api = Redprint('user')
 
@@ -136,6 +139,16 @@ def get_allowed_apis():
     return jsonify(user)
 
 
+@user_api.route('/avatar', methods=['PUT'])
+@login_required
+def set_avatar():
+    form = AvatarUpdateForm().validate_for_api()
+    user = get_current_user()
+    with db.auto_commit():
+        user.avatar = form.avatar.data
+    return Success(msg='操作成功')
+
+
 def _register_user(form: RegisterForm):
     with db.auto_commit():
         # 注意：此处使用挂载到manager上的user_model，不可使用默认的User

app/app.py

@@ -26,7 +26,7 @@ def create_tables(app):
 
 
 def create_app(register_all=True):
-    app = Flask(__name__)
+    app = Flask(__name__, static_folder='./assets')
     app.config.from_object('app.config.setting')
     app.config.from_object('app.config.secure')
     if register_all:

app/extensions/file/local_uploader.py

@@ -1,5 +1,4 @@
-import os
-
+from flask import current_app
 from werkzeug.utils import secure_filename
 
 from lin.core import File
@@ -9,19 +8,34 @@
 class LocalUploader(Uploader):
 
     def upload(self, **kwargs):
-        ret = dict(file_storage=self._file_storage, file=[])
+        ret = []
+        site_domain = current_app.config.get('SITE_DOMAIN')\
+            if current_app.config.get('SITE_DOMAIN') else '127.0.0.1:5000'
         for single in self._file_storage:
-            secure_filename(single.filename)
-            name = self._generate_uuid() + self._get_ext(single)
-            full_path = os.path.join(self._store_dir, name)
-            single.save(full_path)
-            file = File.create_file(
-                name=name,
-                path=full_path,
-                _type=1,
-                extension=self._get_ext(single),
-                size=self._get_size(single),
-                commit=True
-            )
-            ret['file'].append(file)
+            file_md5 = self._generate_md5(single.read())
+            single.seek(0)
+            exists = File.query.filter_by(md5=file_md5).first()
+            if exists:
+                ret.append({
+                    "key": single.filename,
+                    "id": exists.id,
+                    "url": site_domain + '/assets/' + exists.path
+                })
+            else:
+                absolute_path, relative_path, real_name = self._get_store_path(single.filename)
+                secure_filename(single.filename)
+                single.save(absolute_path)
+                file = File.create_file(
+                    name=real_name,
+                    path=relative_path,
+                    extension=self._get_ext(single.filename),
+                    size=self._get_size(single),
+                    md5=file_md5,
+                    commit=True
+                )
+                ret.append({
+                    "key": single.filename,
+                    "id": file.id,
+                    "url": site_domain + '/assets/' + file.path
+                })
         return ret

app/validators/forms.py

@@ -141,6 +141,12 @@ class UpdateUserInfoForm(Form):
     ])
 
 
+class AvatarUpdateForm(Form):
+    avatar = StringField('头像', validators=[
+        DataRequired(message='请输入头像url')
+    ])
+
+
 class BookSearchForm(Form):
     q = StringField(validators=[DataRequired(message='必须传入搜索关键字')])  # 前端的请求参数中必须携带`q`