Commit Graph

1821 Commits (ec75c32f61b9b2ba591312fd8e8955057da14ed3)
 

Author SHA1 Message Date
mercyblitz 52ce4b53a7 Merge remote-tracking branch 'upstream/master' 5 years ago
slievrly f36c94d3ed fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly fbd72a6000 fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly 4ac2622753 fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly c644a2c1ec fix ci
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly c216cad31c fix properties
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
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
5 years ago
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>
5 years ago
yuhuangbin 1368a1aa84 Change the class type of nameServer 5 years ago
format aba89ed5ba
Merge pull request #1100 from pigxcloud/master
replace code properties that have expired
5 years ago
format c3d76b391f
Merge pull request #1115 from echooymxq/performance_#1090
Use 'proxyBeanMethods = false' where possible.
5 years ago
fangjian0423 a27d0e2c71 optimize dubbo dependency and code style 5 years ago
zkzlx 85ddda03ff [issue #982 & issue #978]enhance nacos config 5 years ago
fangjian0423 54d97a37b4 optimize pom 5 years ago
mercyblitz 0def289574 Merge remote-tracking branch 'upstream/master' 5 years ago
Mercy Ma 1d99e35977
Merge pull request #1124 from yuhuangbin/nacos-branch
support more config for Nacos
5 years ago
Mercy Ma 1afc7cbbc1
Merge pull request #1098 from slievrly/cglib
bugfix: SeataBeanPostProcessor can't use cglib proxy
5 years ago
yuhuangbin 792d008863 Support more config for Nacos 5 years ago
yuhuangbin 829dc23550
Merge pull request #2 from alibaba/master
update
5 years ago
Mercy Ma 3f8e6d69bf
Merge pull request #1104 from yuhuangbin/seata-feign
Support seata feign loadbalancer
5 years ago
Mercy Ma b1c0c1aa12
Merge pull request #1094 from yuhuangbin/issue#980
Add default values for some configuration items
5 years ago
mercyblitz 53570e64bd Merge remote-tracking branch 'upstream/master' 5 years ago
format 7d60c28a3a
Merge pull request #1116 from 631359746/master
correct the log
5 years ago
631359746 80300b9a90
Merge pull request #1 from 631359746/631359746-patch-sentinel-log
Update SentinelSCGAutoConfiguration.java
5 years ago
631359746 0519e551ff
Update SentinelSCGAutoConfiguration.java
correct the log print wrong content
5 years ago
echooymxq b86503c0ad Use 'proxyBeanMethods = false' where possible. 5 years ago
LiuJunJie f04a4b1fb0 reformate imports 5 years ago
LiuJunJie 2574c2217b reformate code 5 years ago
LiuJunJie f34641871a add unit test to test get server from local properties and from nacos discovery. 5 years ago
yuhuangbin d79207c64b Support seata feign loadbalancer 5 years ago
format c765fc088d
Merge pull request #1095 from yuhuangbin/issue#1091
Add property to disable Sentinel auto-configuration
5 years ago
yuhuangbin 224ef57307 Add default values for some configuration items 5 years ago
yuhuangbin 1e26df1aa1 Add property to disable Sentinel auto-configuration 5 years ago
冷冷 ffb246829f replace code properties that have expired 5 years ago
slievrly bd77f3f919 bugfix: SeataBeanPostProcessor can't use cglib proxy
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
yuhuangbin 71f8dc0037
Merge pull request #1 from alibaba/master
update
5 years ago
format cc053a520a
Merge pull request #1080 from luhggit/fix#1156
Fixes #1156, handle the scenario where the registed bean name is null
5 years ago
fangjian0423 ddc5f57caf Merge remote-tracking branch 'upstream/master' 5 years ago
fangjian0423 cef87972d7 do some refactor 5 years ago
luhg 3c88e92262 :Merge branch 'master' into fix#1156 5 years ago
format 4c3a28ebd5
Merge pull request #1070 from qixiaobo/patch-1
add some warnings for classpath file datasource
5 years ago
qixiaobo cfa1b20799 Merge remote-tracking branch 'upstream/master' into patch-1 5 years ago
fangjian0423 e4a4e7f288 update pom to adapt Hoxton version 5 years ago
luhggit 859753976b Fixes #1156, handle the scenario where the registed bean name is null 5 years ago
祁晓波 460daaf1d8
Update readme.md 5 years ago
祁晓波 ed598ba427
add some warnings for classpath file datasource
You could use absolute path when you use File datasource & fat jar.
5 years ago
format 34308b0a49
Merge pull request #1050 from chuntaojun/master
The problem of high repair nacos CPU
5 years ago
chuntaojun 935f50f9ab fix(nacos): Repair to create a large number of Nacos*Service problems 5 years ago
chuntaojun 492b8d3b20 refactor(nacos): Roll back to the original solution to solve the problem of compatibility 5 years ago
format 414f8dbf3d
Merge pull request #1029 from zhaoyunxing92/master
[fix]设置在web环境下才注入拦截器
5 years ago