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

This commit is contained in:
yinxr 2019-01-28 11:11:09 +08:00
commit 314f6c50d1
3 changed files with 3 additions and 3 deletions

View File

@ -1,2 +1,2 @@
# 温馨提示请使用master分支 # 温馨提示请使用master分支
当前版本:4.7.0 开发版本极其不稳定,如有使用概不解答,请耐心等待稳定版本的发布,<br/> 当前版本:4.7.0 开发版本极其不稳定,如有使用概不解答,请耐心等待稳定版本的发布,<br/>

View File

@ -1,6 +1,6 @@
spring: spring:
datasource: datasource:
url: jdbc:mysql://192.168.1.18:3306/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false url: jdbc:mysql://localhost:3307/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
username: root username: root
password: root password: root
filters: wall,mergeStat filters: wall,mergeStat

View File

@ -22,7 +22,7 @@ ms:
spring: spring:
profiles: profiles:
active: dev active: test
mvc: mvc:
pathmatch: pathmatch:
use-suffix-pattern: true use-suffix-pattern: true