Commit Graph

22 Commits (1f9d8bf416088d597f3320ff9b0ebcea57a1e19f)

Author SHA1 Message Date
flystar32 e3dafddeda update nacos version to 1.0.0-RC3 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
fangjian0423 0e8933e1f8 update sentinel docs & refactor 6 years ago
gaoyunpeng 87bfb3734a ignore failure testcase 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
fangjian0423 fd6d3a7717 remove sentinel commercialization logic & optimize NacosDataSource 6 years ago
mercyblitz 59a969049d Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	pom.xml
#	spring-cloud-alibaba-dependencies/pom.xml
#	spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
6 years ago
fangjian0423 6a758dd42f add sentinel datasource test case 6 years ago
fangjian0423 3ab6b1dc63 update nacos example & using final replace of protected in field 6 years ago
fangjian0423 b39fb80a53 upgrade sentinel version to 1.4.1 and remove NacosDataSourceWithAuthorization 6 years ago
fangjian0423 40f6290184 code format 6 years ago
fangjian0423 1db45e85c4 add jsr 303 validation for SentinelProperties 6 years ago
fangjian0423 6806cd77ac using Enum replace of String 6 years ago
fangjian0423 0e75da3b8d add ruleType property for AbstractDataSourceProperties and fixes #206 6 years ago
fangjian0423 8af824dc2f sentinel commercialization feature 6 years ago
fangjian0423 bf40e5261d refactor sentinel datasource and support commercialized 6 years ago
fangjian0423 564acbb2a8 upgrade sentinel version to 1.4.0 6 years ago
fangjian0423 cd6f79b16b Polish #115 6 years ago
fangjian0423 80ecc84d54 fixes #116 6 years ago
fangjian0423 3c33b234c8 fixes #91 6 years ago
fangjian0423 1d44d73eba sentinel add logs to query datasource process. 6 years ago
fangjian0423 1d15cdaee5 Polish #51. Add a new module spring-cloud-alibaba-sentinel-datasource separate from spring-cloud-alibaba-sentinel. 6 years ago