Merge branch 'master' into dev

This commit is contained in:
冷冷 committed 2018-10-25 15:56:28 +08:00
commit 5f01480498
2 files changed
+2 -2

No files matched your search

@@ -13,7 +13,7 @@ spring:
driver-class-name: com.mysql.jdbc.Driver
username: root
password: 123456
url: jdbc:mysql://mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
url: jdbc:mysql://mysql:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true
# swagger相关配置,覆盖全局配置
swagger:
+1 -1
View File
@@ -30,7 +30,7 @@
<url>https://www.pig4cloud.com</url>
<properties>
<pigx.version>1.6.3</pigx.version>
<pigx.version>1.6.4</pigx.version>
<spring-boot.version>2.0.4.RELEASE</spring-boot.version>
<spring-cloud.version>Finchley.SR1</spring-cloud.version>
<spring-platform.version>Cairo-SR3</spring-platform.version>