diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 5321da1..8826aa8 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,6 @@ blog_secret_key scripts/ -storage/ \ No newline at end of file +storage/ + +storage.zip \ No newline at end of file diff --git a/app/__init__.py b/app/__init__.py old mode 100644 new mode 100755 diff --git a/app/apis/__init__.py b/app/apis/__init__.py old mode 100644 new mode 100755 diff --git a/app/apis/download.py b/app/apis/download.py old mode 100644 new mode 100755 diff --git a/app/apis/logic_operation.py b/app/apis/logic_operation.py old mode 100644 new mode 100755 index 36b4685..a453b5f --- a/app/apis/logic_operation.py +++ b/app/apis/logic_operation.py @@ -25,7 +25,7 @@ def add_folder(): :return: """ parent_id = g.args.get('parentFolderId', None, type=int) - name = g.args.get('name') + name = g.args['name'] new_dir = Directory(name=name, parent_id=parent_id if parent_id else None, user_id=g.user.id) if new_dir.save(): return jsonify({'status': 1, 'folderInfo': format_data.format_directory(new_dir)}) diff --git a/app/apis/upload.py b/app/apis/upload.py old mode 100644 new mode 100755 diff --git a/app/apis/verify.py b/app/apis/verify.py old mode 100644 new mode 100755 diff --git a/app/config/__init__.py b/app/config/__init__.py old mode 100644 new mode 100755 diff --git a/app/config/default.py b/app/config/default.py old mode 100644 new mode 100755 index 6680234..4d0bfd3 --- a/app/config/default.py +++ b/app/config/default.py @@ -15,10 +15,11 @@ class DefaultConfig: MYSQL_HOST = os.environ.get('MYSQL_HOST') - MYSQL_PORT = os.environ.get('MYSQL_PORT') + MYSQL_PORT = os.environ.get('MYSQL_PORT', 3306) OSS_MODE = os.environ.get('OSS_MODE', 'DEVELOP') + # 这里需要声明使用 utf-8 字符集 SQLALCHEMY_DATABASE_URI = 'mysql://{}:{}@{}:{}/oss?charset=utf8'.format( MYSQL_USERNAME, MYSQL_PASSWORD, MYSQL_HOST, MYSQL_PORT) diff --git a/app/config/develop.py b/app/config/develop.py old mode 100644 new mode 100755 index f0927e8..c0d13b0 --- a/app/config/develop.py +++ b/app/config/develop.py @@ -15,3 +15,6 @@ class DevelopConfig(DefaultConfig): # 文件上传保存路径 UPLOAD_FOLDER = os.path.join(os.path.abspath(os.curdir), 'storage') + + # 用于显示 sql 语句 + SQLALCHEMY_ECHO = True diff --git a/app/config/product.py b/app/config/product.py old mode 100644 new mode 100755 index c01b477..2e69143 --- a/app/config/product.py +++ b/app/config/product.py @@ -4,6 +4,7 @@ # 2017-11-18 12:10 from app.config.default import DefaultConfig +import os class ProductConfig(DefaultConfig): @@ -12,4 +13,4 @@ class ProductConfig(DefaultConfig): """ DEBUG = False - UPLOAD_FOLDER = '/oss' \ No newline at end of file + UPLOAD_FOLDER = os.path.join(os.path.abspath(os.curdir), 'storage') \ No newline at end of file diff --git a/app/models/__init__.py b/app/models/__init__.py old mode 100644 new mode 100755 diff --git a/app/models/directory.py b/app/models/directory.py old mode 100644 new mode 100755 diff --git a/app/models/file.py b/app/models/file.py old mode 100644 new mode 100755 diff --git a/app/models/storage_file.py b/app/models/storage_file.py old mode 100644 new mode 100755 diff --git a/app/models/user.py b/app/models/user.py old mode 100644 new mode 100755 diff --git a/app/tools/__init__.py b/app/tools/__init__.py old mode 100644 new mode 100755 diff --git a/app/tools/filter_data.py b/app/tools/filter_data.py old mode 100644 new mode 100755 diff --git a/app/tools/format_data.py b/app/tools/format_data.py old mode 100644 new mode 100755 diff --git a/app/tools/hash_file.py b/app/tools/hash_file.py old mode 100644 new mode 100755 diff --git a/app/tools/logic_file_tool.py b/app/tools/logic_file_tool.py old mode 100644 new mode 100755 diff --git a/app/tools/split_data.py b/app/tools/split_data.py old mode 100644 new mode 100755 diff --git a/app/tools/storage_file_tool.py b/app/tools/storage_file_tool.py old mode 100644 new mode 100755 diff --git a/requirements.txt b/requirements.txt old mode 100644 new mode 100755 diff --git a/run.py b/run.py old mode 100644 new mode 100755