Merge remote-tracking branch 'github/dev' into dev

README.md

@@ -20,7 +20,7 @@ Jumpserver采纳分布式架构，支持多机房跨区域部署，中心节点
 
 ### 功能
 
- ![Jumpserver功能](https://jumpserver-release.oss-cn-hangzhou.aliyuncs.com/Jumpserver13.jpg "Jumpserver功能")
+ ![Jumpserver功能](https://jumpserver-release.oss-cn-hangzhou.aliyuncs.com/Jumpserver-14.png "Jumpserver功能")
 
 ### 开始使用
 

apps/common/utils.py

@@ -38,7 +38,8 @@ def reverse(view_name, urlconf=None, args=None, kwargs=None,
 
     if external:
         from common.models import common_settings
-        url = common_settings.SITE_URL.strip('/') + url
+        site_url = common_settings.SITE_URL or settings.SITE_URL
+        url = site_url.strip('/') + url
     return url