Merge branch 'master' of https://github.com/TaleLin/lin-cms-flask

Author: colorful3

Pipfile

@@ -12,7 +12,7 @@ Flask = "==1.0.2"
 Flask-SQLAlchemy = "==2.3.2"
 Flask-WTF = "==0.14.2"
 Flask-Cors = "==2.1.0"
-Lin-CMS = "==0.1.1b1"
+Lin-CMS = "==0.1.1b3"
 
 [dev-packages]
 pytest = "*"

README.md

@@ -35,9 +35,9 @@ Lin-CMS 是林间有风团队经过大量项目实践所提炼出的一套**内
 
 ## 最新版本
 
-核心库：0.1.1b1
+核心库：0.1.1b3
 
-示例工程：0.1.0-beta.1
+示例工程：0.1.0-beta.2
 
 
 ### 文档地址
@@ -48,6 +48,18 @@ Lin-CMS 是林间有风团队经过大量项目实践所提炼出的一套**内
 
 [http://face.cms.7yue.pro/](http://face.cms.7yue.pro/)
 
+### QQ 交流群
+
+QQ 群号：643205479
+
+<img class="QR-img" width="258" height="300" src="http://imglf3.nosdn0.126.net/img/Qk5LWkJVWkF3Nmdyc2xGcUtScEJLOVV1clErY1dJa0FsQ3E1aDZQWlZHZ2dCbSt4WXA1V3dRPT0.jpg?imageView&thumbnail=1680x0&quality=96&stripmeta=0&type=jpg">
+
+### 微信公众号
+
+微信搜索：林间有风
+
+<img class="QR-img" src="http://imglf6.nosdn0.126.net/img/YUdIR2E3ME5weEdlNThuRmI4TFh3UWhiNmladWVoaTlXUXpicEFPa1F6czFNYkdmcWRIbGRRPT0.jpg?imageView&thumbnail=500x0&quality=96&stripmeta=0&type=jpg">
+
 ### Lin CMS 的特点
 
 Lin CMS 的构筑思想是有其自身特点的。下面我们阐述一些 Lin 的主要特点。
@@ -165,4 +177,4 @@ pipenv shell
 
 ## 下个版本开发计划
 
-- [ ] 调整 jwt 机制，增强灵活性
+- [ ] 系统访问日志、错误日志

app/api/cms/__init__.py

@@ -13,9 +13,11 @@ def create_cms():
     from .admin import admin_api
     from .user import user_api
     from .log import log_api
+    from .file import file_api
     from .test import test_api
     admin_api.register(cms)
     user_api.register(cms)
     log_api.register(cms)
+    file_api.register(cms)
     test_api.register(cms)
     return cms

app/api/cms/admin.py

@@ -55,7 +55,7 @@ def get_admin_users():
     for user, group_name in users:
         setattr(user, 'group_name', group_name)
         user._fields.append('group_name')
-        user.hide('update_time', 'delete_time')
+        user.hide('update_time')
         user_and_group.append(user)
     # 有分组的时候就加入分组条件
     # total_nums = get_total_nums(manager.user_model, is_soft=True, admin=UserAdmin.COMMON.value)

app/api/cms/file.py

@@ -0,0 +1,20 @@
+"""
+    :copyright: © 2019 by the Lin team.
+    :license: MIT, see LICENSE for more details.
+"""
+from flask import request, jsonify
+from lin import login_required
+from lin.redprint import Redprint
+
+from app.extensions.file.local_uploader import LocalUploader
+
+file_api = Redprint('file')
+
+
+@file_api.route('/', methods=['POST'])
+@login_required
+def post_file():
+    files = request.files
+    uploader = LocalUploader(files)
+    ret = uploader.upload()
+    return jsonify(ret)

app/api/cms/user.py

@@ -17,7 +17,8 @@
 from lin.redprint import Redprint
 
 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 +137,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/config.py

@@ -0,0 +1,9 @@
+# 文件相关配置
+FILE = {
+    "STORE_DIR": 'app/assets',
+    "SINGLE_LIMIT": 1024 * 1024 * 2,
+    "TOTAL_LIMIT": 1024 * 1024 * 20,
+    "NUMS": 10,
+    "INCLUDE": set([]),
+    "EXCLUDE": set([])
+}

app/extensions/file/local_uploader.py

@@ -0,0 +1,41 @@
+from flask import current_app
+from werkzeug.utils import secure_filename
+
+from lin.core import File
+from lin.file import Uploader
+
+
+class LocalUploader(Uploader):
+
+    def upload(self):
+        ret = []
+        site_domain = current_app.config.get('SITE_DOMAIN')\
+            if current_app.config.get('SITE_DOMAIN') else 'http://127.0.0.1:5000'
+        for single in self._file_storage:
+            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.name,
+                    "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.name,
+                    "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`