1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00

Commit Graph

  • 9c5d9229e5
    Merge pull request #413 from mercyblitz/master Mercy Ma 2019-03-08 16:34:26 +08:00
  • 10f06bec1e Polish : spring-cloud-incubator/spring-cloud-alibaba#409 : Register the Dubbo REST services as Spring Cloud services in non-web environment mercyblitz 2019-03-08 14:54:33 +08:00
  • 199b4f10d4
    Merge pull request #2 from spring-cloud-incubator/master Kai 2019-03-08 13:26:18 +08:00
  • 7c3222f235
    Merge pull request #408 from mercyblitz/master Mercy Ma 2019-03-08 13:07:12 +08:00
  • db6b7c9be0
    Merge pull request #410 from flystar32/master Xiaolong Zuo 2019-03-08 11:17:25 +08:00
  • fa0b5a8664 Fixes #404 flystar32 2019-03-07 20:58:07 +08:00
  • 82d0ff2daf Polish : spring-cloud-incubator/spring-cloud-alibaba#377 : Reactor code to be more reasonable mercyblitz 2019-03-07 18:31:31 +08:00
  • 412c1851d3 update sentinel docs fangjian0423 2019-03-07 18:09:26 +08:00
  • 1b7c0b96dd Polish : spring-cloud-incubator/spring-cloud-alibaba#377 : Add unexport logic on the context closed or the application failed mercyblitz 2019-03-07 17:52:11 +08:00
  • fc14f658a7 Polish : spring-cloud-incubator/spring-cloud-alibaba#377 : DubboMetadataConfigService will not be export for the pure Dubbo consumer side. mercyblitz 2019-03-07 17:36:29 +08:00
  • 892216ffd2 Polish : spring-cloud-incubator/spring-cloud-alibaba#377 : rename the metadata properties mercyblitz 2019-03-07 16:45:11 +08:00
  • e48863640a Polish : spring-cloud-incubator/spring-cloud-alibaba#377 : Refactor mercyblitz 2019-03-07 16:29:31 +08:00
  • b7513ea02c
    Merge pull request #401 from JakeConnors376W/patch-1 format 2019-03-07 16:18:30 +08:00
  • c6a31dac63
    Merge pull request #406 from mercyblitz/master Mercy Ma 2019-03-07 14:33:40 +08:00
  • ad34e8a5e9 update nacos and fescar version flystar32 2019-03-07 10:52:32 +08:00
  • 45c4c5baf5
    Merge pull request #405 from fangjian0423/master Xiaolong Zuo 2019-03-07 10:36:01 +08:00
  • b50cd9266f update nacos and fescar version and format some testcase flystar32 2019-03-07 10:17:30 +08:00
  • 514fef53f5 Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#377 : Resolve version issue mercyblitz 2019-03-06 23:22:23 +08:00
  • fa1aa272b1 Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#377 : Use Apache Dubbo 2.7.x as Spring Cloud Infrastructure mercyblitz 2019-03-06 23:13:43 +08:00
  • b9efe318d8 update docs fangjian0423 2019-03-06 11:23:28 +08:00
  • 501d08d1e5 add spring cloud gateway bom fangjian0423 2019-03-06 10:59:04 +08:00
  • d01aff527e update docs fangjian0423 2019-03-06 10:58:21 +08:00
  • 3d919f0a80 update docs fangjian0423 2019-03-05 20:48:47 +08:00
  • 3b3c60fbc7
    Merge pull request #398 from fangjian0423/master format 2019-03-05 19:27:26 +08:00
  • 9c2229bddb
    Merge pull request #402 from zhendong590/master Xiaolong Zuo 2019-03-05 15:44:15 +08:00
  • ee4dd40c04 remove sms,schedulerx,oss modules in coverage gaoyunpeng 2019-03-05 15:30:18 +08:00
  • 72bf5a1453 remove useless log fangjian0423 2019-03-05 11:24:58 +08:00
  • b0c1eb3b42
    Make concise JakeConnors376W 2019-03-04 16:16:06 -08:00
  • b09024f28f resolve problem in sentinel test case in 1.x fangjian0423 2019-03-04 21:51:31 +08:00
  • af574779fd sentinel zuul refactor sync in 1.x fangjian0423 2019-03-04 21:18:27 +08:00
  • bfcabfd068 add switch to instance CommonFilter in SentinelProperties fangjian0423 2019-03-04 20:48:54 +08:00
  • f126d57cc8 modify sentinel zuul prefix configuration properties fangjian0423 2019-03-04 20:48:22 +08:00
  • 3049f727de sentinel zuul rename package name fangjian0423 2019-03-04 16:52:38 +08:00
  • c470f56492 sentinel zuul refactor 1.x fangjian0423 2019-03-04 16:48:57 +08:00
  • 80d27a1824 sentinel zuul refactor fangjian0423 2019-03-04 16:46:05 +08:00
  • 707dd54d09
    Merge pull request #1 from spring-cloud-incubator/master Kai 2019-03-04 15:54:15 +08:00
  • 0e4de15632 update sms example fangjian0423 2019-03-04 15:38:57 +08:00
  • 5e9cfaba0e refactor sms log fangjian0423 2019-03-04 15:38:01 +08:00
  • d0cbd9f994 sms refactor 1.x fangjian0423 2019-03-04 15:24:29 +08:00
  • d4767da1c5 sms & sentinel refactor 1.x fangjian0423 2019-03-04 15:23:19 +08:00
  • 15b01929ab sync sentinel zuul to 1.x branch fangjian0423 2019-03-04 14:45:18 +08:00
  • 01d7620d74 add nacos config test case flystar32 2019-03-04 10:35:13 +08:00
  • 14d505b53d update sms docs & remove useless dependency fangjian0423 2019-03-02 17:00:03 +08:00
  • 6cc5ecb137 Merge remote-tracking branch 'upstream/master' fangjian0423 2019-03-01 17:28:15 +08:00
  • bc0127751e add nacos config test case flystar32 2019-03-01 15:34:33 +08:00
  • 9c305da38a
    Merge pull request #396 from zhendong590/master format 2019-03-01 15:07:39 +08:00
  • 59bac8f9b9 support EnableDiscoveryClient flystar32 2019-03-01 11:18:10 +08:00
  • a0b7f92282 support EnableDiscoveryClient flystar32 2019-03-01 11:17:46 +08:00
  • 9934f5bc60 resolve conflict fangjian0423 2019-02-28 19:20:53 +08:00
  • 7a09e1edf1 there is no need calculate nacos-config-server module gaoyunpeng 2019-02-28 17:34:18 +08:00
  • 9ae1c28906 add test case of ANS flystar32 2019-02-28 17:20:15 +08:00
  • 11db5e8728 add test case of ANS flystar32 2019-02-28 17:11:04 +08:00
  • 97ddae22fc sync rocketmq binder to 1.x fangjian0423 2019-02-28 16:39:22 +08:00
  • dbfc363c02
    Merge pull request #394 from yunzheng1228/master xiaojing 2019-02-28 16:20:35 +08:00
  • df8f703460 Fixed nacos-example's bug, Change the attribute value of spring.application.name from 'sca-nacos-config' to 'nacos-config-example' yunzheng1228 2019-02-28 15:51:42 +08:00
  • 923a2b590d When the service attribute is empty, modify the log level of ANS to warn. yunzheng1228 2019-02-28 15:43:27 +08:00
  • 348f699eb8 Merge remote-tracking branch 'upstream/1.x' into binder-dev-1.x fangjian0423 2019-02-28 15:41:45 +08:00
  • db0fa6547b add more ACM test case flystar32 2019-02-28 15:39:20 +08:00
  • cd02c50151 add more test case flystar32 2019-02-28 15:36:14 +08:00
  • 7cc3b02917 update rocketmq examples fangjian0423 2019-02-28 15:31:28 +08:00
  • 5b2d068f7d Polish #145 fangjian0423 2019-02-28 15:30:12 +08:00
  • 509d4819b3 Merge remote-tracking branch 'upstream/master' into binder-dev fangjian0423 2019-02-28 15:23:39 +08:00
  • 2622f2c5bd add ACM test case flystar32 2019-02-28 14:57:45 +08:00
  • 34e6f75421 add ACM test case flystar32 2019-02-28 14:21:42 +08:00
  • c94eec5828 Change log level when the service attribute of nacos is empty. yunzheng1228 2019-02-28 14:18:26 +08:00
  • 986e529043
    Merge pull request #390 from mostcool/master format 2019-02-27 19:12:20 +08:00
  • 0f0fb62c72
    Merge pull request #389 from mercyblitz/master Mercy Ma 2019-02-27 13:45:13 +08:00
  • ef00e96b5c 包含sms-example模块 gaokai 2019-02-27 10:36:19 +08:00
  • bf73f83a11 删除重复依赖 gaokai 2019-02-27 10:35:55 +08:00
  • eef764a020 删除重复属性 gaokai 2019-02-27 10:35:45 +08:00
  • a0092470e5 add test case flystar32 2019-02-26 20:09:11 +08:00
  • 901f9a7def
    Merge pull request #388 from carlWangTao/patch-2 format 2019-02-26 18:38:59 +08:00
  • f98b74ad45 Merge remote-tracking branch 'upstream/master' mercyblitz 2019-02-26 16:55:57 +08:00
  • f719e16d38 Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : Supports all Spring Cloud Registries and default is Nacos mercyblitz 2019-02-26 16:54:36 +08:00
  • ab1ecca6ab Polish : /spring-cloud-incubator/spring-cloud-alibaba#387 : Dubbo Spring Cloud Samples mercyblitz 2019-02-26 16:25:41 +08:00
  • 8e9398d24f Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : supports Spring Cloud Consul mercyblitz 2019-02-26 16:24:55 +08:00
  • cac7574396
    Merge pull request #384 from Harris2012/patch-1 xiaojing 2019-02-26 16:11:34 +08:00
  • c454294370
    Update NacosDiscoveryProperties.java WangTao 2019-02-26 15:49:26 +08:00
  • 21f3451f7b Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#387 : Add Dubbo Spring Cloud Samples mercyblitz 2019-02-26 14:52:47 +08:00
  • b3c26c509e Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : supports Spring Cloud Netflix Eureka and Spring Cloud Zookeeper mercyblitz 2019-02-26 14:50:26 +08:00
  • 5da1fbb6c1
    Merge pull request #372 from xiaolongzuo/master xiaojing 2019-02-26 11:16:06 +08:00
  • 9e0a4d6b4a
    Merge pull request #385 from xiaolongzuo/1.x xiaojing 2019-02-26 11:15:44 +08:00
  • 844d17b9f6 Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba xiaolongzuo 2019-02-26 10:54:27 +08:00
  • ac27dd9b30 Add scx and oss java doc. xiaolongzuo 2019-02-26 10:49:42 +08:00
  • 71b2488131 Add scx and oss java doc. xiaolongzuo 2019-02-26 10:49:42 +08:00
  • 29b2589f1c Merge branch '1.x' of github.com:spring-cloud-incubator/spring-cloud-alibaba into 1.x xiaolongzuo 2019-02-25 19:24:15 +08:00
  • ca7a376ab2
    Merge pull request #383 from pbting/1.x Xiaolong Zuo 2019-02-25 17:42:20 +08:00
  • a543be5f9f Format log naming yunzheng1228 2019-02-25 16:44:08 +08:00
  • 6ae1df0363 Polish xiaolongzuo 2019-02-25 15:00:11 +08:00
  • 25f16d3528 Polish test cases for schedulerx xiaolongzuo 2019-02-25 14:35:39 +08:00
  • 6ff11740bf Add statistics for nacos discovery and test case xiaolongzuo 2019-02-25 16:42:45 +08:00
  • 34bcd8b242 Add statistics for nacos discovery and test case xiaolongzuo 2019-02-21 15:09:20 +08:00
  • 84bb53f706 Merge remote-tracking branch 'upstream/master' into binder-dev fangjian0423 2019-02-25 16:28:30 +08:00
  • 03f8defb09
    Merge pull request #367 from zhendong590/master format 2019-02-25 16:28:06 +08:00
  • 83d0220c73 Merge remote-tracking branch 'upstream/master' into binder-dev fangjian0423 2019-02-25 15:31:26 +08:00
  • e537eb55de resolve conflict fangjian0423 2019-02-25 15:31:03 +08:00
  • ca31245a8a Polish xiaolongzuo 2019-02-25 15:00:11 +08:00
  • 2a83f3e84e Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba xiaolongzuo 2019-02-25 14:38:47 +08:00
  • fa5b57f3db Polish test cases for schedulerx xiaolongzuo 2019-02-25 14:35:39 +08:00
  • e8aaa3e948
    Merge pull request #373 from tigerMoon/feature-spring-cloud-alibaba-sentinel-zuul Xiaolong Zuo 2019-02-25 11:37:03 +08:00