Merge branch 'dev' into docker

This commit is contained in:
冷冷 committed 2018-07-27 10:08:07 +08:00
commit 1c4fcaa82e
27 files changed
+139 -263

No files matched your search

@@ -45,4 +45,11 @@ ribbon:
ReadTimeout: 10000
ConnectTimeout: 10000
#swagger公共信息
swagger:
description: '全宇宙最牛逼的Spring Cloud微服务开发脚手架'
version: '1.2.4'
contact:
name: '冷冷'
email: 'wangiegie@gmail.com'
url: 'https://gitee.wang/pig/pigx'