Commit Graph

430 Commits (4f91dc2c455355e205397a405ce0637b7875a1df)

Author SHA1 Message Date
Freeman Lau e3ce3ee92d Downgrade boot version.
Temporarily remove the extension class and add it when the boot version is greater than 2.4.5.
3 years ago
Freeman Lau 769bced209 Use NacosConfigManager to create ConfigService.
Modify whether is PROFILE_SPECIFIC logic.
Make NacosBootstrapper method public.
3 years ago
Freeman Lau dec4c63b52 Refresh feign client rules only.
现在只刷新 feign client 熔断规则, 手动添加或者通过 dashboard 和数据源配置的规则不会受到影响
3 years ago
Freeman Lau 21e22e0696 ref: Remove ConfigServiceIndexes
重构代码
dataId 不可缺省, 通过参数覆盖默认配置
3 years ago
Freeman Lau 8958392914 Refactor configuration
重构配置方式, 不需要将 serverAddr 写在 import 里
保留以前版本的拉取配置逻辑, 保证能够平滑升级
3 years ago
Freeman Lau 5786ba51eb Support spring.config.import
支持 import 方式
3 years ago
Freeman Lau 77b3d7922b fix: Keep rules in dataSource
保留数据源中配置
3 years ago
Freeman Lau b96b762001 Add unit test
添加相关单元测试
现在没有配置 dataId 时会默认使用 {application}-{profile}.{fileExtension}
3 years ago
Freeman Lau 695938280f fix: Remove dummy method 3 years ago
Freeman Lau 83873e5fbe feature: support spring.config.import
支持 spring boot >= 2.4.0 通过 spring.config.import
 方式引入 nacos 配置
3 years ago
余黄彬 e5149643d8
Merge pull request #2346 from helloichen/feature/issue2328_nacos
[Enhancement] Support for obtaining configuration data with delimiters from Nacos
3 years ago
Chenwp 67b98c3a7a use LinkedHashMap to ensure the order of configuration. 3 years ago
Chenwp aeb1dfb2e7 yaml powerMock 3 years ago
Freeman Lau e8ff4d8f4f fix: Adjust unit test configuration
增大 timeWindow 值, 降低单测不过情况的概率
3 years ago
Freeman Lau 2f6e12d0a7 feature: Support dynamic refresh circuit breaker rules
支持断路器规则的动态刷新
3 years ago
Chenwp f2fc814404 nacos configuration file support "---" 3 years ago
HuGuirong 796d18a941 Update documentation and code comment links 3 years ago
Freeman Lau 0a04d921a4 fix: change Feign client single method configuration key
Change key format, UserClient#methodName(Type,Type) -> user#methodName(Type,Type).
String before the '#', changed to Feign client name.

Fix code format.
3 years ago
Freeman Lau 1ce2501bc0 fix: comment and blank 3 years ago
Freeman Lau 2342f23bf3 feature: support configuration per Feign client
Note: it depends on spring cloud openfeign version in classpath.

If using spring-cloud-openfeign-core version >= 3.0.4, you can configure for per Feign client. Otherwise, you can only configure for per Feign client' single method.

Fix test.
3 years ago
Freeman Lau eb59569d35 feature: support feign client custom configuration
There's a potential problem, if CircuitBreakerFactory was injected in spring's lifecycle, will possibly get the raw one(not customized). So, remove ReactiveSentinelCircuitBreakerAutoConfiguration and SentinelCircuitBreakerAutoConfiguration inner configuration class.
3 years ago
李志威 941bdad484
fix the checkstyle plugin error
```shell
[INFO] --- maven-checkstyle-plugin:3.0.0:check (checkstyle-validation) @ spring-cloud-starter-stream-rocketmq ---
[INFO] 开始检查……
[ERROR] /Users/lizhiwei/Git/github/spring-cloud-alibaba/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/autoconfigurate/ExtendedBindingHandlerMappingsProviderConfiguration.java:59: 需要一个 Javadoc注释 @return 。 [JavadocMethod]
检查完成。
[INFO] ------------------------------------------------------------------------
```
3 years ago
HuGuirong 6d58917fa6 NacosDataSourceProperties support for contextPath configuration items
Closes gh-2327
3 years ago
余黄彬 ebe258364c
Merge pull request #2325 from Jack9610/master
fix issue#2323
3 years ago
wuchao 162941e880 fix issue#2323 3 years ago
zkzlx 3c3ba1b4a7
Merge pull request #2302 from steverao/rocketmq-2.2.7
Merge branch of rocketmq-2.2.7 to master
3 years ago
ZhangC 3edcc41099
fixup: issue#2300
Use the legacy bootstrap way in newer spring-cloud version
3 years ago
x_vivi@yeah.net 000e141404 Change NacosServiceManager injection mode to constructor injection 3 years ago
zkzlx 3e8380740c Optimize the code of producer 3 years ago
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
panzhi33 bbf4977e7e [rocketmq]fix variable judgment bug 4 years ago
Alex Lu 03e16756cd Fixes #2253: ThreadPoolTaskScheduler instance in NacosWatch can't be shutdown. 4 years ago
zkzlx a530705983
Merge pull request #2034 from panzhi33/master
升级rocketmq-spring-boot-starter版本,商业版消息轨迹无需手动配置轨迹topic
4 years ago
yuhuangbin 2fb1d06444 upgrade Nacos client version to 2.0.3 4 years ago
余黄彬 7755e19c07
Merge pull request #2208 from yuhuangbin/master
[Feature] SidecarHealthChecker add CustomerHandler
4 years ago
zkzlx bc6c89f1bc Merge branch 'rocketmq' of github.com:alibaba/spring-cloud-alibaba into rocketmq 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 79f986b4c6 Merge branch 'master' into rocketmq
# Conflicts:
#	spring-cloud-alibaba-docs/src/main/asciidoc-zh/rocketmq-new.adoc
4 years ago
zkzlx 568c64b1cf document 4 years ago
yuhuangbin 8cddc0525f SidecarHealthChecker customer 4 years ago
yuhuangbin 7d9751304e enhance Nacos shutdown code 4 years ago
XuDaojie 9eb5233dcb update nacos-discovery default don't use NacosLoadBalancer 4 years ago
XuDaojie f0edd0f820 update nacos-dicovery.additional-spring-configuration-metadata.json 4 years ago
XuDaojie 3c769a9ba7 remove ConditionalOnLoadBalancerNacosDefault.java 4 years ago
theonefx ca49df5ca4 add dependency of commons 4 years ago
XuDaojie 914e86fa21 remove NoneLoadBalancerCacheManager.java 4 years ago
XuDaojie eea363bda4 update ServiceInstanceListSupplier.builder() don't use withCache() 4 years ago
theonefx 4356f1be49 fix #2157 4 years ago
theonefx 4d697bb294 fix #2157 4 years ago
XuDaojie e4d467f359 update loadbalancer.nacos.enabled -> spring.cloud.loadbalancer.nacos.enabled 4 years ago
XuDaojie fbc7f9d985 add NoneLoadBalancerCacheManager 4 years ago
XuDaojie cf13c1cfe8 format code 4 years ago
XuDaojie ae5f25f22d add NacosLoadBalancer 4 years ago
yuhuangbin b4adbb65cc NacosWatch use a separate thread pool 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 aa580ac3b6 throw exception directly when exception is not an BlockException in SentinelProtectInterceptor 4 years ago
theonefx ec1f65f99d use aop to save and get FeignClientFactoryBean replace to applicationContext.getBean 4 years ago
theonefx c5949a5863 support ak/sk authentication when using serverAddr 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
theonefx 374964d8dc add router url when urls is not empty 4 years ago
theonefx 3009b162a0 add a router to make sure that use revision when invoke DubboMetadataService 4 years ago
theonefx c448027f34 add spring-cloud-starter-bootstrap to compatible with spring boot bootstrap 4 years ago
theonefx fb9521b2e6 remove unused code;
make sure param not lost, so that different param calculate different revision.
4 years ago
theonefx e4f2f4150c init DubboCloudRegistry when subscribe or unsubscribe 4 years ago
HuGuirong 4786725e8e 修复当实例不在默认分组下时获取不到实例状态的BUG 4 years ago
TheoneFx 139d793302
Merge pull request #2104 from yuhuangbin/master
[Feature] support for registration of quick failed configuration items
4 years ago
yuhuangbin a2b2c2f8c1 Nacos Discovery supports registration for quick failed configurations 4 years ago
zkzlx d55aea9d2b Merge branch 'rocketmq' of github.com:alibaba/spring-cloud-alibaba into rocketmq 4 years ago
joeqiaoyao 87d0939411 feat: 配置添加unitName,支持同一应用连接多个集群 4 years ago
theonefx df2bced6f2 optimize dubbo registry 4 years ago
theonefx 479540c835 optimize dubbo registry 4 years ago
eden-yuan c3d393b09e 1. try执行后无catch 依然是return null
2. 变量后续没用到可定义到 try 内
3. 添加UP/DOWN 常量值
4 years ago
TheoneFx 55b3336b6c
Merge pull request #1992 from DHBin/master
修复dubbo使用服务分组和分组聚合获取不到url
4 years ago
zkzlx d17a38d495 Merge branch 'master' of github.com:alibaba/spring-cloud-alibaba into rocketmq 4 years ago
theonefx cf71b7aa26 add more log 4 years ago
theonefx f816114122 re subscribe when failed 4 years ago
theonefx 3d5eaefe1c resolve @order not effect when handle ServiceInstanceChangedEvent 4 years ago
TheoneFx 4bb797407a
Merge pull request #1860 from griswold1991/master
Fix ConcurrentModificationException while EventDispatcher.run after '…
4 years ago
Spike c138dd17ac fix check style 4 years ago
Spike 10e9a99d08 issue#2040
转移RocketMQConfigBeanPostProcessor和CompositeMessageConverter从RocketMQBinderAutoConfiguration至ExtendedBindingHandlerMappingsProviderConfiguration

从RocketMQBinderAutoConfiguration中注入会被stream代理生成一个新的上下文层,上层使用者和它会被隔离导致无法使用
原来是通过spirng.binders经过spring-cloud-stream代理
4 years ago
Spike ba80fcac2f #checkstyle removed unused import 4 years ago
Spike 1f9f10ce90 issue#2040
移除RocketMQConfigBeanPostProcessor在RocketMQBinderAutoConfiguration类中的注入,改为通过spirng.factories注入,原来是通过spirng.binders经过spring-cloud-stream代理
4 years ago
chris 3ad550f211 bugfix invokers metadata tag error 4 years ago
panzhi33 f8ee5dc71c fix style code 4 years ago
panzhi33 e3c791179b 升级rocketmq-spring-boot-starter版本,商业版消息轨迹无需手动配置轨迹topic 4 years ago
TheoneFx 9d27402646
Merge pull request #2013 from zkzlx/rocketmq
[major update]many features enhanced & many bugs fixed
4 years ago
TheoneFx 51a8b32ff3
Merge pull request #1977 from huangdx0726/fix1971
Upgrade Sentinel to 1.8.1
4 years ago
zkzlx 9379d18ace Code style 4 years ago
zkzlx 6d7c47a366 Code refactoring and some new feature support - delete some invalid files. 4 years ago
theonefx 76cfd2c7fe port optimize 4 years ago
theonefx a80e9106a6 reformat 4 years ago
theonefx e8cd8f4dab reformat 4 years ago
theonefx 65fd0ebeca Adapt to the latest implementation 4 years ago
theonefx ed9d659d64 remote all hystrix,zuul,ribbon 4 years ago
zkzlx 09841f6616 Merge branch 'master' of github.com:alibaba/spring-cloud-alibaba into rocketmq 4 years ago
luyanbo b7f1dc9b04 添加RamRoleName支持 4 years ago
dhb fd1deaa475 fix dubbo service group and service merger cannot obtain urls 4 years ago
TheoneFx 884399d73b
Merge pull request #1932 from Maijh97/fix_#1931
[ISSUE-#1931] Add a reset Nacos Log Config listener.
4 years ago
huangdx0726 70c7a9c022
Merge branch 'master' into fix1971 4 years ago
黄大相 2701624da2 Upgrade Sentinel to 1.8.1 4 years ago
黄大相 9d164f9a0a Upgrade Sentinel to 1.8.1 4 years ago
黄大相 4817ca53b8 Upgrade Sentinel to 1.8.1 4 years ago
黄大相 15df0bff6b Upgrade Sentinel to 1.8.1 4 years ago
theonefx de5ca9540e add spring-cloud-starter-bootstrap to compatible with spring boot bootstrap 4 years ago
theonefx da19750268 sentinel unit test pass 4 years ago
theonefx e7521c02c9 2020 build done, unit test failed 4 years ago
theonefx 1492ad5693 upgrade spring cloud version to 2020.0.1 4 years ago
theonefx d9727bb31f Use spring.cloud.version instead of the version number of each component 4 years ago
theonefx ee1e5d36ef Use spring.cloud.version instead of the version number of each component 4 years ago
zkzlx c1c5597171 Code refactoring and some new feature support - delete some invalid files. 4 years ago
zkzlx 5a763e0ec9 Code refactoring and some new feature support - delete some invalid files. 4 years ago
zkzlx a6e01c9984 Code refactoring and some new feature support 4 years ago
zkzlx cbd64061ce Code refactoring and some new feature support 4 years ago
theonefx 0471b45662 Merge remote-tracking branch 'up/master' into endpoints 4 years ago
theonefx 6924f0c3be add service instance change event listener order 4 years ago
theonefx 8542756d90 dubbo endpoint 4 years ago
theonefx 4a2f90f13e dubbo endpoint 4 years ago
theonefx dfa7747579 add dubbo and nacos endpoint 4 years ago
zkzlx 62398e1bc2 fixed - Unicode encoding , exclude base latin letter. 4 years ago
zkzlx a81430a965 fixed chinese garbled for nacos-config 4 years ago
zkzlx bb7afd9033 fixed chinese garbled for nacos config. 4 years ago
zkzlx 5e5e5db584 fixed chinese garbled for nacos-config 4 years ago
mai.jh 441bcb9124 for: #1931 ,Add a reset Nacos Log Config listener. 4 years ago
theonefx 3249c46dcc fix #1926 4 years ago
theonefx 38de8b0e47 remove all apache.commons 4 years ago
theonefx a05958865a remove all apache.commons 4 years ago
theonefx 69c25ee412 remove all apache.commons 4 years ago
theonefx 75a5985c3e remove all apache.commons 4 years ago
theonefx a758b45661 push temporary 4 years ago
theonefx a20c665497 update nacos client version 2 1.4.1 4 years ago
TheoneFx fe00047ea6
Merge pull request #1892 from onewe/fix/weblogic_classloader_leak
fix(NacosConfigManager): 修复weblogic中classloader泄漏问题
4 years ago
TheoneFx dec10f17fe
Merge pull request #1903 from github-ganyu/master
Fix bug: NPE Exception.
4 years ago
theonefx eea48c73cc refactor method and class name 4 years ago
theonefx 6c0edee13e use starting status in eureka when first registry 4 years ago
theonefx fd8a6a6f6c #1805 use twice registry of dubbo 4 years ago
chenglu b264579012 update the Nacos instance by real group name, not use the default group name 4 years ago
ganyu.gy f64d794017 Fix bug: NPE Exception.
https://github.com/apache/dubbo/issues/7079
4 years ago
余黄彬 0567f0f4e1
Merge pull request #1878 from horizonzy/fix-nacos-heart-param
[ISSUE-#1877] Fix nacos heart beat unit, second to millisecond.
4 years ago
TheoneFx 4dd45a4709
Merge pull request #1531 from zkzlx/config
[fix & enhance issue #1492 #1506 #1257 #1578 ]Improved nacos configuration parsing,
4 years ago
onewe 17b3b7f858 fix(NacosConfigManager): 格式化代码 4 years ago
onewe 0c35595b44 fix(NacosConfigManager): 修复weblogic中classloader泄漏问题
- NacosConfigManager增加销毁方法,关闭nacos相关线程池
4 years ago
horizonzy 076a1648a2 update test heart beat param value 4 years ago
horizonzy 71036479a1 update test heart beat param value 4 years ago
horizonzy 447171de80 modify the heart beat doc unit. second -> millisecond 4 years ago
horizonzy 802958b218 Revert "fix nacos heart beat unit, second to millisecond."
This reverts commit 0e388707
4 years ago
horizonzy 0e38870735 fix nacos heart beat unit, second to millisecond. 4 years ago
wangmin 770382b36a Fix ConcurrentModificationException while EventDispatcher.run after 'received push data' from Nacos 4 years ago
eden-yuan c19bd51584 不应该使用类实例访问静态成员\不应该直接使用不确定的值调用equals容易空指针\final static应该使用大写命名并且使用下划线 4 years ago
yuhuangbin ac0712d330 enhance 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 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
王良 fa49d5f03c bugfix: fix compatibility issues with 'seata-all-1.4.0' 4 years ago
冷冷 6540555920 fix EndpointId logWarning 4 years ago
yuhuangbin f284172fbb fix 5 years ago
yuhuangbin 15ffaccc75 enhance 5 years ago
yuhuangbin c5d68bb60f enhance 5 years ago
yuhuangbin b638480cf7 fix test 5 years ago
yuhuangbin 5b0d53388b sentinel NacosDataSourceFactoryBean enhance 5 years ago
yuhuangbin df156d4fa2 fix 5 years ago
yuhuangbin e9a6eaa025 fix 5 years ago
yuhuangbin 702831cb8f fix 5 years ago
mercyblitz 96c3d2e8ad Upgrade the version to be 2.2.2.RELEASE 5 years ago
mercyblitz 35c4eac150 Upgrade the version to be 2.2.2.RELEASE 5 years ago
yuhuangbin b35c05e4fc fix 5 years ago
yuhuangbin f60cb805c8 fix 5 years ago
yuhuangbin fec6c6554c fix 5 years ago
yuhuangbin bd2cd3f394 nacos watch enhance 5 years ago
yuhuangbin cd8464d4a0 Merge branch 'master' into issue#1701 5 years ago
余黄彬 1d3e634117
Merge pull request #1703 from yuhuangbin/master
Adapt to Spring Cloud version Hoxton.SR8
5 years ago
yuhuangbin 5fe709436f Adapt to Spring Cloud version Hoxton.SR8 5 years ago
余黄彬 39b8842da6
Merge pull request #1352 from a364176773/fix_unbind_xid_null
judging xid status to avoid repeated processing
5 years ago
yuhuangbin 56e07c6d2b fix issue#1701 5 years ago
yuhuangbin b81f998f40 fix 5 years ago
yuhuangbin da9a57ddf8 cache onRegister 5 years ago
yuhuangbin 170edfa73e fix 5 years ago
yuhuangbin d96fb26ce4 Merge remote-tracking branch 'origin/master' 5 years ago
yuhuangbin 4c43240bc1 nacos discovery enhance 5 years ago
余黄彬 82aea0011a
Merge branch 'master' into master 5 years ago
mercyblitz a192c17ede Remove spring-cloud-starter-dubbo-gateway 5 years ago
yuhuangbin 307935a5d9 nacos re-register enhance 5 years ago
mercyblitz cea5be4bb6 Remove spring-cloud-starter-dubbo-gateway 5 years ago
mercyblitz 8941c175ed Remove useless dependency 5 years ago
Mercy Ma f9835821af
Merge pull request #1495 from ChunMengLu/master
add NacosRegistrationCustomizer
5 years ago
Mercy Ma a3867d255d
Merge pull request #1686 from yuhuangbin/master
[enhancement] Sidecar health detection optimization
5 years ago
Jim Fang 347e1454b7
Merge pull request #1586 from qixiaobo/patch-2
to avoid k8s readinessProbe remove the pod
5 years ago
yuhuangbin 59b272c005 sidecar enhance 5 years ago
mercyblitz 5cd6c0f1e7 Fix the code style issues 5 years ago
mercyblitz a61f523d78 Merge remote-tracking branch 'upstream/master' 5 years ago
mercyblitz c3173465ea Polish alibaba/spring-cloud-alibaba#1661 : [Feature] Introducing Dubbo Gateway 5 years ago
mercyblitz c419c1ef5d Polish alibaba/spring-cloud-alibaba#1529 : spring-cloud-starter-dubbo消费者订阅服务时No provider available from registry localhost:9090 5 years ago
mercyblitz 9b4975ad2a Polish alibaba/spring-cloud-alibaba#1529 : spring-cloud-starter-dubbo消费者订阅服务时No provider available from registry localhost:9090 5 years ago
yuhuangbin 436e608c84 fix code style 5 years ago