Merge branch 'master' into dev-group

* master:
  修复部分小问题 Squash from b973dfd to 12f96c6 by virusdefender

oj/local_settings.py

@@ -39,4 +39,4 @@ STATICFILES_DIRS = [os.path.join(BASE_DIR, "static/src/"), BASE_DIR]
 # 模板文件夹
 TEMPLATE_DIRS = [os.path.join(BASE_DIR, 'template/src/')]
 
-SSO = {"callback": "http://localhost:8765/login"}
+SSO = {"callback": "http://localhost:8765/login"}

oj/server_settings.py

@@ -11,7 +11,7 @@ DATABASES = {
         'CONN_MAX_AGE': 0.1,
         'HOST': os.environ.get("MYSQL_PORT_3306_TCP_ADDR", "127.0.0.1"),
         'PORT': 3306,
-        'USER': 'root',
+        'USER': os.environ.get("MYSQL_ENV_MYSQL_USER", "root"),
         'PASSWORD': os.environ.get("MYSQL_ENV_MYSQL_ROOT_PASSWORD", "root")
     },
     'submission': {
@@ -20,7 +20,7 @@ DATABASES = {
         'CONN_MAX_AGE': 0.1,
         'HOST': os.environ.get("MYSQL_PORT_3306_TCP_ADDR", "127.0.0.1"),
         'PORT': 3306,
-        'USER': 'root',
+        'USER': os.environ.get("MYSQL_ENV_MYSQL_USER", "root"),
         'PASSWORD': os.environ.get("MYSQL_ENV_MYSQL_ROOT_PASSWORD", "root")
     }
 }
@@ -37,7 +37,6 @@ REDIS_QUEUE = {
     "db": 2
 }
 
-
 DEBUG = False
 
 ALLOWED_HOSTS = ['*']

oj/settings.py

@@ -22,7 +22,6 @@ if ENV == "local":
 elif ENV == "server":
     from .server_settings import *
 
-
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
@@ -187,19 +186,16 @@ WEBSITE_INFO = {"website_name": "qduoj",
                 "website_footer": u"青岛大学信息工程学院 创新实验室 <a href=\"http://www.miibeian.gov.cn/\">京ICP备15062075号-1</a>",
                 "url": "https://qduoj.com"}
 
-
 HUEY = {
     'backend': 'huey.backends.redis_backend',
     'name': 'task_queue',
     'connection': {'host': REDIS_QUEUE["host"], 'port': REDIS_QUEUE["port"], 'db': REDIS_QUEUE["db"]},
-    'always_eager': False, # Defaults to False when running via manage.py run_huey
+    'always_eager': False,  # Defaults to False when running via manage.py run_huey
     # Options to pass into the consumer when running ``manage.py run_huey``
     'consumer_options': {'workers': 50},
 }
 
-
 SMTP_CONFIG = {"smtp_server": "smtp.mxhichina.com",
                "email": "noreply@qduoj.com",
                "password": os.environ.get("smtp_password", "111111"),
                "tls": False}
-

template/src/oj/account/user_index.html

@@ -31,7 +31,7 @@
                 </p>
                 {% endif %}
                 {% if user.userprofile.blog %}
-                <p class="list-group-item">
+                <p class="list-group-item"> <span class="glyphicon glyphicon-link"></span>
                     <a href="{{ user.userprofile.blog }}" target="_blank">{{ blog_link }}</a>
                 </p>
                 {% endif %}