1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00

1313 Commits

Author SHA1 Message Date
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
zkzlx
c348421970 [issue #982 & issue #978]enhance nacos config - code review 2020-01-07 12:52:08 +08:00
Jim Fang
d28a36d149
Merge pull request #1112 from JunRzz/master
Suport Ribbon ConfigurationBasedServerList
2020-01-06 17:50:36 +08:00
format
d675d7d47f
Merge pull request #1149 from yuhuangbin/RocketMq-properties
Change the class type of RocketMQ nameServer
2020-01-06 10:46:45 +08:00
yuhuangbin
fed46416be fix 2020-01-05 13:21:21 +08:00
yuhuangbin
1368a1aa84 Change the class type of nameServer 2019-12-30 15:42:34 +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
format
c3d76b391f
Merge pull request #1115 from echooymxq/performance_#1090
Use 'proxyBeanMethods = false' where possible.
2019-12-30 11:18:00 +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
fangjian0423
54d97a37b4 optimize pom 2019-12-17 11:00:34 +08:00
Mercy Ma
1d99e35977
Merge pull request #1124 from yuhuangbin/nacos-branch
support more config for Nacos
2019-12-11 16:20:48 +08:00
Mercy Ma
1afc7cbbc1
Merge pull request #1098 from slievrly/cglib
bugfix: SeataBeanPostProcessor can't use cglib proxy
2019-12-11 16:19:36 +08:00
yuhuangbin
792d008863 Support more config for Nacos 2019-12-11 14:17:08 +08:00
yuhuangbin
829dc23550
Merge pull request #2 from alibaba/master
update
2019-12-11 11:27:24 +08:00
Mercy Ma
3f8e6d69bf
Merge pull request #1104 from yuhuangbin/seata-feign
Support seata feign loadbalancer
2019-12-11 11:11:25 +08:00
Mercy Ma
b1c0c1aa12
Merge pull request #1094 from yuhuangbin/issue#980
Add default values for some configuration items
2019-12-11 11:01:48 +08:00
format
7d60c28a3a
Merge pull request #1116 from 631359746/master
correct the log
2019-12-08 13:48:06 +08:00
631359746
80300b9a90
Merge pull request #1 from 631359746/631359746-patch-sentinel-log
Update SentinelSCGAutoConfiguration.java
2019-12-06 15:21:52 +08:00
631359746
0519e551ff
Update SentinelSCGAutoConfiguration.java
correct the log print wrong content
2019-12-06 11:31:57 +08:00
echooymxq
b86503c0ad Use 'proxyBeanMethods = false' where possible. 2019-12-05 22:29:29 +08:00
LiuJunJie
f04a4b1fb0 reformate imports 2019-12-05 14:18:12 +08:00
LiuJunJie
2574c2217b reformate code 2019-12-05 14:10:11 +08:00
LiuJunJie
f34641871a add unit test to test get server from local properties and from nacos discovery. 2019-12-05 12:21:05 +08:00
yuhuangbin
d79207c64b Support seata feign loadbalancer 2019-12-04 17:01:40 +08:00
format
c765fc088d
Merge pull request #1095 from yuhuangbin/issue#1091
Add property to disable Sentinel auto-configuration
2019-12-04 14:41:27 +08:00
yuhuangbin
224ef57307 Add default values for some configuration items 2019-12-03 23:12:52 +08:00
yuhuangbin
1e26df1aa1 Add property to disable Sentinel auto-configuration 2019-12-03 23:08:27 +08:00
冷冷
ffb246829f replace code properties that have expired 2019-12-03 22:17:49 +08:00
slievrly
bd77f3f919 bugfix: SeataBeanPostProcessor can't use cglib proxy
Signed-off-by: slievrly <slievrly@163.com>
2019-12-03 14:16:49 +08:00
yuhuangbin
71f8dc0037
Merge pull request #1 from alibaba/master
update
2019-12-02 18:39:39 +08:00
format
cc053a520a
Merge pull request #1080 from luhggit/fix#1156
Fixes #1156, handle the scenario where the registed bean name is null
2019-12-01 17:16:23 +08:00
fangjian0423
ddc5f57caf Merge remote-tracking branch 'upstream/master' 2019-12-01 17:13:38 +08:00
fangjian0423
cef87972d7 do some refactor 2019-12-01 17:13:21 +08:00
luhg
3c88e92262 :Merge branch 'master' into fix#1156 2019-11-30 08:53:23 +08:00
format
4c3a28ebd5
Merge pull request #1070 from qixiaobo/patch-1
add some warnings for classpath file datasource
2019-11-29 14:38:58 +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
luhggit
859753976b Fixes #1156, handle the scenario where the registed bean name is null 2019-11-27 18:29:27 +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
format
34308b0a49
Merge pull request #1050 from chuntaojun/master
The problem of high repair nacos CPU
2019-11-07 10:22:52 +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
format
414f8dbf3d
Merge pull request #1029 from zhaoyunxing92/master
[fix]设置在web环境下才注入拦截器
2019-11-06 17:00:42 +08:00
zhaoyunxing92
62ad5de3e2 [reset] 2019-11-06 16:16:30 +08:00
format
ad143f16e6
Merge pull request #1044 from tyq0010/fix-#1043
Dubbo Spring Cloud support Nacos Discovery Group
2019-11-06 10:24:45 +08:00
tyq0010
b2825b275f
Update DubboServiceDiscoveryAutoConfiguration.java
fix (DubboServiceDiscoveryAutoConfiguration does not set the group when subscribing to service #1043)
2019-11-05 21:31:39 +08:00
format
b64337f00c
Merge pull request #1038 from HaojunRen/master
Update README-zh.md
2019-11-04 18:03:09 +08:00
Neptune
e01a781e10
Update README-zh.md 2019-11-04 13:42:02 +08:00