Commit Graph

557 Commits (c64dcd1301b764b6fc20d53c9d4d47b8cc4f4f92)

Author SHA1 Message Date
fangjian0423 1cd4efdd1f Merge remote-tracking branch 'upstream/master'
flystar32 97a77d5c2b change version from 0.2.2.BUILD-SNAPSHOT to 2.1.0.BUILD-SNAPSHOT
flystar32 655f752e12 format code
fangjian0423 080ad2df1e fix bug about feign and update examples
fangjian0423 ec98a2db01 code format
fangjian0423 5995687dd5 update sentinel examples
fangjian0423 48dc322407 add spring-cloud-alibaba-dubbo to bom and remove useless example
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
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
Xiaolong Zuo b8910ac908
Merge pull request from fangjian0423/master
add 'HTTPMethod:' prefix for the resource of using @SentinelRestTemplate
fangjian0423 1eef8f688f add 'HTTPMethod:' prefix for the resource of using @SentinelRestTemplate
Jlcao cef321c4fb
Wrong character changes
Wrong character changes. ‘流量器’==> '浏览器‘
Xiaolong Zuo 09e90a1e67
Merge pull request from fangjian0423/master
Fix bug 4 spring-cloud-starter-bus-rocketmq
fangjian0423 69f6ad9128 update bus example
jimin.jm 668f99cd56 fix update Fescar-Sample readme,unique index instead of normal index
fangjian0423 1b9cbf7396 update bus example
Xiaolong Zuo 49baeff6e9
Merge pull request from fangjian0423/binder-dev
RocketMQ Binder integrates RocketMQ Spring
fangjian0423 53c4a6adf6 refactor & upgrade rocketmq-client version
fangjian0423 474132db42 Merge remote-tracking branch 'upstream/master' into binder-dev
jimin.jm b2e4ba2620 fix when fescar upgrade 0.2.0+ configuration file changed
Mercy Ma 9c5d9229e5
Merge pull request from mercyblitz/master
Polish :  : Register t…
mercyblitz 10f06bec1e Polish : : Register the Dubbo REST services as Spring Cloud services in non-web environment
Mercy Ma 7c3222f235
Merge pull request from mercyblitz/master
Add DubboRegistryServiceIdHandler Bean to customize Service Id
mercyblitz e48863640a Polish : : Refactor
Mercy Ma c6a31dac63
Merge pull request from mercyblitz/master
Use Apache Dubbo 2.7.x as Spring Cloud Infrastructure 
Xiaolong Zuo 45c4c5baf5
Merge pull request from fangjian0423/master
Update docs & add spring cloud gateway bom
flystar32 b50cd9266f update nacos and fescar version and format some testcase
mercyblitz 514fef53f5 Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#377 : Resolve version issue
mercyblitz fa1aa272b1 Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#377 : Use Apache Dubbo 2.7.x as Spring Cloud Infrastructure
fangjian0423 501d08d1e5 add spring cloud gateway bom
fangjian0423 0e4de15632 update sms example
fangjian0423 9934f5bc60 resolve conflict
xiaojing dbfc363c02
Merge pull request from yunzheng1228/master
format code and fixed example's bug
yunzheng1228 df8f703460 Fixed nacos-example's bug, Change the attribute value of spring.application.name from 'sca-nacos-config' to 'nacos-config-example'
fangjian0423 7cc3b02917 update rocketmq examples
fangjian0423 509d4819b3 Merge remote-tracking branch 'upstream/master' into binder-dev
format 986e529043
Merge pull request from mostcool/master
optimized spring-cloud-alicloud-sms pom.xml
gaokai ef00e96b5c 包含sms-example模块
mercyblitz f98b74ad45 Merge remote-tracking branch 'upstream/master'
mercyblitz f719e16d38 Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : Supports all Spring Cloud Registries and default is Nacos
mercyblitz ab1ecca6ab Polish : /spring-cloud-incubator/spring-cloud-alibaba#387 : Dubbo Spring Cloud Samples
xiaojing cac7574396
Merge pull request from Harris2012/patch-1
use EnableDiscoveryClient
mercyblitz 21f3451f7b Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#387 : Add Dubbo Spring Cloud Samples
mercyblitz b3c26c509e Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : supports Spring Cloud Netflix Eureka and Spring Cloud Zookeeper
xiaolongzuo 844d17b9f6 Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
fangjian0423 84bb53f706 Merge remote-tracking branch 'upstream/master' into binder-dev
format 03f8defb09
Merge pull request from zhendong590/master
aggregate multi report
fangjian0423 e537eb55de resolve conflict
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
xiaolongzuo fa5b57f3db Polish test cases for schedulerx
fangjian0423 ac11a3a752 refactor sms module
Harris Zhang 10206af82b
use EnableDiscoveryClient
pbting 92519a7a09
Merge branch 'master' into master
gaoyunpeng 2db3677f20 fix remove superfluous settings in fescar example
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
pbting 95060a19b1
Update pom.xml
remove alicloud context maven dependency
pbting c8f1697c3d
Update pom.xml
remove alicloud context
得少 f777bc3006 remove alicloud context dependency
format 9b84df9015
Merge pull request from pbting/master
nacos discovery starter support connect to aliyun with master branch
mercyblitz fc8d8e3628 Polish : @DubboTransported supports RestTemplate (part 1)
gaoyunpeng 394485a12d replace cobertura to jacoco
得少 997faff710 add nacos discovery starter support to connect to aliyun
pbting 90a7769180
Merge pull request from spring-cloud-incubator/master
Synchronize code once
fangjian0423 9f797f586e update rocketmq binder demo
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
flystar32 450f1e8269 modify example to verify .
xiaojing 04908741bb
Update readme-zh.md
flystar32 30b6456558 resolve conflict
flystar32 a6a894a110 add module Fescar, Polish
Xiaolong Zuo e541aef538
Merge pull request from fangjian0423/master
Add test case for sentinel datasource module
mercyblitz 744e33229a 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
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
mercyblitz 054e95dd45 Revert nacos-discovery-consumer-example
冷冷 fc72c76a9d fix
冷冷 aae2c1676b fix add example. how to use spring cloud gateway with nacos
mercyblitz 26a05cbefb Temporary commit
fangjian0423 3ab6b1dc63 update nacos example & using final replace of protected in field
chenzhu.zxl 2de5362f4d Fix SchedulerX cycle ref error.
pbting de394f352c add nacos config unit test
pbting ada963c330
Update readme-zh.md
pbting a56df0a0f0
Update readme-zh.md
pbting 2fb9b52f1d
Merge pull request from zhendong590/master
update cobertura settings for reduce build time
gaoyunpeng 20eb325e59 update cobertura settings for reduce build time
pbting 0571a9ad60 add readme for example
小马哥 7aa17d3760 Temporary commit
mercyblitz 571d0eca15 Polish
得少 a4f8cc7d28 add spring enviroment extension module for examples
得少 ee2c696bdf ans starter suport eureka/consule registry and add sms module
fangjian0423 0e75da3b8d add ruleType property for AbstractDataSourceProperties and fixes
Spencer Gibb 612e6913e6
Update to 0.2.2.BUILD-SNAPSHOT
Spencer Gibb b28e82dc3c
Update SNAPSHOT to 0.2.1.RELEASE
fangjian0423 89178bc913 update docs
fangjian0423 d204a54b76 Optimize Sentinel RestTemplate url resource
chenzhu.zxl f1bd3fd2c2 Add SchedulerX modules.
chenzhu.zxl 9708503b8e Delete SchedulerX modules.
Xiaolong Zuo 6a536063cf
Merge pull request from xiaolongzuo/master
closes , fixes .
xiaolongzuo 1fc98ebe7c closes , fixes . Add spring-cloud-alicloud-schedulerX module, and fix ACM starter rely on actuator.
fangjian0423 7d3a1b9adf add transaction message in rocketmq example
flystar32 b389112c6b update example configuration
fangjian0423 f40381fc6c update docs
fangjian0423 0af67df3e3 using sentinel feign in nacos discovery example
fangjian0423 53643b94ce fixes
fangjian0423 25aecfe1ad update docs
fangjian0423 baea051027 update rocketmq example
fangjian0423 7d039f4742 make metrics-core as provided dependency and refactor
format 47b1f05e86
Merge pull request from mercyblitz/master
[Feature] Add Spring Cloud Bus module for Apache RocketMQ
mercyblitz 6e175b35d5 Fix bugs on example
mercyblitz b75b19b58c Polish Spring Cloud Bus
fangjian0423 9e9ca72c88 update rocketmq example
fangjian0423 f79fdba50b update sentinel docs
fangjian0423 bfae54b51e using eclipse code formatter to format code
fangjian0423 3a4baa156a add rocketmq example
fangjian0423 4539ed7183 update sentinel example and add sentinel reference doc
xiaolongzuo f2e83f020d Add ANS and ACM readme doc.
xiaolongzuo 537c434d11 Fix build error。
Spencer Gibb 6e355cc807
Update to 0.2.1.BUILD-SNAPSHOT
Spencer Gibb d2fd77c274
Update SNAPSHOT to 0.2.0.RELEASE
flystar32 5873ac3c1a update example configuration
flystar32 e6c7c823d6 update ans pom.xml
flystar32 a60402beaf update readme of nacos config example
flystar32 3acfc67d6a put all nacos config metadata to bootstrap
flystar32 bf7aec2fbc do some housekeeping
Xiaolong Zuo 5cf6d56393
Delete OSSController.java
Xiaolong Zuo 6779cab2b8
Delete OSSApplication.java
chenzhu.zxl 2f8f0bb28b rename OssApplication and OssController.
chenzhu.zxl 7126a8ce33 closes , closes , closes , closes .
fangjian0423 ff2c390673 Merge remote-tracking branch 'upstream/master'
fangjian0423 1d15cdaee5 Polish . Add a new module spring-cloud-alibaba-sentinel-datasource separate from spring-cloud-alibaba-sentinel.
Spencer Gibb ece4531833
Updates to snapshot versions
fangjian0423 1ce28f00f3 converter property fix
fangjian0423 568da97adf Fixes add rules automation
fangjian0423 4829157c09 update comments and docs
flystar32 7fdd8fa3e2 update sentinel version to 0.2.0
flystar32 52a0c6f9de update version to 0.2.0
fangjian0423 8702fe00ae refactor storage module: rename storage to oss
fangjian0423 7c1699dcd8 update sentinel examples and metadata info to support new configurations of sentinel
flystar32 b0011bf328 rename alibaba storage to alicloud storage
flystar32 e42225fbcc update nacos config properties , content-type to file-extension
flystar32 b4ec84c078 update example readme nacos port to 8848
flystar32 e4d9f98313 update nacos version to 0.2.1-RC and format code
flystar32 bd814e8697 Fixes
fangjian0423 24425830e3 refactor sentinel example directory tree
flystar32 d5e7c82fda add discovery client getInstance in nacos-discovery-example
flystar32 83aa947fc9 fix pom.xml parent relativePath
flystar32 c540f6f197 fix endpoint readme
flystar32 a589af30e1 add discovery example
flystar32 fb9c678ba1 update pic address
flystar32 43d47ae71f add module nacos-config and nacos-discovery
Eric Zhao 15ed84acbe Update document for Sentinel examples
Signed-off-by: Eric Zhao <sczyh16@gmail.com>
flystar32 afb50fa76e add relativePath for pom.xml
flystar32 ccc34d2faf refactor directory tree
fangjian0423 31864b34d4 add storage example
fangjian0423 6598768195 refactor dubbo examples & add datasource feature in example & update docs
fangjian0423 3769b15abd add dubbo demo in sentinel example
fangjian0423 1a0bfc23cd update sentinel example
flystar32 c4cbbf41e2 fix typo
flystar32 0ce2df89ab hello, spring cloud alibaba