Commit Graph

1295 Commits

Author SHA1 Message Date
tanghc
d21bbfaa21 Merge branch 'master' into registry-nacos 2019-07-29 11:53:31 +08:00
tanghc
a068210300 1.13.4 2019-07-29 11:53:09 +08:00
tanghc
753fbc651a Merge branch 'master' into registry-nacos 2019-07-29 11:29:51 +08:00
tanghc
e5f53e4d92 1.13.4 2019-07-29 11:27:44 +08:00
tanghc
01c4fda639 Merge branch 'master' into registry-nacos 2019-07-28 10:56:19 +08:00
tanghc
17de022e3c 1.13.4 2019-07-28 10:55:43 +08:00
tanghc
33f00bbc62 1.13.4 2019-07-28 10:55:23 +08:00
tanghc
2d5a65e525 Merge branch 'master' into registry-nacos 2019-07-26 17:36:38 +08:00
tanghc
fdf9f341fd 1.13.3 2019-07-26 17:36:09 +08:00
tanghc
47f621837a Merge branch 'master' into registry-nacos 2019-07-26 12:23:33 +08:00
tanghc
d42c9e9ba4 1.13.3 2019-07-26 12:23:04 +08:00
tanghc
a863c00d3f 优化参数绑定 2019-07-26 12:20:46 +08:00
tanghc
e5a49846ce Merge branch 'master' into registry-nacos 2019-07-25 21:01:56 +08:00
tanghc
c40ff46da1 1.13.2 2019-07-25 21:01:08 +08:00
tanghc
49fb6bf15f Merge branch 'master' into registry-nacos 2019-07-25 20:34:58 +08:00
tanghc
9f78eceded 1.13.2 2019-07-25 20:34:29 +08:00
tanghc
6fc25b5434 Merge branch 'master' into registry-nacos 2019-07-25 14:06:57 +08:00
tanghc
bf49c68286 1.13.1 2019-07-25 14:05:31 +08:00
tanghc
eb4612f22f 1.13.1 2019-07-25 13:51:03 +08:00
tanghc
55ca508905 1.13.1 2019-07-25 13:37:26 +08:00
tanghc
05db438b9f Merge branch 'master' into registry-nacos 2019-07-24 18:55:17 +08:00
tanghc
709186b0da 1.13.1 2019-07-24 18:54:53 +08:00
tanghc
7a7a3b7c8c Merge branch 'master' into registry-nacos 2019-07-24 18:46:36 +08:00
tanghc
064e5188ce 1.13.1 2019-07-24 18:45:48 +08:00
tanghc
3e49780fa2 Merge branch 'master' into registry-nacos 2019-07-24 17:05:33 +08:00
tanghc
bdbd716aac 1.13.1 2019-07-24 17:04:04 +08:00
tanghc
6bc3da3fa8 代码优化 2019-07-24 17:01:42 +08:00
tanghc
fb82f27a43 代码优化 2019-07-24 16:43:32 +08:00
tanghc
82f7e2ba28 代码优化 2019-07-24 16:34:26 +08:00
tanghc
74f3ef2000 代码优化 2019-07-24 16:31:56 +08:00
tanghc
64f80a589c 更新文档 2019-07-24 16:30:08 +08:00
tanghc
b1ebd770c2 代码优化 2019-07-22 10:32:00 +08:00
tanghc
8d9debbc2d Merge branch 'master' into registry-nacos 2019-07-21 20:30:57 +08:00
tanghc
ec556ebf7b 1.13.0 1.13.0 2019-07-21 20:30:10 +08:00
tanghc
fb4108e980 Merge branch 'master' into registry-nacos 2019-07-19 20:16:39 +08:00
tanghc
a5a0b5c476 1.13.0 2019-07-19 20:15:52 +08:00
tanghc
c850712f8b 1.12.4 2019-07-19 20:14:34 +08:00
tanghc
32ea08c78b 1.13.0 2019-07-19 20:13:22 +08:00
tanghc
0f1c7e4d2a Merge branch 'master' into registry-nacos 2019-07-19 10:22:31 +08:00
tanghc
86ceb045c5 1.12.4 2019-07-19 10:22:01 +08:00
tanghc
ef28db6a1d Merge branch 'master' into registry-nacos
# Conflicts:
#	sop-gateway/src/main/resources/application-dev.properties
2019-07-19 10:14:32 +08:00
tanghc
bea7348dc8 1.12.4 2019-07-19 10:13:02 +08:00
tanghc
7c90239ef3 Merge branch 'master' into registry-nacos 2019-07-18 17:44:12 +08:00
tanghc
29ecaec4bd 1.12.4 2019-07-18 17:43:37 +08:00
tanghc
8876cb1fa0 1.12.4 2019-07-18 17:37:34 +08:00
tanghc
9adfe58b0d 配置文件优化 2019-07-18 15:46:37 +08:00
tanghc
167d0a77f7 配置文件优化 2019-07-18 15:28:48 +08:00
tanghc
fce0b4d242 Merge branch 'develop' into registry-nacos 2019-07-18 14:34:38 +08:00
tanghc
194a39a042 配置文件优化 2019-07-18 14:34:12 +08:00
tanghc
7a97b0ff9d Merge branch 'master' into registry-nacos 2019-07-16 08:46:09 +08:00