Commit Graph

143 Commits

Author SHA1 Message Date
Administrator
a2965d8ff9 Optimization of code. 2018-11-15 11:15:36 +08:00
Administrator
2c95c8896e Optimization of code. 2018-11-15 11:10:12 +08:00
纳兰丶
5b39fecdb2 Merge pull request #55 from sixh/master
顺序消费
2018-11-14 18:55:08 +08:00
chenbing399@163.com
8882d0720f 1.Formatting coding 2018-11-14 18:50:40 +08:00
chenbing399@163.com
be2cfb7ec8 1.add the disruption tor order consumption. 2018-11-14 18:47:29 +08:00
Administrator
c907e06b08 if try return java bean bug repair. 2018-11-01 18:16:25 +08:00
Administrator
fdb685dde8 if try return java bean bug repair. 2018-11-01 16:11:57 +08:00
Administrator
68c589f77c code optimize commit. 2018-10-26 17:18:53 +08:00
Administrator
0d8645bcf5 Logo commit. 2018-10-22 16:42:33 +08:00
Administrator
ed74de2692 remove preTry log commit. 2018-10-22 15:37:23 +08:00
Administrator
c4313fa193 git ignore commit. 2018-10-22 14:48:06 +08:00
Administrator
8ec14fface Merge branch 'dev' 2018-10-18 11:16:38 +08:00
Administrator
d281fbb0cb some code commit. 2018-10-18 11:13:18 +08:00
Administrator
7985403b3c Merge branch 'dev' 2018-10-18 11:04:26 +08:00
Administrator
dc38d11463 some code commit. 2018-10-18 11:03:06 +08:00
纳兰丶
098d8bfea9 Merge pull request #47 from xqxyxchy/dev
本地线程数据清除不完整
2018-10-16 15:53:34 +08:00
xqxyxchy
ed43e7d125 本地线程数据清除不完整 2018-10-16 15:41:36 +08:00
Administrator
cf8225155a demo code optimize 2018-10-12 16:27:35 +08:00
Administrator
27132337ce commit readme. 2018-09-30 11:52:31 +08:00
Administrator
d5f025ca88 some bug commit 2018-09-27 14:33:43 +08:00
Administrator
1845d8e87a bug commit 2018-09-27 14:31:13 +08:00
Administrator
bc5afb091f Merge branch '1.2.1-RELEASE' into dev
# Conflicts:
#	hmily-tcc-admin/pom.xml
#	hmily-tcc-annotation/pom.xml
#	hmily-tcc-common/pom.xml
#	hmily-tcc-core/pom.xml
#	hmily-tcc-demo/hmily-tcc-demo-dubbo/hmily-tcc-demo-dubbo-account-api/pom.xml
#	hmily-tcc-demo/hmily-tcc-demo-dubbo/hmily-tcc-demo-dubbo-account/pom.xml
#	hmily-tcc-demo/hmily-tcc-demo-dubbo/hmily-tcc-demo-dubbo-inventory-api/pom.xml
#	hmily-tcc-demo/hmily-tcc-demo-dubbo/hmily-tcc-demo-dubbo-inventory/pom.xml
#	hmily-tcc-demo/hmily-tcc-demo-dubbo/hmily-tcc-demo-dubbo-order/pom.xml
#	hmily-tcc-demo/hmily-tcc-demo-dubbo/pom.xml
#	hmily-tcc-demo/hmily-tcc-demo-springcloud/hmily-tcc-demo-springcloud-account/pom.xml
#	hmily-tcc-demo/hmily-tcc-demo-springcloud/hmily-tcc-demo-springcloud-eureka/pom.xml
#	hmily-tcc-demo/hmily-tcc-demo-springcloud/hmily-tcc-demo-springcloud-inventory/pom.xml
#	hmily-tcc-demo/hmily-tcc-demo-springcloud/hmily-tcc-demo-springcloud-order/pom.xml
#	hmily-tcc-demo/hmily-tcc-demo-springcloud/pom.xml
#	hmily-tcc-demo/pom.xml
#	hmily-tcc-dubbo/pom.xml
#	hmily-tcc-motan/pom.xml
#	hmily-tcc-spring-boot-starter/hmily-tcc-spring-boot-starter-dubbo/pom.xml
#	hmily-tcc-spring-boot-starter/hmily-tcc-spring-boot-starter-motan/pom.xml
#	hmily-tcc-spring-boot-starter/hmily-tcc-spring-boot-starter-parent/pom.xml
#	hmily-tcc-spring-boot-starter/hmily-tcc-spring-boot-starter-springcloud/pom.xml
#	hmily-tcc-spring-boot-starter/pom.xml
#	hmily-tcc-springcloud/pom.xml
#	pom.xml
2018-09-27 13:24:04 +08:00
Administrator
cbf81edb32 1.2.2 2018-09-27 13:22:39 +08:00
Administrator
778e3ef2ca spring cloud commit 2018-09-27 13:17:45 +08:00
Administrator
da8ddaa9fc 1.2.1 RELEASE 2018-09-25 16:47:08 +08:00
Administrator
9077faf3fa sync commit and inline support. 2018-09-20 20:12:15 +08:00
Administrator
56d5735a35 sync commit and inline support. 2018-09-20 18:50:05 +08:00
Administrator
a0c949e0a8 Merge branch 'master' into dev 2018-08-31 17:08:40 +08:00
纳兰丶
a48260d775 Merge pull request #37 from jilonghun/param-type
dubbo接口定义成泛型时,参数类型拿不到问题:
2018-08-31 17:07:51 +08:00
jiys
5ee6d2afb7 dubbo接口定义成泛型时,参数类型拿不到问题:
https://github.com/yu199195/hmily/issues/36
2018-08-30 11:43:58 +08:00
Administrator
1a568fa740 remove some log 2018-08-24 15:55:04 +08:00
Administrator
d93cdfa924 bug 2018-08-23 14:44:34 +08:00
Administrator
070182c7d1 disruptor remove 2018-08-22 17:56:41 +08:00
Administrator
4ed3e66dde redis commit 2018-08-20 10:56:32 +08:00
Administrator
e43263c5bc disruptor bug commit 2018-08-17 18:22:18 +08:00
Administrator
07bba49bb1 disruptor sort commit 2018-08-16 18:44:57 +08:00
Administrator
7f8da7f3d4 disruptor sort commit 2018-08-16 18:41:48 +08:00
Administrator
68949efcb2 apache LICENSE-2.0 2018-07-31 14:21:44 +08:00
Administrator
428c46de24 Merge branch 'dev' of https://github.com/yu199195/hmily into dev 2018-07-31 12:11:51 +08:00
Administrator
e5cb6d763b code optimize 2018-07-31 12:11:08 +08:00
纳兰丶
b09cfbc40a Merge pull request #31 from kissss/fix-bug-#30
fixbug: fix incompatibility caused by upgrading spring boot2.0
2018-07-28 11:08:59 +08:00
xiaolei
ac4a6bfdb7 fixbug: fix incompatibility caused by upgrading spring boot2.0 2018-07-28 11:04:50 +08:00
Administrator
63e183f912 update code optimize 2018-07-23 10:05:39 +08:00
Administrator
fb7aa610f7 Merge branch 'master' into dev 2018-07-23 10:01:48 +08:00
纳兰丶
49549e4e2e Merge pull request #27 from idefav/master
修改commit超时的情况下,后台任务提交报错
2018-07-23 09:56:55 +08:00
纳兰丶
2e79f4a63e Merge pull request #28 from kissss/remove-lock
refactor: demo apply to cluster environment, remove reentrantLock
2018-07-23 09:56:21 +08:00
xiaolei
b1d2dad0b7 refactor: remove participant reentrantlock . improve processing power in high concurrency situations 2018-07-23 01:05:58 +08:00
xiaolei
e3ecaa16a5 refactor: demo apply to cluster environment, remove reentrantLock 2018-07-23 00:44:35 +08:00
idefav
f1c60762c5 修改demo bug 2018-07-20 20:01:20 +08:00
idefav
2b61d59129 修改bug 2018-07-20 19:10:20 +08:00