Commit Graph

1821 Commits (ec75c32f61b9b2ba591312fd8e8955057da14ed3)
 

Author SHA1 Message Date
余黄彬 2f3460f3f5
Merge pull request #3 from alibaba/master
update
4 years ago
theonefx.chenx 43a79105e0 update 2 SNAPSHOT version 4 years ago
zongyl bcc262db15 update docs 4 years ago
余黄彬 e8de5cc8aa
Merge pull request #1823 from yuhuangbin/nacos
Optimize the way to get NacosWatch#ThreadPoolTaskScheduler
4 years ago
yuhuangbin 8f008191ad Optimize the way to get NacosWatch ThreadPoolTaskScheduler 4 years ago
zkzlx e26ef50af4 [pr #1531]build 4 years ago
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
4 years ago
余黄彬 336476b15d
Merge pull request #1799 from wangliang181230/bugfix-hystrix-RootContext.bind-throw-xid-must-be-not-null
bugfix: fix compatibility issue with 'seata-all-1.4.0'
4 years ago
王良 fa49d5f03c bugfix: fix compatibility issues with 'seata-all-1.4.0' 4 years ago
Jim Fang 9abfee6737
Merge pull request #1780 from lltx/master
fix EndpointId logWarning
4 years ago
Jim Fang 956acad43e
Merge pull request #1772 from Roger3581321/patch-1
Add one missing configuration item
4 years ago
Jim Fang 7316db75be
Merge pull request #1771 from Flyfoxs/patch-1
update Seata example
4 years ago
Jim Fang b5b26481bd
Merge pull request #1775 from qq32933432/master
modify Seata example
4 years ago
冷冷 6540555920 fix EndpointId logWarning 4 years ago
zhongguangxi 1934c4760d maven project name change 4 years ago
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.
4 years ago
Flyfoxs 11f8f02de6
Timeout exception in feign first time calling
第一次Feign调用时, 由于初始化懒加载, 可能会有timeout异常. 之前会被mock异常掩盖了.
4 years ago
余黄彬 9fb88da84c
Merge pull request #1 from alibaba/master
update
4 years ago
余黄彬 29b955fffb
Update README-zh.md 4 years ago
余黄彬 6617c9aef8
Update README.md 4 years ago
Mercy Ma 96a3807721
Merge pull request #1749 from alibaba/2.2.3.RELEASE
[CodeBase] Merge branch 2.2.3.release to master
4 years ago
Mercy Ma 2835024113
Merge pull request #1747 from mercyblitz/master
2.2.3.RELEASE
4 years ago
mercyblitz b4abf6db15 Update the version to be 2.2.3.RELEASE 4 years ago
Mercy Ma de9f5a97c0
Merge pull request #1743 from mercyblitz/master
[Infrastructure] Upgrading the dependencies
4 years ago
mercyblitz ea3f76c77f Remove the useless properties 4 years ago
mercyblitz 24de18a00c Polish alibaba/spring-cloud-alibaba#1727 : rollback rocketmq-spring-boot-starter 4 years ago
mercyblitz 9842296af5 Merge remote-tracking branch 'upstream/master' 4 years ago
Mercy Ma fbc8191d87
Merge pull request #1737 from mostcool/master
update pom.xml
4 years ago
mercyblitz f40fe58dc9 Merge remote-tracking branch 'upstream/master' 4 years ago
mercyblitz bb9dbba7d1 Polish alibaba/spring-cloud-alibaba#1741 : [Infrastructure] Upgrading the Nacos Client 4 years ago
mercyblitz 0e77fce012 Polish alibaba/spring-cloud-alibaba#1727 : upgrade rocketmq-spring-boot-starter 4 years ago
Mercy Ma d6aff2e60d
Merge pull request #1736 from mercyblitz/master
[Issue] NPE issue on Alibaba's spring-context-support
4 years ago
K 64c8ebf536
update spring-cloud-dependencies-parent version
update spring-cloud-dependencies-parent version
4 years ago
K c3afdad2b1
remove useless properties
remove useless properties
4 years ago
mercyblitz b23dd033fb Polish alibaba/spring-cloud-alibaba#1723 : 2.2.2.RELEASE undertow stop shows "Failed to stop bean 'nacosWatch'" 4 years ago
mercyblitz 8c5e745d1b Upgrade the version to be 2.2.3-SNAPSHOT 4 years ago
K fa21bc19ce
Merge pull request #7 from alibaba/master
sync
4 years ago
Mercy Ma c0b056a90e
Merge pull request #1729 from yuhuangbin/master
[Enhancement] NacosWatch keep publish HeartbeatEvent
4 years ago
yuhuangbin f284172fbb fix 4 years ago
yuhuangbin 15ffaccc75 enhance 4 years ago
Mercy Ma 51baa35139
Merge pull request #1724 from yuhuangbin/master
[Enhancement] NacosDiscoveryClient always getNamingservice from Nacosmanager
4 years ago
K 6880e4bd7b
Merge pull request #6 from alibaba/master
sync
4 years ago
yuhuangbin c5d68bb60f enhance 4 years ago
Mercy Ma 4b06a6178d
Merge pull request #1722 from yuhuangbin/2.2.2
Fix some bugs for 2.2.2.RELEASE
4 years ago
yuhuangbin b638480cf7 fix test 4 years ago
yuhuangbin 5b0d53388b sentinel NacosDataSourceFactoryBean enhance 4 years ago
yuhuangbin df156d4fa2 fix 4 years ago
yuhuangbin e9a6eaa025 fix 4 years ago
yuhuangbin 702831cb8f fix 4 years ago
余黄彬 2114262e47
Merge pull request #2 from alibaba/master
update
4 years ago