From cbbd11a751972077a431a8de0e8e85a0f8d85b0e Mon Sep 17 00:00:00 2001
From: ms-dev <dev@mingsoft.net>
Date: Wed, 30 Jan 2019 11:49:10 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/{application-pro.yml => application-prod.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/main/resources/{application-pro.yml => application-prod.yml} (100%)

diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-prod.yml
similarity index 100%
rename from src/main/resources/application-pro.yml
rename to src/main/resources/application-prod.yml

From 01ab9551c4aa765876613c7fbb76cae755ce8861 Mon Sep 17 00:00:00 2001
From: ms-dev <dev@mingsoft.net>
Date: Wed, 30 Jan 2019 11:54:35 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index f51ccc5d..446e8fa7 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:mysql://172.17.0.5:3306/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
+    url: jdbc:mysql://172.17.0.3:3306/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
     username: root
     password: root
     filters: wall,mergeStat

From eb5bc78b7363973a6c4719de7886b6514b29dd30 Mon Sep 17 00:00:00 2001
From: ms-dev <dev@mingsoft.net>
Date: Wed, 30 Jan 2019 11:58:15 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 446e8fa7..a59a2824 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -1,3 +1,7 @@
+server:
+  port: 4000
+  servlet.context-path: /mcms
+  
 spring:
   datasource:
     url: jdbc:mysql://172.17.0.3:3306/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false

From 7453abb3d1c2a1808e1c229736dfd211d9edf113 Mon Sep 17 00:00:00 2001
From: ms-dev <dev@mingsoft.net>
Date: Wed, 30 Jan 2019 12:03:31 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index a59a2824..f4e09b86 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -1,6 +1,6 @@
 server:
   port: 4000
-  servlet.context-path: /mcms
+  servlet.context-path: /
   
 spring:
   datasource:

From 940b4a586f0332948022a3c28220119944b30d8f Mon Sep 17 00:00:00 2001
From: ms-dev <dev@mingsoft.net>
Date: Wed, 30 Jan 2019 14:24:08 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ms-admin/4.7.0/images/default_handsome.jpg   | Bin 0 -> 3474 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/main/webapp/static/ms-admin/4.7.0/images/default_handsome.jpg

diff --git a/src/main/webapp/static/ms-admin/4.7.0/images/default_handsome.jpg b/src/main/webapp/static/ms-admin/4.7.0/images/default_handsome.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..edcea88f5c43c2107589155e041bf9e83c3087e0
GIT binary patch
literal 3474
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
aHLt>=;@r+V>qIFp&p6Mh9Mjk&>-i6Ll%8P#

literal 0
HcmV?d00001


From 6d78ce00b3fe7323e71693400c37e305182c0d2e Mon Sep 17 00:00:00 2001
From: ms group dev <dev@mingsoft.net>
Date: Wed, 30 Jan 2019 14:25:36 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/manager/index.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl
index f735089f..ecf78e37 100644
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -57,7 +57,7 @@
                   <!--登录-->
                   <el-dropdown trigger="click" class="ms-admin-login" placement="top-start" @visible-change="loginDown = !loginDown">
                      <span class="el-dropdown-link" :class="{'active':loginDown}">
-                        <img src="http://cdn.mingsoft.net/global/static/ms-admin/4.7.0//msheader.png" />
+                        <img src="${base}/static/ms-admin/4.7.0/images/default_handsome.jpg" />
                         <span v-text='peopleInfo.managerName'></span>
                      </span>
                      <el-dropdown-menu class="ms-admin-login-down" slot="dropdown" @click.native='openModal'>