zkzlx
|
afdee2807d
|
Merge remote-tracking branch 'upstream/master' into rocketmq
# Conflicts:
# pom.xml
# spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java
# spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java
# spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java
# spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java
# spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java
# spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java
|
3 years ago |
|
zkzlx
|
9cba216bfa
|
Optimize the consumption of Pull
|
3 years ago |
余黄彬
|
989cf4268a
|
Merge pull request #2254 from Pengfei-Lu/gh-2253-fix
Fixes #2253: ThreadPoolTaskScheduler instance in NacosWatch can't be shutdown.
|
3 years ago |
|
余黄彬
|
387dd46fa4
|
Merge pull request #2255 from Pengfei-Lu/zh-readme-format-optimize
Optimize README format.
|
3 years ago |
Alex Lu
|
b34adc077b
|
Optimize README format.
|
3 years ago |
|
zkzlx
|
ad26836020
|
Merge pull request #2258 from panzhi33/master
[rocketmq]fix variable judgment bug
|
3 years ago |
panzhi33
|
bbf4977e7e
|
[rocketmq]fix variable judgment bug
|
3 years ago |
|
Alex Lu
|
03e16756cd
|
Fixes #2253: ThreadPoolTaskScheduler instance in NacosWatch can't be shutdown.
|
3 years ago |
Mercy Ma
|
c501697bc8
|
Merge pull request #2249 from alibaba/dependabot/maven/org.apache.dubbo-dubbo-2.7.13
Bump dubbo from 2.7.8 to 2.7.13
|
3 years ago |
|
zkzlx
|
a530705983
|
Merge pull request #2034 from panzhi33/master
升级rocketmq-spring-boot-starter版本，商业版消息轨迹无需手动配置轨迹topic
|
3 years ago |
dependabot[bot]
|
23e9a52fc8
|
Bump dubbo from 2.7.8 to 2.7.13
Bumps [dubbo](https://github.com/apache/dubbo) from 2.7.8 to 2.7.13.
- [Release notes](https://github.com/apache/dubbo/releases)
- [Changelog](https://github.com/apache/dubbo/blob/3.0/CHANGES.md)
- [Commits](https://github.com/apache/dubbo/compare/dubbo-2.7.8...dubbo-2.7.13)
---
updated-dependencies:
- dependency-name: org.apache.dubbo:dubbo
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
|
3 years ago |
|
余黄彬
|
aae7fae1f3
|
Merge pull request #2243 from yuhuangbin/nacos-2.0.3
Upgrade Nacos client version to 2.0.3
|
3 years ago |
|
yuhuangbin
|
2fb1d06444
|
upgrade Nacos client version to 2.0.3
|
3 years ago |
|
yuhuangbin
|
a7e3b39826
|
upgrade Nacos client version to 2.0.3
|
3 years ago |
|
余黄彬
|
11fbd5768e
|
Merge pull request #2 from alibaba/master
update
|
3 years ago |
|
余黄彬
|
7755e19c07
|
Merge pull request #2208 from yuhuangbin/master
[Feature] SidecarHealthChecker add CustomerHandler
|
3 years ago |
|
zkzlx
|
bc6c89f1bc
|
Merge branch 'rocketmq' of github.com:alibaba/spring-cloud-alibaba into rocketmq
|
4 years ago |
|
余黄彬
|
74462793e6
|
Update nacos-config.adoc
|
4 years ago |
|
zkzlx
|
745d173898
|
message converter
|
4 years ago |
Jim Fang
|
eed8bea07b
|
Merge pull request #1996 from RobberPhex/ramRoleName
添加RamRoleName支持
|
4 years ago |
|
zkzlx
|
b35e7d7877
|
fixed Instrumentation
|
4 years ago |
TheoneFx
|
72e8a3bb36
|
Merge pull request #2103 from joeqiaoyao/rocketmq
feat: 配置添加unitName，支持同一应用连接多个集群
|
4 years ago |
|
zkzlx
|
f9c2c3a531
|
Merge pull request #2217 from zkzlx/rocketmq
Append other module updates and optimize parts of the MQ code
|
4 years ago |
|
zkzlx
|
79f986b4c6
|
Merge branch 'master' into rocketmq
# Conflicts:
# spring-cloud-alibaba-docs/src/main/asciidoc-zh/rocketmq-new.adoc
|
4 years ago |
|
zkzlx
|
c6147dc618
|
document
|
4 years ago |
|
zkzlx
|
5d745f81c0
|
document
|
4 years ago |
|
zkzlx
|
568c64b1cf
|
document
|
4 years ago |
|
yuhuangbin
|
8cddc0525f
|
SidecarHealthChecker customer
|
4 years ago |
|
余黄彬
|
e068a23350
|
Merge pull request #2201 from yuhuangbin/master
Enhance Nacos shutdown, NacosServiceRegistry#close()
|
4 years ago |
|
yuhuangbin
|
7d9751304e
|
enhance Nacos shutdown code
|
4 years ago |
|
TheoneFx
|
f1ef409fa7
|
Merge pull request #2160 from theonefx/master
fix register metadata to consul
|
4 years ago |
|
theonefx
|
ca49df5ca4
|
add dependency of commons
|
4 years ago |
|
theonefx
|
4356f1be49
|
fix #2157
|
4 years ago |
|
theonefx
|
4d697bb294
|
fix #2157
|
4 years ago |
|
余黄彬
|
d4b7b3193a
|
Merge pull request #2159 from XuDaojie/nacos-loadbalancer-adoc
update nacos-discovery.adoc
|
4 years ago |
XuDaojie
|
7825cb0ceb
|
update nacos-discovery.adoc
|
4 years ago |
|
余黄彬
|
350f87c79f
|
Merge pull request #2151 from yuhuangbin/master
[Enhancement] NacosWatch use a separate thread pool
|
4 years ago |
|
yuhuangbin
|
b4adbb65cc
|
NacosWatch use a separate thread pool
|
4 years ago |
|
TheoneFx
|
524ccd8148
|
Merge pull request #2149 from theonefx/master
Use the sentinel in a safe way
|
4 years ago |
|
theonefx
|
df096fdfb5
|
Sentinel is called in a more secure way
|
4 years ago |
wuwen
|
9a11f79326
|
Lower log level
没有配置规则是很正常的，例如用户侧做了全局规则实现，这里频繁刷warn日志无法控制.
|
4 years ago |
|
TheoneFx
|
9d9c0a5306
|
Merge pull request #2146 from theonefx/master
throw exception directly when exception is not an BlockException
|
4 years ago |
|
theonefx
|
aa580ac3b6
|
throw exception directly when exception is not an BlockException in SentinelProtectInterceptor
|
4 years ago |
Neptune
|
0980e2afe0
|
Merge pull request #2143 from theonefx/master
use aop to save and get FeignClientFactoryBean
|
4 years ago |
|
theonefx
|
ec1f65f99d
|
use aop to save and get FeignClientFactoryBean replace to applicationContext.getBean
|
4 years ago |
|
TheoneFx
|
d22f41594a
|
Merge pull request #2135 from theonefx/master
support ak/sk authentication when using serverAddr
|
4 years ago |
|
theonefx
|
c5949a5863
|
support ak/sk authentication when using serverAddr
|
4 years ago |
|
TheoneFx
|
bfabf9eea7
|
Merge pull request #2121 from theonefx/master
Ensure that URL for different parameters can be computed to different revision
|
4 years ago |
|
theonefx
|
d69f66cc3e
|
avoid defult router impact DubboMetadataService works
|
4 years ago |
|
theonefx
|
5f7ddab58e
|
avoid defult router impact DubboMetadataService works
|
4 years ago |