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

124 Commits

Author SHA1 Message Date
派哒
8154fd3eb3 仍有两个测试过不了
1. NacosConfigurationXmlJsonTest#contextLoads
2. NacosConfigurationNoSuffixTest#contextLoads
Merge branch 'master' into finchley
2021-02-03 20:34:16 +08:00
派哒
ca9048b251 Merge remote-tracking branch 'upstream/master' 2021-01-28 10:44:41 +08:00
zkzlx
5db4161acf updated nacos example 2021-01-20 13:59:22 +08:00
派哒
c3db7fdc91 修改了两个错误的URL 2021-01-15 16:06:52 +08:00
zkzlx
e26ef50af4 [pr #1531]build 2020-11-16 13:42:31 +08:00
zkzlx
359b3ea522 Merge remote-tracking branch 'origin/master' into config
# Conflicts:
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java
2020-11-16 12:44:09 +08:00
Roger3581321
25689b800e
Add one missing configuration item
Since there is an important, yet missing option spring.cloud.nacos.discovery.enabled, I have added its description by following  the "More configuration items" format.
2020-10-09 14:54:30 +08:00
孙继峰
ad36fd2e95
修正文档 2020-08-17 20:00:07 +08:00
zkzlx
5135916175 [enhance issue #1492 ]Improved nacos configuration parsing, based on PropertySourceLoader---check 2020-06-18 18:28:25 +08:00
zkzlx
c07701d98e [enhance issue #1492 ]Improved nacos configuration parsing, based on PropertySourceLoader 2020-06-17 18:54:00 +08:00
J-Cod3r
1e74332a0a update nacos-discovery-example readme 2020-06-07 12:26:32 +00:00
yuhuangbin
8a68526da7 fix issue#1456 2020-05-17 12:50:03 +08:00
余黄彬
2600e42f51
Update readme-zh.md 2020-04-20 09:27:43 +08:00
mercyblitz
333561d4a5 Polish alibaba/spring-cloud-alibaba#1365 : Synchronizing Maven building to Spring Cloud Alibaba finchley branch 2020-04-14 14:30:23 +08:00
mercyblitz
a198133852 Update pom.xml 2020-04-03 23:48:57 +08:00
theonefx
45fe83f444 update version to 2.0.2.BUILD-SNAPSHOT 2020-04-03 16:07:21 +08:00
theonefx
0db3b26fd6 基于F版的一些适配性调整 2020-04-03 10:38:16 +08:00
theonefx
c579109d2a import changes from master
reorganizing modules
2020-04-02 16:52:12 +08:00
yuhuangbin
9661da44b9 upgrade nacos version to 1.2.0 2020-03-17 10:23:17 +08:00
yuhuangbin
756c82ba1e upgrade nacos client version 2020-03-07 15:31:31 +08:00
fangjian0423
88b8319eda Bumping versions to 2.2.1.BUILD-SNAPSHOT after release 2020-02-14 20:27:11 +08:00
fangjian0423
c5e27237fb Closes #1126, closes #1153, closes #1123, closes #1143; Update SNAPSHOT to 2.2.0.RELEASE. 2020-02-05 23:57:17 +08:00
fangjian0423
b1af3e2b87 update example configurations 2020-02-05 21:37:51 +08:00
fangjian0423
86640fc353 update example configurations 2020-02-05 20:50:24 +08:00
fangjian0423
49d0ebdabe just update to match code style 2020-02-05 16:42:10 +08:00
fangjian0423
57e3059d8d update examples 2020-01-30 02:17:36 +08:00
fangjian0423
9a5518d302 update nacos config example 2020-01-15 15:30:41 +08:00
fangjian0423
00d449ba23 pass code check 2020-01-14 16:54:01 +08:00
fangjian0423
b70129c17f add reactive discovery example 2020-01-13 20:14:23 +08:00
fangjian0423
a9e519265a add s-c-loadbalancer example 2020-01-13 11:28:23 +08:00
zkzlx
85ddda03ff [issue #982 & issue #978]enhance nacos config 2019-12-18 15:16:42 +08:00
fangjian0423
0b228c9c75 Update SNAPSHOT to 2.0.1.RELEASE 2019-11-15 02:37:40 +08:00
fangjian0423
f8acef323b sync & commit in finchley 2019-11-11 13:47:58 +08:00
chuntaojun
492b8d3b20 refactor(nacos): Roll back to the original solution to solve the problem of compatibility 2019-11-06 21:12:26 +08:00
fangjian0423
591713b738 update examples 2019-10-31 16:14:33 +08:00
fangjian0423
15465b5612 sync & commit in finchley 2019-10-30 13:10:11 +08:00
echooymxq
1bc20774c5 Optimize example module name 2019-10-18 09:51:03 +08:00
fangjian0423
2435167e1e format code with maven plugins 2019-09-26 17:15:43 +08:00
chuntaojun
f0f86868b2 fix(nacos): fix issue #859 2019-09-12 22:01:37 +08:00
chuntaojun
5162d02b4e fix(nacos): fix issue #859 2019-09-12 20:20:02 +08:00
fangjian0423
e8ee68998e upgrade to Spring Cloud Hoxton, close #917 2019-09-06 16:33:11 +08:00
chuntaojun
d2684c2882 fix(nacos): fix issue #859 2019-09-06 16:03:41 +08:00
chuntaojun
e4d85b6c7e style(nacos): Standard code style. 2019-09-05 11:13:59 +08:00
chuntaojun
d1b64df9d2 refactor(nacos): Modify nacos service caching mechanism 2019-09-04 15:12:41 +08:00
format
5b07a560be
Merge pull request #876 from zhaoyuguang/zhaoyuguang/dev_3
Use Spring advanced API make design more clearer
2019-09-02 19:43:36 +08:00
赵禹光
189837ed12 remain annotations clearer 2019-08-23 15:38:53 +08:00
赵禹光
3eb75988e3 example annotations clearer 2019-08-23 15:36:31 +08:00
Rivers-Shall
57ec776c7b Modify nacos-discovery-example to test UrlCleaner of
`SentinelResttemplate`
2019-08-19 16:13:06 +08:00
panda
9dc03faa41 some doc no error correction 2019-08-15 23:57:39 +08:00
fangjian0423
80dcd91221 Bumping versions to 2.0.1.BUILD-SNAPSHOT after release 2019-08-02 11:03:25 +08:00