mercyblitz
|
2fdeeec3ff
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
# spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
|
2019-02-21 14:49:26 +08:00 |
|
flystar32
|
d7665170ec
|
format code
|
2019-02-20 15:35:44 +08:00 |
|
format
|
9b84df9015
|
Merge pull request #358 from pbting/master
nacos discovery starter support connect to aliyun with master branch
|
2019-02-19 16:41:44 +08:00 |
|
gaoyunpeng
|
394485a12d
|
replace cobertura to jacoco
|
2019-02-18 20:05:08 +08:00 |
|
flystar32
|
142c321fb0
|
Merge remote-tracking branch 'upstream/master'
|
2019-02-18 17:09:27 +08:00 |
|
format
|
5d721d1673
|
Merge pull request #346 from carlWangTao/patch-1
Update NacosDiscoveryProperties.java
|
2019-02-18 14:32:04 +11:00 |
|
flystar32
|
8d41c885c0
|
Fixes #352
|
2019-02-18 10:43:06 +08:00 |
|
pbting
|
90a7769180
|
Merge pull request #4 from spring-cloud-incubator/master
Synchronize code once
|
2019-02-15 13:48:34 +08:00 |
|
flystar32
|
7677507294
|
Polish #345 , fixes @AutoConfigureAfter(AutoServiceRegistrationAutoConfiguration.class)
|
2019-02-14 10:46:51 +08:00 |
|
flystar32
|
682d12f20e
|
Merge branch 'master' of github.com:flystar32/spring-cloud-alibaba
|
2019-02-13 15:23:03 +08:00 |
|
flystar32
|
290350f6ec
|
add import
|
2019-02-13 15:20:57 +08:00 |
|
flystar32
|
dfc9e34147
|
support heartbeat event
|
2019-02-13 15:13:03 +08:00 |
|
flystar32
|
c43a89951b
|
support heartbeat event
|
2019-02-13 15:11:12 +08:00 |
|
flystar32
|
b0c17fd291
|
support heartbeat event
|
2019-02-13 15:10:27 +08:00 |
|
flystar32
|
c545885d1c
|
support heartbeat event
|
2019-02-13 15:09:59 +08:00 |
|
carlWangTao
|
8d44c7ee01
|
Update NacosDiscoveryProperties.java
当配置属性cloud.nacos.discovery.server-addr以 '/' 结束会造成服务提供方无法注册到NacosServer
|
2019-02-12 09:51:40 +08:00 |
|
mercyblitz
|
a5e950186f
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java
# spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java
# spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/NacosDataSourceProperties.java
# spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java
|
2019-02-01 22:08:21 +08:00 |
|
flystar32
|
450f1e8269
|
modify example to verify .
|
2019-01-31 15:02:30 +08:00 |
|
flystar32
|
4a62526b2a
|
Fixes #333 ,make @EnableDiscoveryClient Optional
|
2019-01-31 14:57:30 +08:00 |
|
justlive1
|
d3f98b66a4
|
fixed netInterface NullPointerException
|
2019-01-25 15:33:03 +08:00 |
|
mercyblitz
|
59a969049d
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# pom.xml
# spring-cloud-alibaba-dependencies/pom.xml
# spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
|
2019-01-22 14:51:54 +08:00 |
|
mercyblitz
|
26a05cbefb
|
Temporary commit
|
2019-01-18 19:25:39 +08:00 |
|
pbting
|
431b246507
|
add nacos config unit test
|
2019-01-18 11:46:01 +08:00 |
|
pbting
|
2fb9b52f1d
|
Merge pull request #278 from zhendong590/master
update cobertura settings for reduce build time
|
2019-01-16 10:07:11 +08:00 |
|
yanglbme
|
591dcdb966
|
update: use the diamond operator
|
2019-01-15 21:13:11 +08:00 |
|
gaoyunpeng
|
20eb325e59
|
update cobertura settings for reduce build time
|
2019-01-15 15:50:23 +08:00 |
|
mercyblitz
|
325d00d1b6
|
Polish spring-cloud-incubator/spring-cloud-alibaba#267
|
2019-01-10 22:58:12 +08:00 |
|
mercyblitz
|
a6b9f6c5dc
|
Polish spring-cloud-incubator/spring-cloud-alibaba#266
|
2019-01-10 22:16:02 +08:00 |
|
mercyblitz
|
f34633ebf4
|
Polish spring-cloud-incubator/spring-cloud-alibaba#261
|
2019-01-10 15:37:36 +08:00 |
|
flystar32
|
36c20f5ab1
|
fixes some typo
|
2019-01-04 11:36:01 +08:00 |
|
flystar32
|
7525b92b9d
|
add test case
|
2019-01-04 10:33:25 +08:00 |
|
flystar32
|
31d4bb5a36
|
use constructor parameters instead of autowired
|
2019-01-02 17:28:05 +08:00 |
|
Spencer Gibb
|
612e6913e6
|
Update to 0.2.2.BUILD-SNAPSHOT
|
2018-12-21 11:09:29 -05:00 |
|
Spencer Gibb
|
b28e82dc3c
|
Update SNAPSHOT to 0.2.1.RELEASE
|
2018-12-21 10:48:36 -05:00 |
|
flystar32
|
eeba7e6aa6
|
update nacos discovery logic, support both health and enabled
|
2018-12-04 15:02:26 +08:00 |
|
pbting
|
ba90952880
|
nacos starter 支持可自定义dataid配置以及Nacos 商业化和云上ACM 对接
|
2018-12-04 09:59:55 +08:00 |
|
Nepxion
|
9373e79aff
|
fixes #87.
|
2018-11-03 19:37:50 +08:00 |
|
Spencer Gibb
|
6e355cc807
|
Update to 0.2.1.BUILD-SNAPSHOT
|
2018-10-30 17:25:19 -04:00 |
|
Spencer Gibb
|
d2fd77c274
|
Update SNAPSHOT to 0.2.0.RELEASE
|
2018-10-30 17:11:50 -04:00 |
|
Spencer Gibb
|
ece4531833
|
Updates to snapshot versions
|
2018-10-23 14:45:58 -04:00 |
|
flystar32
|
f449986650
|
separate namingservice from nacosregistration and discoveryclient
|
2018-10-22 19:37:50 +08:00 |
|
亦盏
|
47cab99b2c
|
separate registry and discovery
|
2018-10-17 17:49:19 +08:00 |
|
亦盏
|
c4043b5c12
|
add management info to registry metadata
|
2018-10-16 15:39:23 +08:00 |
|
flystar32
|
52a0c6f9de
|
update version to 0.2.0
|
2018-10-08 20:29:39 +08:00 |
|
flystar32
|
b0011bf328
|
rename alibaba storage to alicloud storage
|
2018-09-26 10:52:47 +08:00 |
|
flystar32
|
e4d9f98313
|
update nacos version to 0.2.1-RC and format code
|
2018-09-20 11:31:50 +08:00 |
|
flystar32
|
4ae2983c7a
|
update pom.xml, and format code
|
2018-09-19 12:15:39 +08:00 |
|
Nepxion
|
1b733af0d5
|
Fixes #19
|
2018-09-18 14:07:18 +08:00 |
|
flystar32
|
625e85b040
|
extend AbstractAutoServiceRegistration instead of implements AutoServiceRegistration , Fixes #18
|
2018-09-17 23:28:39 +08:00 |
|
flystar32
|
bd814e8697
|
Fixes #18
|
2018-09-17 21:52:57 +08:00 |
|