Commit Graph

308 Commits

Author SHA1 Message Date
tanghc
d6756b7f88 Merge branch 'eureka' into fit-eureka 2019-09-29 11:30:47 +08:00
tanghc
3e506b27ef 适配eureka 2019-09-29 11:23:53 +08:00
tanghc
b94b48eb60 Merge branch 'eureka' into fit-eureka 2019-09-29 11:07:57 +08:00
tanghc
ebae593ab6 适配eureka 2019-09-29 10:59:53 +08:00
tanghc
c5d36a8200 适配eureka 2019-09-27 20:15:51 +08:00
tanghc
35253be77d 适配eureka 2019-09-27 20:06:52 +08:00
tanghc
be0adc0a8e 适配eureka 2019-09-26 20:01:35 +08:00
tanghc
3dc11f0e20 2.1.2 2019-09-18 10:34:54 +08:00
tanghc
d0eefd5ef0 2.1.0 2019-09-09 09:24:05 +08:00
tanghc
603e2b7dc6 升级fastjson到1.2.60 2019-09-06 19:47:17 +08:00
tanghc
e47cd0e002 2.0 2019-09-02 19:37:22 +08:00
tanghc
ec32e8b39f 2.0 2019-08-29 14:42:39 +08:00
tanghc
84b31313bf 2.0 2019-08-29 13:02:32 +08:00
tanghc
d19e4a79e9 2.0 2019-08-29 12:07:49 +08:00
tanghc
3b1917428a 2.0 2019-08-28 17:16:30 +08:00
tanghc
6c9f5528f2 2.0 2019-08-27 17:29:02 +08:00
tanghc
c217028521 2.0 2019-08-27 14:34:32 +08:00
tanghc
2969f1738a 2.0 2019-08-27 14:33:42 +08:00
tanghc
45f3eb8f89 2.0 2019-08-26 12:45:37 +08:00
tanghc
7d5d6ed3e3 2.0 2019-08-23 16:18:45 +08:00
tanghc
90fdbbccf2 2.0 2019-08-23 15:29:11 +08:00
tanghc
bbd4e55c6a 2.0 2019-08-23 13:52:05 +08:00
tanghc
26f7d2843e 2.0 2019-08-22 11:25:22 +08:00
tanghc
0496b70ec5 2.0 2019-08-21 20:16:46 +08:00
tanghc
02c53920a4 2.0 2019-08-21 18:03:33 +08:00
tanghc
6e2a0e6c13 全面使用nacos,舍弃zookeeper 2019-08-21 16:04:32 +08:00
tanghc
c7451c84f9 全面使用nacos,舍弃zookeeper 2019-08-21 12:35:07 +08:00
tanghc
219f944162 全面使用nacos,舍弃zookeeper 2019-08-20 19:17:23 +08:00
tanghc
6fc6d9cea3 Merge branch 'master' into registry-nacos 2019-08-16 14:51:26 +08:00
tanghc
cbe0250f75 1.15.2 2019-08-16 14:50:07 +08:00
tanghc
16e56a93e3 Merge branch 'master' into registry-nacos 2019-08-14 16:13:00 +08:00
tanghc
485401b8ba 1.15.1 2019-08-14 16:08:56 +08:00
tanghc
95e11d9688 1.15.1 2019-08-14 16:05:23 +08:00
tanghc
a16e9df6a5 Merge branch 'master' into registry-nacos 2019-08-14 14:16:30 +08:00
tanghc
b68663b995 1.15.1 2019-08-14 14:15:18 +08:00
tanghc
18fac20ffd Merge branch 'master' into registry-nacos 2019-08-13 15:34:19 +08:00
tanghc
ddd0241905 1.15.0 2019-08-13 15:31:39 +08:00
tanghc
aabc7b90a7 优化文档刷新逻辑 2019-08-13 14:46:54 +08:00
tanghc
66e378816c 验证提示优化 2019-08-12 20:28:43 +08:00
tanghc
1f71312184 服务列表按钮位置优化 2019-08-09 17:33:40 +08:00
tanghc
62f49eb404 Merge branch 'develop' into registry-nacos 2019-08-09 17:32:20 +08:00
tanghc
130d843e42 1.14.0 2019-08-09 17:20:04 +08:00
tanghc
3a2d591005 admin服务列表在线靠前 2019-08-09 17:08:47 +08:00
tanghc
0be8a83d07 Merge branch 'master' into registry-nacos 2019-08-07 17:12:57 +08:00
tanghc
9525e2bbba 1.14.0 2019-08-07 17:12:25 +08:00
tanghc
68e0cc96c5 Merge branch 'master' into registry-nacos 2019-08-07 15:44:01 +08:00
tanghc
257ee838f9 1.14.0 2019-08-07 15:43:25 +08:00
tanghc
c5ce01208f Merge branch 'master' into registry-nacos 2019-08-07 15:18:20 +08:00
tanghc
d188faf621 Merge branch 'develop'
# Conflicts:
#	changelog.md
#	sop-admin/sop-admin-server/pom.xml
#	sop-common/pom.xml
#	sop-common/sop-gateway-common/pom.xml
#	sop-common/sop-registry-api/pom.xml
#	sop-common/sop-service-common/pom.xml
#	sop-example/sop-auth/pom.xml
#	sop-example/sop-book/sop-book-web/pom.xml
#	sop-example/sop-easyopen/pom.xml
#	sop-example/sop-springmvc/pom.xml
#	sop-example/sop-story/sop-story-web/pom.xml
#	sop-gateway/pom.xml
#	sop-website/website-server/pom.xml
2019-08-07 15:15:54 +08:00
tanghc
06e0608130 1.14.0 2019-08-07 15:12:56 +08:00