Commit Graph

538 Commits (2.2.x)

Author SHA1 Message Date
zkzlx f2f58b90a0 Merge remote-tracking branch 'upstream/master' into nacos-register
# Conflicts:
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java
5 years ago
zkzlx 5135916175 [enhance issue #1492 ]Improved nacos configuration parsing, based on PropertySourceLoader---check 5 years ago
zkzlx c07701d98e [enhance issue #1492 ]Improved nacos configuration parsing, based on PropertySourceLoader 5 years ago
J-Cod3r 1e74332a0a update nacos-discovery-example readme 5 years ago
zkzlx 0a89ad61e1 [enhance issue #1478 ]支持注册非活动节点 5 years ago
yuhuangbin 8a68526da7 fix issue#1456 5 years ago
Mercy Ma 2e934f09e9
Merge pull request #1398 from yuhuangbin/sidecar-enhance
sidecar enhance
5 years ago
Mercy Ma c7ea46301f
Merge pull request #1354 from yuhuangbin/sentinel-nacos
Sentinel Nacos Data Source Certification
5 years ago
yuhuangbin 9831e9b69b upgrade sentinel version to 1.7.2 5 years ago
yuhuangbin fd58f75e41 sidecar enhance 5 years ago
余黄彬 2600e42f51
Update readme-zh.md 5 years ago
yuhuangbin 8991078055 fix issue#1350 5 years ago
yuhuangbin cb27412021 fix issue#1350 5 years ago
mercyblitz a198133852 Update pom.xml 5 years ago
mercyblitz 46b64a96fa Update Samples 5 years ago
TheoneFx 75f98be294
Merge pull request #1306 from theonefx/master
fix link error in document
5 years ago
theonefx a0fc48628c fix document link error
ref: https://github.com/alibaba/spring-cloud-alibaba/issues/1214
5 years ago
yuhuangbin a99b8f845f sidecar enhance 5 years ago
theonefx 2ed48c5506 fix issue: https://github.com/alibaba/spring-cloud-alibaba/issues/1288 5 years ago
mercyblitz 2282d39df6 Polish alibaba/spring-cloud-alibaba/#1261 : Removing the commercial examples and adding starters into spring-cloud-alibaba-coverage module 5 years ago
yuhuangbin e8e49ff39b upgrade Seata and Spring Cloud Version 5 years ago
yuhuangbin 756c82ba1e upgrade nacos client version 5 years ago
mercyblitz 1b749d47c1 Polish alibaba/spring-cloud-alibaba/#1222 : Resolve the examples issues 5 years ago
mercyblitz 93d5ce1054 Polish alibaba/spring-cloud-alibaba/#1222 : Resolve the relative path of pom.xml 5 years ago
mercyblitz 155ea9418f Polish alibaba/spring-cloud-alibaba/#1222 : Combining the code-based and starter modules 5 years ago
fangjian0423 88b8319eda Bumping versions to 2.2.1.BUILD-SNAPSHOT after release 5 years ago
fangjian0423 c5e27237fb Closes #1126, closes #1153, closes #1123, closes #1143; Update SNAPSHOT to 2.2.0.RELEASE. 5 years ago
fangjian0423 b1af3e2b87 update example configurations 5 years ago
fangjian0423 86640fc353 update example configurations 5 years ago
fangjian0423 49d0ebdabe just update to match code style 5 years ago
mercyblitz 4402ee0bbe Polish alibaba/spring-cloud-alibaba/#1192 : [Infrastructure] Upgrade the Dubbo 2.7.4.1 dependencies 5 years ago
fangjian0423 57e3059d8d update examples 5 years ago
yuhuangbin ab06f3232c seata feignloadbalancer enhance 5 years ago
Jim Fang 5f8d8cc043
Merge pull request #1154 from slievrly/springboot
adapter: use seata-spring-boot-starter's autoConfiguration instead of spring-cloud-alibaba-seata-starter's autoConfiguration
5 years ago
fangjian0423 9a5518d302 update nacos config example 5 years ago
Jim Fang f789803cac
Merge pull request #1171 from yuhuangbin/sentinel-enhance
[Upgrade] Upgrade Sentinel and Enhance
5 years ago
fangjian0423 00d449ba23 pass code check 5 years ago
slievrly d040d6a3b7 throw exception
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
fangjian0423 ddceb5f312 add spring cloud sentinel circuitbreaker demo 5 years ago
yuhuangbin b0273fb1c8 upgrade sentinel version and enhance 5 years ago
fangjian0423 b70129c17f add reactive discovery example 5 years ago
fangjian0423 a9e519265a add s-c-loadbalancer example 5 years ago
Jim Fang 2a18ddb0be
Merge pull request #1136 from zkzlx/config-eh
[issue #982 & issue #978]enhance nacos config
5 years ago
slievrly f36c94d3ed fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly fbd72a6000 fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly 4ac2622753 fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly c644a2c1ec fix ci
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly c216cad31c fix properties
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly 7b79b6a11b Merge remote-tracking branch 'upstream/master' into springboot
Signed-off-by: slievrly <slievrly@163.com>

# Conflicts:
#	spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java
5 years ago
slievrly 34d8267068 adapter: use seata-spring-boot-starter's autoConfiguration instead of spring-cloud-alibaba-seata-starter's autoConfiguration
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
format aba89ed5ba
Merge pull request #1100 from pigxcloud/master
replace code properties that have expired
5 years ago
fangjian0423 a27d0e2c71 optimize dubbo dependency and code style 5 years ago
zkzlx 85ddda03ff [issue #982 & issue #978]enhance nacos config 5 years ago
冷冷 ffb246829f replace code properties that have expired 5 years ago
qixiaobo cfa1b20799 Merge remote-tracking branch 'upstream/master' into patch-1 5 years ago
fangjian0423 e4a4e7f288 update pom to adapt Hoxton version 5 years ago
祁晓波 460daaf1d8
Update readme.md 5 years ago
祁晓波 ed598ba427
add some warnings for classpath file datasource
You could use absolute path when you use File datasource & fat jar.
5 years ago
chuntaojun 935f50f9ab fix(nacos): Repair to create a large number of Nacos*Service problems 5 years ago
chuntaojun 492b8d3b20 refactor(nacos): Roll back to the original solution to solve the problem of compatibility 5 years ago
zkzlx 217296ba02 Dependency error 5 years ago
fangjian0423 de9b1be4be pass checkstyle plugin 5 years ago
format 9b32b41d05
Merge pull request #1001 from echooymxq/master
Optimize example module name
5 years ago
echooymxq 1bc20774c5 Optimize example module name 5 years ago
slievrly 6a90e643e6 update seata version and sample
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
fangjian0423 576de3a218 update dubbo version on examples 5 years ago
fangjian0423 2435167e1e format code with maven plugins 5 years ago
format df3d9ce0e8
Merge pull request #941 from eacdy/master
Add module Spring Cloud Alibaba Sidecar
5 years ago
itmuch 670967a41c add module Spring Cloud Alibaba Sidecar 5 years ago
format 7c452f6f7f
Merge pull request #920 from chuntaojun/fix_issue_859
fix(nacos): fix issue #859
5 years ago
format 179eab2b7e
Merge pull request #900 from lichen782/master
Support OssStorage Resource as WritableResource and add related unittest cases
5 years ago
chuntaojun f0f86868b2 fix(nacos): fix issue #859 5 years ago
chuntaojun 5162d02b4e fix(nacos): fix issue #859 5 years ago
fangjian0423 75f02aa2c5 some compatibility modifications about Hoxton 5 years ago
lichen782 572b13a0b3 Refactor the OssController upload2 to use try with clause 5 years ago
fangjian0423 0890e02db9 upgrade to Spring Cloud Hoxton 5 years ago
fangjian0423 e8ee68998e upgrade to Spring Cloud Hoxton, close #917 5 years ago
chuntaojun d2684c2882 fix(nacos): fix issue #859 5 years ago
chuntaojun e4d85b6c7e style(nacos): Standard code style. 5 years ago
chuntaojun d1b64df9d2 refactor(nacos): Modify nacos service caching mechanism 5 years ago
format 8e1468d97c
Merge pull request #884 from zhaoyuguang/zhaoyuguang/dev4
remove unused import statement
5 years ago
format 5b07a560be
Merge pull request #876 from zhaoyuguang/zhaoyuguang/dev_3
Use Spring advanced API make design more clearer
5 years ago
lichen782 9edab1215b Support OssStorage Resource as WritableResource and add related
unittest cases
5 years ago
赵禹光 34acf7034e remove unused import statement 6 years ago
赵禹光 189837ed12 remain annotations clearer 6 years ago
赵禹光 3eb75988e3 example annotations clearer 6 years ago
Rivers-Shall 57ec776c7b Modify `nacos-discovery-example` to test UrlCleaner of
`SentinelResttemplate`
6 years ago
panda 9dc03faa41 some doc no error correction 6 years ago
fangjian0423 c747d1f5e6 close #816 6 years ago
sundong ab819291e7 fescar -> seata 6 years ago
冷冷 45dd5ca4c9 ⬆️ Upgrading Version.2.1.1.BUILD-SNAPSHOT 6 years ago
冷冷 ac06210597 Merge https://github.com/alibaba/spring-cloud-alibaba 6 years ago
fangjian0423 9cf5624a86 Bumping versions to 2.1.1.BUILD-SNAPSHOT after release 6 years ago
冷冷 e9d6f2b5bd 📝 Writing docs. add sentinel feign example doc 6 years ago
fangjian0423 c8f9465fdc Update SNAPSHOT to 2.1.0.RELEASE 6 years ago
冷冷 5a1c2b5fef Adding tests. add sentinel feign example 6 years ago
mercyblitz be18803104 Update The sample 6 years ago
mercyblitz 9e0a5185d1 Polish spring-cloud-incubator/spring-cloud-alibaba#623 : Bugfix 6 years ago
mercyblitz ad9ce6267c Polish spring-cloud-incubator/spring-cloud-alibaba#600 : [Enhancement] Dubbo Spring Cloud Changes the dependency of spring-boot-actuator to be optional 6 years ago
fangjian0423 368487931f close #741 6 years ago
fangjian0423 8ed7e8b7c8 sentinel upgrade to 1.6.2, close #787 6 years ago
fangjian0423 04434bf977 update docs 6 years ago
fangjian0423 a593f774e0 optimize pom 6 years ago
fangjian0423 3427a7345d update sentinel demo 6 years ago
fangjian0423 9557879f44 update sentinel demo 6 years ago
format 9937bcf1a1
Merge pull request #778 from pigxcloud/master
 Introducing new features. Sentinel Support RedisDataSource…
6 years ago
fangjian0423 145c14058b update sentinel examples 6 years ago
fangjian0423 4003350d09 fix fescar typo & other typo 6 years ago
Xin Wang 7bd0adc99e update circleci url 6 years ago
冷冷 0e79b0ed31 Introducing new features. Sentinel Support RedisDataSource Dynamic Rule Configuration 6 years ago
slievrly 471a1228ff upgrade seata to 0.7.1 and update seata sample
Signed-off-by: slievrly <slievrly@163.com>
6 years ago
format 0f55fcc696
Merge pull request #775 from 734184341/master
View acm's health interface through the URL
6 years ago
zhh 8369b0de0f 暴露acm的health接口 6 years ago
Rivers-Shall bbc06485db Fix acm-local-example
Make the example app automatically refresh value from acm config server
by adding `@RefreshScope` annotation.
6 years ago
fangjian0423 883c66f251 polish #761 update pkg name & maven coordinate for Greenwich 6 years ago
fangjian0423 108a62a65c Updates to spring cloud Greenwich.SR2 6 years ago
format 334cc9e7fd
Merge pull request #714 from JevonYang/master
Configuration for looking up config-server URL via nacos discovery
6 years ago
fangjian0423 e812061a75 update sentinel add hot param flow rule case 6 years ago
Jevon Yang f4f407b84c example for issue #714 to validate the pr 6 years ago
caotc 4271669096 把过时的rocketmq的nameServer的地址配置名称修正为当前使用的配置名称 6 years ago
lujian 3a15c7ea15 Dubbo graduated from Apache, remove the incubating word in README. 6 years ago
format 24c8ddee8b
Merge pull request #671 from cdfive/SentinelHealthIndicator
Add HealthIndicator in Sentinel Starter
6 years ago
cdfive 584d5f4107 Check the health status of Sentinel DataSource using AbstractDataSource#loadConfig. 6 years ago
cdfive 3e2fa1b903 Fix typo in md files, acutator-> actuator,implmentation->implementation 6 years ago
cdfive 9c638b8d3f Add SentinelHealthIndicator to do some health check for Sentinel #265 6 years ago
fangjian0423 c4c8b4927e modify properties 6 years ago
fangjian0423 e840fd0b59 refactor sentinel gateway module 6 years ago
format 8206a7714e
Merge pull request #641 from slievrly/p3c_style
optimize code to match p3c check rules
6 years ago
jimin.jm 4dcd68f6e1 optimize code to match p3c check rules
Signed-off-by: jimin.jm <jimin.jm@alibaba-inc.com>
6 years ago
jimin.jm d2e9ad453c upgrade Seata version to 0.5.1
Signed-off-by: jimin.jm <jimin.jm@alibaba-inc.com>
6 years ago
fangjian0423 530a36fc06 modify name of ruleType and update example 6 years ago
fangjian0423 ef415f87ad Polish #615, rename spring-cloud-alibaba-sentinel-zuul to spring-cloud-alibaba-sentinel-gateway 6 years ago
fangjian0423 1b0485402c Polish #615, add gateway example 6 years ago
format 7f9781bde4
Merge pull request #616 from fangjian0423/master
[Sentinel] Support Webflux
6 years ago
format 38880a363c
Merge pull request #611 from fangjian0423/binder-dev
[RocketMQ Binder] Support PolledConsumer
6 years ago
fangjian0423 2047418d8b modify sentinel dependency 6 years ago
fangjian0423 566753aba7 add sentinel webflux example and modify sentinel web example 6 years ago
mercyblitz 1c98a232bf Remove the Chinese comments 6 years ago
mercyblitz 46cb0b41e4 Duplicate the dependencies for samples 6 years ago
mercyblitz 9d37e7aec6 Update the dependencies for bugfix 6 years ago
mercyblitz 6ccc3e25d6 Update Samples and Documents 6 years ago
jimin.jm 2de993b219 upgrade Seata version to 0.5.0
Signed-off-by: jimin.jm <jimin.jm@alibaba-inc.com>
6 years ago
buildmaster 632fb10ebe Bumping versions to 0.9.1.BUILD-SNAPSHOT after release 6 years ago
buildmaster 9c7f866c77 Going back to snapshots 6 years ago
buildmaster 3ea4843681 Update SNAPSHOT to 0.9.0.RELEASE 6 years ago
fangjian0423 d6f8a7801d change version from 2.1.0.BUILD-SNAPSHOT to 0.9.0.BUILD-SNAPSHOT 6 years ago
fangjian0423 0e6565b461 updata dubbo versions of all components to 2.7.1 6 years ago
jimin.jm 6e02fc4ca8 upgrade seata dependency and config
Signed-off-by: jimin.jm <jimin.jm@alibaba-inc.com>
6 years ago
flystar32 67bbfc1ed6 rename fescar to seata 6 years ago
fangjian0423 52da6f43c4 Merge remote-tracking branch 'upstream/master' into binder-dev 6 years ago
mercyblitz 2b5f7dc724 Polish spring-cloud-incubator/spring-cloud-alibaba#553 : Dubbo Spring Cloud service invocations failed without REST protocol 6 years ago
mercyblitz 0c73d6e6af Polish spring-cloud-incubator/spring-cloud-alibaba#549 : Update samples 6 years ago
mercyblitz da86149ffb Merge remote-tracking branch 'upstream/master' 6 years ago
mercyblitz ffcd829a99 Polish spring-cloud-incubator/spring-cloud-alibaba#549 : LoadBalancerInterceptor bean may be missing 6 years ago
fangjian0423 6b3f5cbd4c Updates to spring cloud Greenwich.SR1 6 years ago
Mercy Ma e7a1dfd46c
Merge pull request #546 from mercyblitz/master
Dubbo Spring Cloud Updates
6 years ago
fangjian0423 5671851d08 Polish #541, update rocketmq-examples with poll consumer 6 years ago
flystar32 04613951be update nacos watch pull duration to 30 seconds 6 years ago
fangjian0423 ebaf38fda7 update nacos config examples 6 years ago
mercyblitz f2fa0addf8 Polish spring-cloud-incubator/spring-cloud-alibaba#538 : Add Production-Ready features for Dubbo Spring Cloud 6 years ago
mercyblitz d5bdfbf127 Update Dubbo samples' plugins 6 years ago
mercyblitz e78b6dbaac Merge remote-tracking branch 'upstream/master' 6 years ago
mercyblitz c12252566a Update Dubbo Spring Boot Starter 2.7.1 6 years ago
xiaojing 017044e123
update readme 6 years ago
xiaojing 0c1e6e13cf
update readme 6 years ago
Mercy Ma 3230a61a23
Merge pull request #525 from mercyblitz/master
Polish spring-cloud-incubator/spring-cloud-alibaba#524 : Add @Configu…
6 years ago
mercyblitz fd410ccf38 Polish spring-cloud-incubator/spring-cloud-alibaba#524 : Add @ConfigurationProperties for Dubbo Spring Cloud 6 years ago
Mercy Ma c262c5a8a4
Merge pull request #522 from mercyblitz/master
Polish spring-cloud-incubator/spring-cloud-alibaba#500 : dubbo failed…
6 years ago
mercyblitz 026046fb15 Polish spring-cloud-incubator/spring-cloud-alibaba#500 : dubbo failed to transfer object using Fegin mode 6 years ago
fangjian0423 34d7f56158 update pom to fix build error 6 years ago
format eb7f63f53d
Merge pull request #513 from MaoJianwei/master
Add an usage for config listener. We can react to the change of config data.
6 years ago
Mercy Ma 02e2892f13
Merge pull request #515 from mercyblitz/master
Polish spring-cloud-incubator/spring-cloud-alibaba#510 : Reactor code
6 years ago
mercyblitz e32b020198 Polish spring-cloud-incubator/spring-cloud-alibaba#510 : Reactor code 6 years ago
Mercy Ma 5df1d76945
Merge pull request #514 from mercyblitz/master
Refactor Dubbo Service registration
6 years ago
mercyblitz 4b111e4e46 Polish spring-cloud-incubator/spring-cloud-alibaba#510 : Dubbo Spring Cloud Non-Web Provider Registration issue 6 years ago
Jianwei Mao 961d87d9e0
Add an usage for config listener
1. add an example that reacting to the change of config data using Listener.
2. update string format of output.
6 years ago
mercyblitz cda6d4ac6a Polish spring-cloud-incubator/spring-cloud-alibaba#509 : Random port Dubbo Spring Cloud Provider registration issue 6 years ago
小马哥 5073b10ad1 Merge branch 'master' of https://github.com/mercyblitz/spring-cloud-alibaba 6 years ago
小马哥 a50324c43a To add Gateway demo 6 years ago
mercyblitz 8218c9d38b Optimize 6 years ago
mercyblitz 3407cd36de Refactor Dubbo Service registration logic:
1. Simplify registration implementation
2. Add Event-Driven
6 years ago
fangjian0423 1cd4efdd1f Merge remote-tracking branch 'upstream/master' 6 years ago
flystar32 97a77d5c2b change version from 0.2.2.BUILD-SNAPSHOT to 2.1.0.BUILD-SNAPSHOT 6 years ago
flystar32 655f752e12 format code 6 years ago
fangjian0423 080ad2df1e fix bug about feign and update examples 6 years ago
fangjian0423 ec98a2db01 code format 6 years ago
fangjian0423 5995687dd5 update sentinel examples 6 years ago
fangjian0423 48dc322407 add spring-cloud-alibaba-dubbo to bom and remove useless example 6 years ago
codewaltz1994 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)

Root Cause: When using a newer version of MySQL dataase and jdbc jars , the jdbc url need add serverTimezone parameter to jdbc url.

Solution:
	Under the guidance of the thought, change "druidDataSource.setUrl("jdbc:mysql://" + ip + ":" + port + "/" + dbName);"
	into "druidDataSource.setUrl("jdbc:mysql://" + ip + ":" + port + "/" + dbName + "?serverTimezone=UTC");” in every databaseConfuguration.java
	file under this fescar-example directory.then re-run the example, bug is free
Project:
	spring-cloud-alibaba/spring-cloud-alibaba-examples/fescar-example
6 years ago
Spring Operator 5efcf5adf1 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 69 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).

# Ignored
These URLs were intentionally ignored.

* http://maven.apache.org/POM/4.0.0 with 138 occurrences
* http://www.w3.org/2001/XMLSchema-instance with 69 occurrences
6 years ago
Xiaolong Zuo b8910ac908
Merge pull request #447 from fangjian0423/master
add 'HTTPMethod:' prefix for the resource of using @SentinelRestTemplate
6 years ago
fangjian0423 1eef8f688f add 'HTTPMethod:' prefix for the resource of using @SentinelRestTemplate 6 years ago
Jlcao cef321c4fb
Wrong character changes
Wrong character changes. ‘流量器’==> '浏览器‘
6 years ago
Xiaolong Zuo 09e90a1e67
Merge pull request #431 from fangjian0423/master
Fix bug 4 spring-cloud-starter-bus-rocketmq
6 years ago
fangjian0423 69f6ad9128 update bus example 6 years ago
jimin.jm 668f99cd56 fix #432 update Fescar-Sample readme,unique index instead of normal index 6 years ago
fangjian0423 1b9cbf7396 update bus example 6 years ago
Xiaolong Zuo 49baeff6e9
Merge pull request #420 from fangjian0423/binder-dev
RocketMQ Binder integrates RocketMQ Spring
6 years ago
fangjian0423 53c4a6adf6 refactor & upgrade rocketmq-client version 6 years ago
fangjian0423 474132db42 Merge remote-tracking branch 'upstream/master' into binder-dev 6 years ago
jimin.jm b2e4ba2620 fix #417 when fescar upgrade 0.2.0+ configuration file changed 6 years ago
Mercy Ma 9c5d9229e5
Merge pull request #413 from mercyblitz/master
Polish : spring-cloud-incubator/spring-cloud-alibaba#409 : Register t…
6 years ago
mercyblitz 10f06bec1e Polish : spring-cloud-incubator/spring-cloud-alibaba#409 : Register the Dubbo REST services as Spring Cloud services in non-web environment 6 years ago
Mercy Ma 7c3222f235
Merge pull request #408 from mercyblitz/master
Add DubboRegistryServiceIdHandler Bean to customize Service Id
6 years ago
mercyblitz e48863640a Polish : spring-cloud-incubator/spring-cloud-alibaba#377 : Refactor 6 years ago
Mercy Ma c6a31dac63
Merge pull request #406 from mercyblitz/master
Use Apache Dubbo 2.7.x as Spring Cloud Infrastructure #377
6 years ago
Xiaolong Zuo 45c4c5baf5
Merge pull request #405 from fangjian0423/master
Update docs & add spring cloud gateway bom
6 years ago
flystar32 b50cd9266f update nacos and fescar version and format some testcase 6 years ago
mercyblitz 514fef53f5 Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#377 : Resolve version issue 6 years ago
mercyblitz fa1aa272b1 Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#377 : Use Apache Dubbo 2.7.x as Spring Cloud Infrastructure 6 years ago
fangjian0423 501d08d1e5 add spring cloud gateway bom 6 years ago
fangjian0423 0e4de15632 update sms example 6 years ago
fangjian0423 9934f5bc60 resolve conflict 6 years ago
xiaojing dbfc363c02
Merge pull request #394 from yunzheng1228/master
format code and fixed example's bug
6 years ago
yunzheng1228 df8f703460 Fixed nacos-example's bug, Change the attribute value of spring.application.name from 'sca-nacos-config' to 'nacos-config-example' 6 years ago
fangjian0423 7cc3b02917 update rocketmq examples 6 years ago
fangjian0423 509d4819b3 Merge remote-tracking branch 'upstream/master' into binder-dev 6 years ago
format 986e529043
Merge pull request #390 from mostcool/master
optimized spring-cloud-alicloud-sms pom.xml
6 years ago
gaokai ef00e96b5c 包含sms-example模块 6 years ago
mercyblitz f98b74ad45 Merge remote-tracking branch 'upstream/master' 6 years ago
mercyblitz f719e16d38 Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : Supports all Spring Cloud Registries and default is Nacos 6 years ago
mercyblitz ab1ecca6ab Polish : /spring-cloud-incubator/spring-cloud-alibaba#387 : Dubbo Spring Cloud Samples 6 years ago
xiaojing cac7574396
Merge pull request #384 from Harris2012/patch-1
use EnableDiscoveryClient
6 years ago
mercyblitz 21f3451f7b Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#387 : Add Dubbo Spring Cloud Samples 6 years ago
mercyblitz b3c26c509e Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : supports Spring Cloud Netflix Eureka and Spring Cloud Zookeeper 6 years ago
xiaolongzuo 844d17b9f6 Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba 6 years ago
fangjian0423 84bb53f706 Merge remote-tracking branch 'upstream/master' into binder-dev 6 years ago
format 03f8defb09
Merge pull request #367 from zhendong590/master
aggregate multi report
6 years ago
fangjian0423 e537eb55de resolve conflict 6 years ago
xiaolongzuo 2a83f3e84e Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
# Conflicts:
#	spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java
#	spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java
6 years ago
xiaolongzuo fa5b57f3db Polish test cases for schedulerx 6 years ago
fangjian0423 ac11a3a752 refactor sms module 6 years ago
Harris Zhang 10206af82b
use EnableDiscoveryClient 6 years ago
pbting 92519a7a09
Merge branch 'master' into master 6 years ago
gaoyunpeng 2db3677f20 fix #369 remove superfluous settings in fescar example 6 years ago
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
6 years ago
pbting 95060a19b1
Update pom.xml
remove alicloud context maven dependency
6 years ago
pbting c8f1697c3d
Update pom.xml
remove alicloud context
6 years ago
得少 f777bc3006 remove alicloud context dependency 6 years ago
format 9b84df9015
Merge pull request #358 from pbting/master
nacos discovery starter support connect to aliyun with master branch
6 years ago
mercyblitz fc8d8e3628 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : @DubboTransported supports RestTemplate (part 1) 6 years ago
gaoyunpeng 394485a12d replace cobertura to jacoco 6 years ago
得少 997faff710 add nacos discovery starter support to connect to aliyun 6 years ago
pbting 90a7769180
Merge pull request #4 from spring-cloud-incubator/master
Synchronize code once
6 years ago
fangjian0423 9f797f586e update rocketmq binder demo 6 years ago
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
6 years ago
flystar32 450f1e8269 modify example to verify . 6 years ago
xiaojing 04908741bb
Update readme-zh.md 6 years ago
flystar32 30b6456558 resolve conflict 6 years ago
flystar32 a6a894a110 add module Fescar, Polish #303 6 years ago