study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity
1,336 Commits 11 Branches 30 Tags
Commit Graph

305 Commits

Author SHA1 Message Date
Jim Fang
5f8d8cc043
Merge pull request #1154 from slievrly/springboot 
adapter: use seata-spring-boot-starter's autoConfiguration instead of spring-cloud-alibaba-seata-starter's autoConfiguration
 2020-01-15 17:52:43 +08:00
fangjian0423
9a5518d302 update nacos config example 2020-01-15 15:30:41 +08:00
Jim Fang
f789803cac
Merge pull request #1171 from yuhuangbin/sentinel-enhance 
[Upgrade] Upgrade Sentinel and Enhance
 2020-01-14 17:00:57 +08:00
fangjian0423
00d449ba23 pass code check 2020-01-14 16:54:01 +08:00
slievrly
d040d6a3b7 throw exception 
Signed-off-by: slievrly <slievrly@163.com>
 2020-01-14 15:32:40 +08:00
fangjian0423
ddceb5f312 add spring cloud sentinel circuitbreaker demo 2020-01-14 15:06:26 +08:00
yuhuangbin
b0273fb1c8 upgrade sentinel version and enhance 2020-01-14 13:02:32 +08:00
fangjian0423
b70129c17f add reactive discovery example 2020-01-13 20:14:23 +08:00
fangjian0423
a9e519265a add s-c-loadbalancer example 2020-01-13 11:28:23 +08:00
Jim Fang
2a18ddb0be
Merge pull request #1136 from zkzlx/config-eh 
[issue #982 & issue #978]enhance nacos config
 2020-01-07 15:58:29 +08:00
slievrly
f36c94d3ed fix checkstyle 
Signed-off-by: slievrly <slievrly@163.com>
 2020-01-01 14:29:54 +08:00
slievrly
fbd72a6000 fix checkstyle 
Signed-off-by: slievrly <slievrly@163.com>
 2020-01-01 12:41:28 +08:00
slievrly
4ac2622753 fix checkstyle 
Signed-off-by: slievrly <slievrly@163.com>
 2020-01-01 12:39:49 +08:00
slievrly
c644a2c1ec fix ci 
Signed-off-by: slievrly <slievrly@163.com>
 2020-01-01 11:28:30 +08:00
slievrly
c216cad31c fix properties 
Signed-off-by: slievrly <slievrly@163.com>
 2020-01-01 11:07:03 +08:00
slievrly
7b79b6a11b Merge remote-tracking branch 'upstream/master' into springboot 
Signed-off-by: slievrly <slievrly@163.com>

# Conflicts:
#	spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java
 2019-12-31 18:45:14 +08:00
slievrly
34d8267068 adapter: use seata-spring-boot-starter's autoConfiguration instead of spring-cloud-alibaba-seata-starter's autoConfiguration 
Signed-off-by: slievrly <slievrly@163.com>
 2019-12-31 18:40:14 +08:00
format
aba89ed5ba
Merge pull request #1100 from pigxcloud/master 
replace code properties that have expired
 2019-12-30 11:19:44 +08:00
fangjian0423
a27d0e2c71 optimize dubbo dependency and code style 2019-12-29 02:05:23 +08:00
zkzlx
85ddda03ff [issue #982 & issue #978]enhance nacos config 2019-12-18 15:16:42 +08:00
冷冷
ffb246829f replace code properties that have expired 2019-12-03 22:17:49 +08:00
qixiaobo
cfa1b20799 Merge remote-tracking branch 'upstream/master' into patch-1 2019-11-29 14:21:50 +08:00
fangjian0423
e4a4e7f288 update pom to adapt Hoxton version 2019-11-29 11:00:39 +08:00
祁晓波
460daaf1d8
Update readme.md 2019-11-22 17:58:45 +08:00
祁晓波
ed598ba427
add some warnings for classpath file datasource 
You could use absolute path when you use File datasource & fat jar.
 2019-11-22 17:49:26 +08:00
chuntaojun
935f50f9ab fix(nacos): Repair to create a large number of Nacos*Service problems 2019-11-06 21:26:55 +08:00
chuntaojun
492b8d3b20 refactor(nacos): Roll back to the original solution to solve the problem of compatibility 2019-11-06 21:12:26 +08:00
zkzlx
217296ba02 Dependency error 2019-10-28 17:51:18 +08:00
fangjian0423
de9b1be4be pass checkstyle plugin 2019-10-28 16:15:18 +08:00
format
9b32b41d05
Merge pull request #1001 from echooymxq/master 
Optimize example module name
 2019-10-18 15:19:51 +08:00
echooymxq
1bc20774c5 Optimize example module name 2019-10-18 09:51:03 +08:00
slievrly
6a90e643e6 update seata version and sample 
Signed-off-by: slievrly <slievrly@163.com>
 2019-10-17 17:13:57 +08:00
fangjian0423
576de3a218 update dubbo version on examples 2019-09-30 10:41:58 +08:00
fangjian0423
2435167e1e format code with maven plugins 2019-09-26 17:15:43 +08:00
format
df3d9ce0e8
Merge pull request #941 from eacdy/master 
Add module Spring Cloud Alibaba Sidecar
 2019-09-25 15:38:34 +08:00
itmuch
670967a41c add module Spring Cloud Alibaba Sidecar 2019-09-17 15:45:56 +08:00
format
7c452f6f7f
Merge pull request #920 from chuntaojun/fix_issue_859 
fix(nacos): fix issue #859
 2019-09-17 14:14:05 +08:00
format
179eab2b7e
Merge pull request #900 from lichen782/master 
Support OssStorage Resource as WritableResource and add related unittest cases
 2019-09-17 10:11:54 +08:00
chuntaojun
f0f86868b2 fix(nacos): fix issue #859 2019-09-12 22:01:37 +08:00
chuntaojun
5162d02b4e fix(nacos): fix issue #859 2019-09-12 20:20:02 +08:00
fangjian0423
75f02aa2c5 some compatibility modifications about Hoxton 2019-09-11 14:39:17 +08:00
lichen782
572b13a0b3 Refactor the OssController upload2 to use try with clause 2019-09-10 14:55:51 +08:00
fangjian0423
0890e02db9 upgrade to Spring Cloud Hoxton 2019-09-06 18:34:07 +08:00
fangjian0423
e8ee68998e upgrade to Spring Cloud Hoxton, close #917 2019-09-06 16:33:11 +08:00
chuntaojun
d2684c2882 fix(nacos): fix issue #859 2019-09-06 16:03:41 +08:00
chuntaojun
e4d85b6c7e style(nacos): Standard code style. 2019-09-05 11:13:59 +08:00
chuntaojun
d1b64df9d2 refactor(nacos): Modify nacos service caching mechanism 2019-09-04 15:12:41 +08:00
format
8e1468d97c
Merge pull request #884 from zhaoyuguang/zhaoyuguang/dev4 
remove unused import statement
 2019-09-02 19:44:38 +08:00
format
5b07a560be
Merge pull request #876 from zhaoyuguang/zhaoyuguang/dev_3 
Use Spring advanced API make design more clearer
 2019-09-02 19:43:36 +08:00
lichen782
9edab1215b Support OssStorage Resource as WritableResource and add related 
unittest cases
 2019-09-02 15:20:49 +08:00