study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Commit Graph

  • fa71593248 sync code from master branch flystar32 2019-03-27 14:09:37 +08:00
  • 655f752e12 format code flystar32 2019-03-27 12:42:54 +08:00
  • 7e35e71119 fix bug of sentinel feign in 1.x branch fangjian0423 2019-03-26 20:35:33 +08:00
  • fb3f70d475 fix bug of sentinel feign in finchley branch fangjian0423 2019-03-26 20:26:39 +08:00
  • 080ad2df1e fix bug about feign and update examples fangjian0423 2019-03-26 20:18:07 +08:00
  • 67c559853a
         Merge pull request #487 from mercyblitz/master Mercy Ma 2019-03-26 19:58:41 +08:00
  • ec98a2db01 code format fangjian0423 2019-03-26 17:53:17 +08:00
  • 46c888f878 update sentinel test case fangjian0423 2019-03-26 17:37:36 +08:00
  • dd765d3344 sync sentinel in 1.x branch fangjian0423 2019-03-26 17:30:39 +08:00
  • 893ca15bdd update sentinel test case fangjian0423 2019-03-26 17:03:06 +08:00
  • b15f22d325 optimize circuitbreaker in resttemplate in finchley branch fangjian0423 2019-03-26 16:51:31 +08:00
  • 5995687dd5 update sentinel examples fangjian0423 2019-03-26 16:34:18 +08:00
  • 49a6e1e5e2 Merge remote-tracking branch 'upstream/master' fangjian0423 2019-03-26 16:33:07 +08:00
  • 9f554b08ff close #482 fangjian0423 2019-03-26 14:17:30 +08:00
  • d21a5b99cb
         Merge pull request #476 from fangjian0423/master format 2019-03-26 13:59:41 +08:00
  • 36d2b8ba46 Polish : spring-cloud-incubator/spring-cloud-alibaba#478 : Dubbo Service registration issue on Zookeeper Registry mercyblitz 2019-03-26 00:40:25 +08:00
  • 1744f6b4cf Polish : spring-cloud-incubator/spring-cloud-alibaba#477 : @DubboTransported adds more attributes to customize settings mercyblitz 2019-03-26 00:19:58 +08:00
  • 7ea36b2edb
         Merge pull request #475 from mercyblitz/master Mercy Ma 2019-03-25 17:40:02 +08:00
  • 48dc322407 add spring-cloud-alibaba-dubbo to bom and remove useless example fangjian0423 2019-03-25 17:23:29 +08:00
  • c596632a56 Polish : spring-cloud-incubator/spring-cloud-alibaba#474 : Dubbo Spring Cloud service consume failed in Eureka mercyblitz 2019-03-25 17:10:09 +08:00
  • 4c3ad6b874 Polish : spring-cloud-incubator/spring-cloud-alibaba#473 : Dubbo Spring Cloud duplicated registration mercyblitz 2019-03-25 16:50:35 +08:00
  • 9ab99e29e3 sync rocketmq-binder, rocketmq-bus in finchley branch fangjian0423 2019-03-25 15:21:08 +08:00
  • 7e37a98993
         Merge pull request #472 from codewaltz1994/Branch_codewaltz1994 format 2019-03-25 14:26:41 +08:00
  • ba1e4ac895 Bug: Fix a bug. issue#471 fescar-example Demo DatabaseConfiguration.java file need to be impoved, or the error will occur . (Address:https://github.com/spring-cloud-incubator/spring-cloud-alibaba/issues/471) codewaltz1994 2019-03-25 12:32:11 +08:00
  • c44cdfe721 merge finchley branch fangjian0423 2019-03-25 11:46:29 +08:00
  • 4b4ebad24d
         update fescar version to 0.4.0 xiaojing 2019-03-20 19:05:25 +08:00
  • 01c1136a0d
         update fescar version to 0.4.0 xiaojing 2019-03-20 17:31:53 +08:00
  • af601ca269
         update fescar version to 0.4.0 xiaojing 2019-03-20 17:31:20 +08:00
  • 4d5f714dc5
         Merge pull request #461 from spring-operator/polish-urls-xml-master format 2019-03-20 10:35:19 +08:00
  • 5efcf5adf1 URL Cleanup Spring Operator 2019-03-19 20:21:49 -05:00
  • 1ef64a79d4 add spring cloud dubbo dependency in bom fangjian0423 2019-03-19 20:05:51 +08:00
  • a1b24a6b40
         Merge pull request #455 from mercyblitz/master format 2019-03-19 17:26:38 +08:00
  • 92554ad67e
         Merge pull request #454 from slievrly/master format 2019-03-19 17:13:56 +08:00
  • b6c49c1e52 Merge remote-tracking branch 'upstream/master' mercyblitz 2019-03-19 17:11:38 +08:00
  • e78c12edbf
         update nacos client version to 1.0.0-RC2 xiaojing 2019-03-19 16:35:22 +08:00
  • 2a0215b96a update nacos client version to 1.0.0-RC2 flystar32 2019-03-19 16:33:03 +08:00
  • c1e8ad0b10 update nacos client version to 1.0.0-RC2 flystar32 2019-03-19 16:32:01 +08:00
  • dd13db3d6d fix #453 remove Fescar redundant dependency jimin.jm 2019-03-19 14:30:29 +08:00
  • 068398ded1 Merge branch 'master' of github.com:mercyblitz/spring-cloud-alibaba mercyblitz 2019-03-19 09:48:06 +08:00
  • 3f15f7388b fix duplicate sentinel interceptor registration fangjian0423 2019-03-18 22:53:39 +08:00
  • 1f9eed436b change version to 2.0.0.BUILD-SNAPSHOT flystar32 2019-03-18 20:38:00 +08:00
  • 6fbd092780 add a new branch to support spring cloud finchley. need to update rocketmq-binder and dubbo module. flystar32 2019-03-18 20:30:59 +08:00
  • a6da4b5648 update nacos-client version to 1.0.0-RC1 flystar32 2019-03-18 16:08:43 +08:00
  • fc724a5056 update nacos-client version to flystar32 2019-03-18 15:54:59 +08:00
  • d4d18c33b1 optimize the resource of using resttemplate in 1.x fangjian0423 2019-03-18 14:19:04 +08:00
  • 7e5e61e121
         Merge pull request #444 from zhendong590/master Xiaolong Zuo 2019-03-18 14:18:55 +08:00
  • b8910ac908
         Merge pull request #447 from fangjian0423/master Xiaolong Zuo 2019-03-18 14:17:37 +08:00
  • 8c59d6b51e update sentinel test case fangjian0423 2019-03-18 13:59:55 +08:00
  • 61c4635e2a
         Merge pull request #443 from caojiele/patch-1 format 2019-03-18 13:03:35 +08:00
  • 1eef8f688f add 'HTTPMethod:' prefix for the resource of using @SentinelRestTemplate fangjian0423 2019-03-18 12:59:14 +08:00
  • 4fe8660cf4 Disable a status for codecov gaoyunpeng 2019-03-18 10:53:43 +08:00
  • cef321c4fb
         Wrong character changes Jlcao 2019-03-17 21:03:09 +08:00
  • 8049bda076
         Merge pull request #439 from spring-operator/polish-urls-build-1.x format 2019-03-17 14:21:00 +08:00
  • 48852fb977 URL Cleanup Spring Operator 2019-03-15 21:53:50 -05:00
  • 8a8097ce00 Bugfix 小马哥 2019-03-16 00:38:06 +08:00
  • e4c71071ff
         Merge pull request #438 from zhendong590/master Xiaolong Zuo 2019-03-15 18:04:57 +08:00
  • ae1e8a8fa9 update bus example configuration 1.x fangjian0423 2019-03-15 17:42:24 +08:00
  • c7f2cde56f Merge remote-tracking branch 'upstream/1.x' into 1.x fangjian0423 2019-03-15 17:41:21 +08:00
  • e624a4dfce
         Merge pull request #437 from jackBaozz/1.x format 2019-03-15 17:41:11 +08:00
  • 05a7e1a05d update bus example 1.x fangjian0423 2019-03-15 17:39:52 +08:00
  • 7516d2bcb2 disable codecov/patch coverage gaoyunpeng 2019-03-15 17:29:05 +08:00
  • 09e90a1e67
         Merge pull request #431 from fangjian0423/master Xiaolong Zuo 2019-03-15 17:26:46 +08:00
  • 99cf72ee4e
         Update bootstrap.properties jackBao 2019-03-15 17:22:29 +08:00
  • 69f6ad9128 update bus example fangjian0423 2019-03-15 17:09:47 +08:00
  • 1fa8e19496
         Merge pull request #433 from slievrly/master format 2019-03-15 16:24:57 +08:00
  • 043e879522
         Merge pull request #2 from spring-cloud-incubator/1.x jackBao 2019-03-15 15:42:15 +08:00
  • 668f99cd56 fix #432 update Fescar-Sample readme，unique index instead of normal index jimin.jm 2019-03-15 12:02:54 +08:00
  • 1b9cbf7396 update bus example fangjian0423 2019-03-14 20:40:56 +08:00
  • eb72043b9f fix spring-cloud-starter-bus-rocketmq in 1.x fangjian0423 2019-03-14 20:30:39 +08:00
  • 585a649463 add default broadcasting in spring-cloud-starter-bus-rocketmq fangjian0423 2019-03-14 20:25:23 +08:00
  • 768feaa3ec set default producer group fangjian0423 2019-03-14 15:23:05 +08:00
  • 16ff3a4331
         Merge pull request #427 from fangjian0423/master format 2019-03-13 16:28:12 +08:00
  • e4b29f3269 update sentinel additional-spring-configuration-metadata fangjian0423 2019-03-13 15:59:43 +08:00
  • a59011fa93 add switch for @SentinelRestTemplate fangjian0423 2019-03-13 15:56:26 +08:00
  • 7481c31aa3 fix #426 fangjian0423 2019-03-13 15:38:00 +08:00
  • cddf874560 update rocketmq docs fangjian0423 2019-03-13 11:12:00 +08:00
  • 03788b58f9 ans add management.endpoints.web.base-path metadata flystar32 2019-03-12 17:58:32 +08:00
  • 4e357de08f format code flystar32 2019-03-12 17:16:30 +08:00
  • ca5d5282a5 update nacos config support enabled flystar32 2019-03-12 17:09:21 +08:00
  • 6f0d76e4aa add conditional on nacos discovery enabled flystar32 2019-03-12 16:40:33 +08:00
  • d0fa69058b add conditional on nacos discovery enabled to Ribbon flystar32 2019-03-12 16:26:45 +08:00
  • a8630adc00
         Merge pull request #421 from flystar32/master Xiaolong Zuo 2019-03-12 16:08:44 +08:00
  • 2b9cae20b8 sync binder to 1.x fangjian0423 2019-03-12 16:02:07 +08:00
  • 6e846f662f fix condition with flystar32 2019-03-12 15:59:45 +08:00
  • 482e4a101b add management.endpoints.web.base-path to metadata flystar32 2019-03-12 15:32:39 +08:00
  • 2ad46027cf Merge remote-tracking branch 'upstream/1.x' into binder-dev-1.x fangjian0423 2019-03-12 15:30:07 +08:00
  • 49baeff6e9
         Merge pull request #420 from fangjian0423/binder-dev Xiaolong Zuo 2019-03-12 15:24:39 +08:00
  • 43f23a604e
         Merge pull request #418 from slievrly/master format 2019-03-12 15:07:09 +08:00
  • 03309b8481 binder remove metrics fangjian0423 2019-03-12 15:02:09 +08:00
  • 53c4a6adf6 refactor & upgrade rocketmq-client version fangjian0423 2019-03-12 13:59:57 +08:00
  • 0b8c2ad5a3 Merge remote-tracking branch 'upstream/master' into binder-dev fangjian0423 2019-03-12 11:23:25 +08:00
  • 0b0f6a3a90
         Merge pull request #419 from spring-operator/polish-urls-build-master format 2019-03-12 11:23:04 +08:00
  • 474132db42 Merge remote-tracking branch 'upstream/master' into binder-dev fangjian0423 2019-03-12 11:14:26 +08:00
  • 7e85508eb7 URL Cleanup Spring Operator 2019-03-11 22:01:17 -05:00
  • b2e4ba2620 fix #417 when fescar upgrade 0.2.0+ configuration file changed jimin.jm 2019-03-12 00:38:02 +08:00
  • f66587fb32
         Merge pull request #416 from flystar32/master Xiaolong Zuo 2019-03-11 17:36:34 +08:00
  • 5923f41fac delete useless field and add additional configuration metadata flystar32 2019-03-11 16:38:57 +08:00
  • 4d2de76e4b support spring cloud nacos config enabled , Polish #411 flystar32 2019-03-11 11:32:57 +08:00
  • 9860c5ac8e nacos discovery endpoint support spring.cloud.nacos.discovery.enabled , Polish #411 flystar32 2019-03-11 11:09:44 +08:00
  • 8ef205f2ca
         Merge pull request #3 from spring-cloud-incubator/master Kai 2019-03-08 22:16:48 +08:00