Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0
This commit is contained in:
commit
314f6c50d1
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue