Quellcode durchsuchen

walle 2.0 alpha - 若喜欢请不吝为我们项目点个star

walle vor 6 Jahren
Ursprung
Commit
42c264cfd7

+ 1 - 1
migrations/versions/2bca06a823a0_init_walle_database.py

@@ -168,7 +168,7 @@ def create_spaces():
 
 def init_spaces():
     sql = u"""INSERT INTO `spaces` VALUES
-            (1,2,'demo',1,'2018-09-17 22:09:37','2018-11-18 00:09:58');"""
+            (1,2,'Demo空间',1,'2018-09-17 22:09:37','2018-11-18 00:09:58');"""
     db.session.execute(sql)
 
 

+ 21 - 10
walle/config/settings_dev.py

@@ -1,23 +1,35 @@
 # -*- coding: utf-8 -*-
-"""Application configuration."""
+"""
+    walle-web
+    Application configuration.
+    注意: 带了 @TODO 的地方可能需要你的调整
+
+    :copyright: © 2015-2019 walle-web.io
+    :created time: 2018-11-24 07:05:35
+    :author: wushuiyong@walle-web.io
+"""
+from datetime import timedelta
+
 import os
 from walle.config.settings import Config
-from datetime import timedelta
+
 
 class DevConfig(Config):
     """Development configuration."""
 
+    # 服务启动 @TODO
+    # 跟hosts, nginx配置一致
     HOST = 'dev.admin.walle-web.io'
     PORT = 5000
-    # SERVER_NAME = 'dev.admin.walle-web.io:5000'
+
     ENV = 'dev'
     DEBUG = True
-    # Put the db file in project root
     WTF_CSRF_ENABLED = False
-    SQLALCHEMY_DATABASE_URI = 'mysql://root:@localhost/walle_python'
     DEBUG_TB_ENABLED = True
-    ASSETS_DEBUG = True  # Don't bundle/minify static assets
-    CACHE_TYPE = 'simple'  # Can be "memcached", "redis", etc.
+    CACHE_TYPE = 'simple'
+
+    # 数据库配置 @TODO
+    SQLALCHEMY_DATABASE_URI = 'mysql://user:password@localhost/walle_python'
     PERMANENT_SESSION_LIFETIME = timedelta(days=1)
 
     # 前端项目部署路径
@@ -25,7 +37,7 @@ class DevConfig(Config):
     AVATAR_PATH = 'avatar/'
     UPLOAD_AVATAR = FE_PATH + '/dist/' + AVATAR_PATH
 
-    #email config
+    # 邮箱配置 @TODO
     MAIL_SERVER = 'smtp.exmail.qq.com'
     MAIL_PORT = 465
     MAIL_USE_SSL = True
@@ -44,9 +56,8 @@ class DevConfig(Config):
     LOG_FILE_BACKUP_COUNT = 10
     LOG_FORMAT = "%(asctime)s %(thread)d %(message)s"
 
-
     LOCAL_SERVER_HOST = '127.0.0.1'
     LOCAL_SERVER_USER = 'wushuiyong'
     LOCAL_SERVER_PORT = 22
 
-    SQLALCHEMY_ECHO = True
+    SQLALCHEMY_ECHO = True

+ 10 - 5
walle/config/settings_prod.py

@@ -2,11 +2,13 @@
 """
     walle-web
     Application configuration.
+    注意: 带了 @TODO 的地方可能需要你的调整
 
     :copyright: © 2015-2019 walle-web.io
     :created time: 2018-11-24 07:05:35
     :author: wushuiyong@walle-web.io
 """
+
 from datetime import timedelta
 
 import os
@@ -16,8 +18,11 @@ from walle.config.settings import Config
 class ProdConfig(Config):
     """Production configuration."""
 
+    # 服务启动 @TODO
+    # 跟hosts, nginx配置一致
     HOST = 'admin.walle-web.io'
     PORT = 5000
+
     ENV = 'prod'
     DEBUG = False
     PROPAGATE_EXCEPTIONS = True
@@ -25,8 +30,8 @@ class ProdConfig(Config):
     DEBUG_TB_ENABLED = False
     CACHE_TYPE = 'simple'
 
-    # 数据库设置
-    SQLALCHEMY_DATABASE_URI = 'mysql://{user}:{password}@localhost/walle'
+    # 数据库设置 @TODO
+    SQLALCHEMY_DATABASE_URI = 'mysql://user:password@localhost/walle'
 
     # 设置session的保存时间。
     PERMANENT_SESSION_LIFETIME = timedelta(days=1)
@@ -36,7 +41,7 @@ class ProdConfig(Config):
     AVATAR_PATH = 'avatar/'
     UPLOAD_AVATAR = FE_PATH + '/dist/' + AVATAR_PATH
 
-    # 邮箱配置
+    # 邮箱配置 @TODO
     MAIL_SERVER = 'smtp.exmail.qq.com'
     MAIL_PORT = 465
     MAIL_USE_SSL = True
@@ -45,7 +50,7 @@ class ProdConfig(Config):
     MAIL_USERNAME = 'service@walle-web.io'
     MAIL_PASSWORD = 'Ki9y&3U82'
 
-    # 日志
+    # 日志 @TODO
     LOG_PATH = os.path.join(Config.PROJECT_ROOT, 'logs')
     LOG_PATH_ERROR = os.path.join(LOG_PATH, 'error.log')
     LOG_PATH_INFO = os.path.join(LOG_PATH, 'info.log')
@@ -56,7 +61,7 @@ class ProdConfig(Config):
     LOG_FILE_BACKUP_COUNT = 10
     LOG_FORMAT = "%(asctime)s %(thread)d %(message)s"
 
-    # 宿主机(walle部署所在的机器以及用户)
+    # 宿主机(walle部署所在的机器以及用户) @TODO
     LOCAL_SERVER_HOST = '127.0.0.1'
     LOCAL_SERVER_USER = 'work'
     LOCAL_SERVER_PORT = 22

+ 22 - 12
walle/config/settings_test.py

@@ -1,33 +1,41 @@
 # -*- coding: utf-8 -*-
-"""Application configuration."""
+"""
+    walle-web
+    Application configuration.
+    注意: 带了 @TODO 的地方可能需要你的调整
+
+    :copyright: © 2015-2019 walle-web.io
+    :created time: 2018-11-24 07:05:35
+    :author: wushuiyong@walle-web.io
+"""
 import os
 from walle.config.settings import Config
+from datetime import timedelta
 
 class TestConfig(Config):
     """Test configuration."""
 
+    # 服务启动 @TODO
+    # 跟hosts, nginx配置一致
     HOST = 'admin.walle-web.io'
     PORT = 5000
-    TESTING = True
+
     ENV = 'test'
     DEBUG = True
-    DB_NAME = 'walle_python'
-    # Put the db file in project root
-    DB_PATH = os.path.join(Config.PROJECT_ROOT, DB_NAME)
-    # SQLALCHEMY_DATABASE_URI = 'sqlite:///{0}'.format(DB_PATH)
-    SQLALCHEMY_DATABASE_URI = 'sqlite://'
-    BCRYPT_LOG_ROUNDS = 4  # For faster tests; needs at least 4 to avoid "ValueError: Invalid rounds"
-    WTF_CSRF_ENABLED = False  # Allows form testing
+    WTF_CSRF_ENABLED = False
     DEBUG_TB_ENABLED = True
-    ASSETS_DEBUG = True  # Don't bundle/minify static assets
-    CACHE_TYPE = 'simple'  # Can be "memcached", "redis", etc.
+    CACHE_TYPE = 'simple'
+
+    # 数据库配置 @TODO
+    SQLALCHEMY_DATABASE_URI = 'sqlite://'
+    PERMANENT_SESSION_LIFETIME = timedelta(days=1)
 
     # 前端项目部署路径
     FE_PATH = os.path.abspath(Config.PROJECT_ROOT + '/../walle-fe/')
     AVATAR_PATH = 'avatar/'
     UPLOAD_AVATAR = FE_PATH + '/dist/' + AVATAR_PATH
 
-    #email config
+    # 邮箱配置 @TODO
     MAIL_SERVER = 'smtp.exmail.qq.com'
     MAIL_PORT = 465
     MAIL_USE_SSL = True
@@ -41,10 +49,12 @@ class TestConfig(Config):
     LOG_PATH_INFO = os.path.join(LOG_PATH, 'info.log')
     LOG_PATH_DEBUG = os.path.join(LOG_PATH, 'debug.log')
     LOG_FILE_MAX_BYTES = 100 * 1024 * 1024
+
     # 轮转数量是 10 个
     LOG_FILE_BACKUP_COUNT = 10
     LOG_FORMAT = "%(asctime)s %(thread)d %(message)s"
 
+
     LOCAL_SERVER_HOST = '127.0.0.1'
     LOCAL_SERVER_USER = 'wushuiyong'
     LOCAL_SERVER_PORT = 22