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
320 Commits 11 Branches 30 Tags
Commit Graph

320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
flystar32
ab0801f10f sync code from master, support nacos endpoint port and switch for nacos discovery watch 2019-03-27 19:35:01 +08:00
flystar32
d09223cfb7 change version from 0.1.2.BUILD-SNAPSHOT to 1.5.0.BUILD-SNAPSHOT 2019-03-27 15:00:59 +08:00
flystar32
fa71593248 sync code from master branch 2019-03-27 14:09:37 +08:00
fangjian0423
7e35e71119 fix bug of sentinel feign in 1.x branch 2019-03-26 20:35:33 +08:00
fangjian0423
dd765d3344 sync sentinel in 1.x branch 2019-03-26 17:30:39 +08:00
xiaojing
01c1136a0d
update fescar version to 0.4.0 2019-03-20 17:31:53 +08:00
flystar32
2a0215b96a update nacos client version to 1.0.0-RC2 2019-03-19 16:33:03 +08:00
flystar32
a6da4b5648 update nacos-client version to 1.0.0-RC1 2019-03-18 16:08:43 +08:00
fangjian0423
d4d18c33b1 optimize the resource of using resttemplate in 1.x 2019-03-18 14:19:04 +08:00
format
8049bda076
Merge pull request #439 from spring-operator/polish-urls-build-1.x 
URL Cleanup
 2019-03-17 14:21:00 +08:00
Spring Operator
48852fb977 URL Cleanup 
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* http://maven.apache.org/xsd/maven-4.0.0.xsd with 56 occurrences migrated to:
  https://maven.apache.org/xsd/maven-4.0.0.xsd ([https](https://maven.apache.org/xsd/maven-4.0.0.xsd) result 200).
* http://www.apache.org/licenses/LICENSE-2.0 with 2 occurrences migrated to:
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
* http://www.apache.org/licenses/LICENSE-2.0.txt with 1 occurrences migrated to:
  https://www.apache.org/licenses/LICENSE-2.0.txt ([https](https://www.apache.org/licenses/LICENSE-2.0.txt) result 200).

# Ignored
These URLs were intentionally ignored.

* http://maven.apache.org/POM/4.0.0 with 112 occurrences
* http://www.w3.org/2001/XMLSchema-instance with 56 occurrences
 2019-03-15 21:53:50 -05:00
fangjian0423
ae1e8a8fa9 update bus example configuration 1.x 2019-03-15 17:42:24 +08:00
fangjian0423
c7f2cde56f Merge remote-tracking branch 'upstream/1.x' into 1.x 2019-03-15 17:41:21 +08:00
format
e624a4dfce
Merge pull request #437 from jackBaozz/1.x 
update bus example configuration
 2019-03-15 17:41:11 +08:00
fangjian0423
05a7e1a05d update bus example 1.x 2019-03-15 17:39:52 +08:00
jackBao
99cf72ee4e
Update bootstrap.properties 
spring.cloud.stream.rocketmq.binder.namesrv-addr 配置有问题 ，启动后，请求/bus/event/publish/user 会报错

2019-03-15 16:36:36.911 ERROR 19392 --- [enderExecutor_2] o.s.c.s.b.r.i.RocketMQMessageHandler     : RocketMQ Message hasn't been sent. Caused by No route info of this topic, springCloudBus
See http://rocketmq.apache.org/docs/faq/ for further details.
 2019-03-15 17:22:29 +08:00
jackBao
043e879522
Merge pull request #2 from spring-cloud-incubator/1.x 
1.x
 2019-03-15 15:42:15 +08:00
fangjian0423
eb72043b9f fix spring-cloud-starter-bus-rocketmq in 1.x 2019-03-14 20:30:39 +08:00
fangjian0423
a59011fa93 add switch for @SentinelRestTemplate 2019-03-13 15:56:26 +08:00
flystar32
ca5d5282a5 update nacos config support enabled 2019-03-12 17:09:21 +08:00
flystar32
6f0d76e4aa add conditional on nacos discovery enabled 2019-03-12 16:40:33 +08:00
fangjian0423
2b9cae20b8 sync binder to 1.x 2019-03-12 16:02:07 +08:00
fangjian0423
2ad46027cf Merge remote-tracking branch 'upstream/1.x' into binder-dev-1.x 2019-03-12 15:30:07 +08:00
flystar32
ad34e8a5e9 update nacos and fescar version 2019-03-07 10:52:32 +08:00
fangjian0423
b09024f28f resolve problem in sentinel test case in 1.x 2019-03-04 21:51:31 +08:00
fangjian0423
af574779fd sentinel zuul refactor sync in 1.x 2019-03-04 21:18:27 +08:00
fangjian0423
c470f56492 sentinel zuul refactor 1.x 2019-03-04 16:48:57 +08:00
fangjian0423
d0cbd9f994 sms refactor 1.x 2019-03-04 15:24:29 +08:00
fangjian0423
d4767da1c5 sms & sentinel refactor 1.x 2019-03-04 15:23:19 +08:00
fangjian0423
15b01929ab sync sentinel zuul to 1.x branch 2019-03-04 14:45:18 +08:00
flystar32
01d7620d74 add nacos config test case 2019-03-04 10:35:13 +08:00
flystar32
59bac8f9b9 support EnableDiscoveryClient 2019-03-01 11:18:10 +08:00
flystar32
9ae1c28906 add test case of ANS 2019-02-28 17:20:15 +08:00
fangjian0423
97ddae22fc sync rocketmq binder to 1.x 2019-02-28 16:39:22 +08:00
fangjian0423
348f699eb8 Merge remote-tracking branch 'upstream/1.x' into binder-dev-1.x 2019-02-28 15:41:45 +08:00
flystar32
db0fa6547b add more ACM test case 2019-02-28 15:39:20 +08:00
flystar32
2622f2c5bd add ACM test case 2019-02-28 14:57:45 +08:00
xiaojing
9e0a4d6b4a
Merge pull request #385 from xiaolongzuo/1.x 
Add statistics for nacos discovery and test case
 2019-02-26 11:15:44 +08:00
xiaolongzuo
ac27dd9b30 Add scx and oss java doc. 2019-02-26 10:53:50 +08:00
xiaolongzuo
29b2589f1c Merge branch '1.x' of github.com:spring-cloud-incubator/spring-cloud-alibaba into 1.x 2019-02-25 19:24:15 +08:00
Xiaolong Zuo
ca7a376ab2
Merge pull request #383 from pbting/1.x 
[1.x]change the system properties named and upgrade nacos client version
 2019-02-25 17:42:20 +08:00
xiaolongzuo
6ae1df0363 Polish 2019-02-25 16:43:51 +08:00
xiaolongzuo
25f16d3528 Polish test cases for schedulerx 2019-02-25 16:43:22 +08:00
xiaolongzuo
6ff11740bf Add statistics for nacos discovery and test case 
# Conflicts:
#	spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java
 2019-02-25 16:42:45 +08:00
xiaolongzuo
34bcd8b242 Add statistics for nacos discovery and test case 
# Conflicts:
#	spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java
 2019-02-25 16:42:30 +08:00
pbting
55ee280ede
Merge pull request #7 from spring-cloud-incubator/1.x 
sync 1.x code
 2019-02-22 21:03:11 +08:00
得少
b9a08cf1e4 1、change the nacos system properties named 
2、upgrade nacos client dependency with 0.8.2
 2019-02-22 20:49:14 +08:00
flystar32
d81a8d9490 fixed bug, can't not register 2019-02-21 15:47:02 +08:00
flystar32
ee4d67a6fa format code and change apache log to slf4j 2019-02-21 14:35:44 +08:00
flystar32
ac382c9e3f format code and change logger to log 2019-02-21 11:38:22 +08:00