Commit Graph

  • 5ee251ab97 sentinel starter support paramflowrule fangjian0423 2018-12-06 17:26:47 +0800
  • 29998b3e60 Add log configuration for Sentinel fangjian0423 2018-12-06 17:14:18 +0800
  • be2f52c880 using sentinel feign in nacos discovery example fangjian0423 2018-12-06 17:11:50 +0800
  • 6104799a36 Sentinel support feign fangjian0423 2018-12-06 17:11:20 +0800
  • fb9e0f51f4 SentinelProtect rename to SentinelRestTemplate fangjian0423 2018-12-06 16:45:47 +0800
  • 2f399d015b update sentinel docs fangjian0423 2018-12-06 16:11:42 +0800
  • 54dcd7eaec update sentinel docs fangjian0423 2018-12-06 16:11:42 +0800
  • f72cbf5df3 Add log configuration for Sentinel fangjian0423 2018-12-06 16:09:32 +0800
  • ac2eee154d Add log configuration for Sentinel fangjian0423 2018-12-06 16:09:32 +0800
  • 8daa3e4b8f Polish #115 fangjian0423 2018-12-06 16:02:18 +0800
  • cd6f79b16b Polish #115 fangjian0423 2018-12-06 16:02:18 +0800
  • e9253f22c5 using sentinel feign in nacos discovery example fangjian0423 2018-12-06 14:16:47 +0800
  • 0af67df3e3 using sentinel feign in nacos discovery example fangjian0423 2018-12-06 14:16:47 +0800
  • d9ca9afe7c Sentinel support feign and close #6 fangjian0423 2018-12-06 11:50:48 +0800
  • a560774966 Sentinel support feign and close #6 fangjian0423 2018-12-06 11:50:48 +0800
  • cb0b54093a Merge remote-tracking branch 'upstream/master' fangjian0423 2018-12-06 11:44:41 +0800
  • b8f608eaa5 Merge remote-tracking branch 'upstream/master' fangjian0423 2018-12-06 11:44:41 +0800
  • f3999b7245 Merge pull request #140 from pbting/master xiaojing 2018-12-05 21:03:18 +0800
  • 09aa04eaba
    Merge pull request #140 from pbting/master xiaojing 2018-12-05 21:03:18 +0800
  • d2f89d8da5 add a title for end pbting 2018-12-05 21:01:52 +0800
  • ff30e58da6 add a title for end pbting 2018-12-05 21:01:52 +0800
  • e25c43cb47 Merge pull request #139 from pbting/master xiaojing 2018-12-05 20:58:27 +0800
  • d55bc6fcfc
    Merge pull request #139 from pbting/master xiaojing 2018-12-05 20:58:27 +0800
  • 7c32867a73 update the format pbting 2018-12-05 20:51:05 +0800
  • 1cc2a20d18 update the format pbting 2018-12-05 20:51:05 +0800
  • 453b6cd306 update the format for document pbting 2018-12-05 20:50:12 +0800
  • 90804663e5 update the format for document pbting 2018-12-05 20:50:12 +0800
  • 934a2e8904 add a solution document fot nacos config shared configuration and custom dataids pbting 2018-12-05 20:46:06 +0800
  • 4cae318da3 add a solution document fot nacos config shared configuration and custom dataids pbting 2018-12-05 20:46:06 +0800
  • 7d5e135553 Update nacos-config.adoc xiaojing 2018-12-05 15:24:33 +0800
  • 5c86086e00
    Update nacos-config.adoc xiaojing 2018-12-05 15:24:33 +0800
  • 3fe2bf64ad fixes #9 fangjian0423 2018-12-05 12:45:02 +0800
  • 53643b94ce fixes #9 fangjian0423 2018-12-05 12:45:02 +0800
  • 9b5f7881dc Merge pull request #137 from pbting/master xiaojing 2018-12-05 10:27:23 +0800
  • 0c8bd1b58a
    Merge pull request #137 from pbting/master xiaojing 2018-12-05 10:27:23 +0800
  • e812515250
    Merge pull request #136 from pbting/1.x xiaojing 2018-12-05 10:24:42 +0800
  • bee06af41c update nacos discovery logic, support both health and enabled flystar32 2018-12-04 15:07:01 +0800
  • 28a0da61c3 update nacos discovery logic, support both health and enabled flystar32 2018-12-04 15:02:26 +0800
  • eeba7e6aa6 update nacos discovery logic, support both health and enabled flystar32 2018-12-04 15:02:26 +0800
  • 4e76fbe773 modify the metadata of type and defaultValue for spring cloud cloud nacos config pbting 2018-12-04 14:30:58 +0800
  • cb118723aa add nacos config configuration metadata pbting 2018-12-04 14:29:01 +0800
  • 86bd83af83 add nacos config configuration metadata pbting 2018-12-04 14:29:01 +0800
  • 46570f8ce3 nacos config support custom config dataid and group pbting 2018-12-04 14:12:54 +0800
  • f3a79612f3 Merge pull request #135 from pbting/master xiaojing 2018-12-04 10:51:18 +0800
  • 4f2eb7487d
    Merge pull request #135 from pbting/master xiaojing 2018-12-04 10:51:18 +0800
  • 94b9d0e82f code format pbting 2018-12-04 10:37:57 +0800
  • 356ce112a9 code format pbting 2018-12-04 10:37:57 +0800
  • 96ff361ca3 Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba pbting 2018-12-04 10:02:52 +0800
  • 63fd351256 Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba pbting 2018-12-04 10:02:52 +0800
  • 0176f90e37 Merge pull request #4 from spring-cloud-incubator/master pbting 2018-12-04 10:02:17 +0800
  • 997c633601
    Merge pull request #4 from spring-cloud-incubator/master pbting 2018-12-04 10:02:17 +0800
  • 75d948735b Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba pbting 2018-12-04 10:00:14 +0800
  • 5e5fb2a068 Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba pbting 2018-12-04 10:00:14 +0800
  • e121295486 nacos starter 支持可自定义dataid配置以及Nacos 商业化和云上ACM 对接 pbting 2018-12-04 09:59:55 +0800
  • ba90952880 nacos starter 支持可自定义dataid配置以及Nacos 商业化和云上ACM 对接 pbting 2018-12-04 09:59:55 +0800
  • 17722fe27a update docs fangjian0423 2018-11-30 16:47:19 +0800
  • 25aecfe1ad update docs fangjian0423 2018-11-30 16:47:19 +0800
  • bac219eb6f remove unuseful logging fangjian0423 2018-11-30 16:46:59 +0800
  • c665e97fb1 remove unuseful logging fangjian0423 2018-11-30 16:46:59 +0800
  • 7a0659ca5e add apache license for rocketmq binder fangjian0423 2018-11-29 14:30:36 +0800
  • 9d59a0e2e5 add apache license for rocketmq binder fangjian0423 2018-11-29 14:30:36 +0800
  • 51e9ae552a
    Merge pull request #129 from fangjian0423/1.x xiaojing 2018-11-29 14:14:14 +0800
  • e21d79b5d7 update rocketmq example readme fangjian0423 2018-11-29 14:05:28 +0800
  • ba9bbd6ab6 magic value refactor for 1.x fangjian0423 2018-11-29 11:23:04 +0800
  • 08b1c3ab45 Merge remote-tracking branch 'upstream/1.x' into 1.x fangjian0423 2018-11-29 11:18:15 +0800
  • 3e2564bdec update rocketmq exmaple for 1.x branch fangjian0423 2018-11-29 11:17:41 +0800
  • 2c7ab714fb make metrics-core as provided dependency and refactor for 1.x branch fangjian0423 2018-11-29 11:17:08 +0800
  • 571dc70496 Merge pull request #127 from pbting/patch-2 xiaojing 2018-11-29 11:04:57 +0800
  • 473b3da642
    Merge pull request #127 from pbting/patch-2 xiaojing 2018-11-29 11:04:57 +0800
  • 9a71f4f9f2 Merge branch 'master' into patch-2 xiaojing 2018-11-29 11:04:49 +0800
  • 2d7f15c912
    Merge branch 'master' into patch-2 xiaojing 2018-11-29 11:04:49 +0800
  • 897776165c Merge pull request #126 from pbting/master xiaojing 2018-11-29 11:03:41 +0800
  • 19472f1216
    Merge pull request #126 from pbting/master xiaojing 2018-11-29 11:03:41 +0800
  • 43c5a7d8b5 Merge pull request #128 from fangjian0423/master xiaojing 2018-11-29 11:03:23 +0800
  • ab92886012
    Merge pull request #128 from fangjian0423/master xiaojing 2018-11-29 11:03:23 +0800
  • 51169484cb 新增两个配置的说明 pbting 2018-11-28 17:21:19 +0800
  • 71522fc027
    新增两个配置的说明 pbting 2018-11-28 17:21:19 +0800
  • abbaf76c37 Update nacos-config.adoc pbting 2018-11-28 17:17:22 +0800
  • d18e5c3a99
    Update nacos-config.adoc pbting 2018-11-28 17:17:22 +0800
  • fdaeb038cb update rocketmq example fangjian0423 2018-11-28 17:14:25 +0800
  • baea051027 update rocketmq example fangjian0423 2018-11-28 17:14:25 +0800
  • a55cb1b649 make metrics-core as provided dependency and refactor fangjian0423 2018-11-28 17:13:59 +0800
  • 7d039f4742 make metrics-core as provided dependency and refactor fangjian0423 2018-11-28 17:13:59 +0800
  • 15cd9be1f7 Merge remote-tracking branch 'upstream/master' fangjian0423 2018-11-28 15:32:52 +0800
  • fe17a6c9fb Merge remote-tracking branch 'upstream/master' fangjian0423 2018-11-28 15:32:52 +0800
  • 2d275f8b6b Merge pull request #119 from mercyblitz/master format 2018-11-28 15:27:27 +0800
  • 47b1f05e86
    Merge pull request #119 from mercyblitz/master format 2018-11-28 15:27:27 +0800
  • 19bd9d45d4 Merge remote-tracking branch 'upstream/master' fangjian0423 2018-11-28 15:16:11 +0800
  • ac466e0bea Merge remote-tracking branch 'upstream/master' fangjian0423 2018-11-28 15:16:11 +0800
  • b1f10388e7 Merge branch 'master' into master pbting 2018-11-28 14:45:37 +0800
  • dd0f4bd6e7
    Merge branch 'master' into master pbting 2018-11-28 14:45:37 +0800
  • 42335f123b Update nacos-config.adoc pbting 2018-11-28 14:39:31 +0800
  • c3c5ed5a1e
    Update nacos-config.adoc pbting 2018-11-28 14:39:31 +0800
  • 126f5ba98a Merge pull request #124 from pbting/patch-1 xiaojing 2018-11-28 14:30:23 +0800
  • 855e772f1f
    Merge pull request #124 from pbting/patch-1 xiaojing 2018-11-28 14:30:23 +0800
  • 4be8bd8c70 Update nacos-config.adoc pbting 2018-11-28 11:26:03 +0800
  • 19bb1d71c6
    Update nacos-config.adoc pbting 2018-11-28 11:26:03 +0800
  • 3eb00f89ab Update nacos-config.adoc pbting 2018-11-27 23:04:32 +0800
  • 6e85bbf2c1
    Update nacos-config.adoc pbting 2018-11-27 23:04:32 +0800
  • e38d901582 订正测试代码 pbting 2018-11-27 23:03:08 +0800