refactor(重构程序&目录结构)

applications/api/system/file.py

@@ -4,10 +4,10 @@ from flask import request, jsonify, current_app
 from flask_restful import Resource
 from sqlalchemy import desc
 
-from applications.common.utils.http import fail_api, success_api, table_api
-from applications.common.utils.upload import upload_one, delete_photo_by_id
-from applications.extensions import db
-from applications.models import FilePhoto
+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 PhotoModels
 
 
 class FilePhotosResource(Resource):
@@ -15,11 +15,10 @@ class FilePhotosResource(Resource):
     def get(self):
         page = request.args.get('page', type=int)
         limit = request.args.get('limit', type=int)
-        photo_paginate = FilePhoto.query.order_by(desc(FilePhoto.create_at)
-                                                  ).paginate(page=page,
+        photo_paginate = PhotoModels.query.order_by(desc(PhotoModels.create_at)
+                                                    ).paginate(page=page,
                                                              per_page=limit,
                                                              error_out=False)
-        # data = marshal(photo_paginate.items, FilePhoto.fields())
         data = [
             {
                 'id': item.id,
@@ -55,11 +54,11 @@ class FilePhotosResource(Resource):
         """图片批量删除"""
         # TODO bugs 图片删除失败
         ids = request.form.getlist('ids[]')
-        photo_name = FilePhoto.query.filter(FilePhoto.id.in_(ids)).all()
+        photo_name = PhotoModels.query.filter(PhotoModels.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 = FilePhoto.query.filter(FilePhoto.id.in_(ids)).delete(synchronize_session=False)
+        photo = PhotoModels.query.filter(PhotoModels.id.in_(ids)).delete(synchronize_session=False)
         db.session.commit()
         if photo:
             return success_api(message="删除成功")

applications/api/system/passport.py

@@ -3,10 +3,10 @@ from flask import session, redirect, url_for
 from flask_login import current_user, login_user
 from flask_restful import Resource, reqparse
 
-from applications.common.gen_captcha import add_auth_session
-from applications.common.utils.http import fail_api, success_api
-from applications.common.utils.rights import record_logging
-from applications.models import CompanyUser
+from common.gen_captcha import add_auth_session
+from common.utils.http import fail_api, success_api
+from common.utils.rights import record_logging
+from models import UserModels
 
 
 class LoginResource(Resource):
@@ -28,7 +28,7 @@ class LoginResource(Resource):
 
         if req.captcha != s_code:
             return fail_api(message="验证码错误")
-        user = CompanyUser.query.filter_by(username=req.username).first()
+        user = UserModels.query.filter_by(username=req.username).first()
 
         if user is None:
             return fail_api(message="不存在的用户")