From 28b6144189715d7c9ff3abbc3f8cfe1ef727a782 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Tue, 13 Nov 2018 14:59:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E7=94=A8=E6=88=B7common=5Fsettings.SITE=5FURL=20?=
 =?UTF-8?q?=E4=B8=BANone=E7=9A=84bug=20(#2027)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/common/utils.py b/apps/common/utils.py
index 7daa449a4..bb4f0132c 100644
--- a/apps/common/utils.py
+++ b/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
 
 

From 52647da79b01886123c736dadec0635e47863a88 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Tue, 13 Nov 2018 14:59:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9jumpserver?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=9B=BE=E7=89=87=20(#2020)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ec3be7810..3a220c96f 100644
--- a/README.md
+++ b/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功能")
 
 ### 开始使用