Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0

src/main/resources/application-test.yml

@@ -1,6 +1,10 @@
+server:
+  port: 4000
+  servlet.context-path: /
+  
 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

src/main/webapp/WEB-INF/manager/index.ftl

@@ -55,7 +55,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'>