Fury Zhu
|
819d5d1db5
|
Merge pull request #1404 from slievrly/charset
optimize charset、continue and return
|
2019-07-01 13:12:03 +08:00 |
|
Fury Zhu
|
fe950dccc2
|
Merge pull request #1401 from slievrly/develop
optimize array and negated codestyle
|
2019-06-30 22:47:46 +08:00 |
|
Fury Zhu
|
268d1d4ea9
|
Merge pull request #1443 from iHelin/develop
[ISSUE #1442] Fix JSONUtils#deserializeObject method.
|
2019-06-30 22:41:13 +08:00 |
|
nkorange
|
3a8575e22f
|
Update version to 1.0.2-SNAPSHOT
|
2019-06-28 17:34:59 +08:00 |
|
nkorange
|
4605733595
|
Update version to 1.0.2
|
2019-06-28 17:18:59 +08:00 |
|
iHelin
|
368b355fca
|
Modify JSONUtils's deserializeObject method.
|
2019-06-28 15:23:06 +08:00 |
|
Fury Zhu
|
7ec7f525fd
|
Merge branch 'develop' into develop
|
2019-06-28 12:53:19 +08:00 |
|
Fury Zhu
|
6312a32c1d
|
Merge pull request #1434 from IanCao/develop
Format Code and remove useless code
|
2019-06-28 12:41:29 +08:00 |
|
caoyixiong
|
f7566331c8
|
format
|
2019-06-28 11:55:28 +08:00 |
|
caoyixiong
|
5852ddc973
|
Revert "merge (#6)" (#7)
This reverts commit 928c07d690.
|
2019-06-27 22:54:40 -05:00 |
|
caoyixiong
|
928c07d690
|
merge (#6)
* #1344 server-addr 支持 http 字符串
* 【issue】 #1425
* #1344 客户端本地缓存目录，剔除特殊字符串
* #1344 移动常量位置
* 格式
* feat: component subscribers
|
2019-06-27 21:46:41 -05:00 |
|
caoyixiong
|
aa18efa21b
|
add ip pattern
|
2019-06-27 20:13:20 +08:00 |
|
caoyixiong
|
771263eef6
|
fix
|
2019-06-27 19:50:19 +08:00 |
|
Fury Zhu
|
00f989f51e
|
Merge pull request #1426 from IanCao/master
【issue】 #1425
|
2019-06-27 18:51:38 +08:00 |
|
Fury Zhu
|
fac3dc8a23
|
Merge branch 'develop' into charset
|
2019-06-27 18:50:57 +08:00 |
|
Fury Zhu
|
bd49e062d1
|
Merge pull request #1432 from rushsky518/master
HTTPS支持 #1344
|
2019-06-27 18:49:40 +08:00 |
|
caoyixiong
|
34025a5132
|
format code
|
2019-06-26 12:07:33 +08:00 |
|
slievrly
|
f17f40e0af
|
fix review
Signed-off-by: slievrly <slievrly@163.com>
|
2019-06-25 21:42:13 +08:00 |
|
rushsky518
|
83a2ea673e
|
格式
|
2019-06-25 16:18:26 +08:00 |
|
rushsky518
|
f0553afa7b
|
#1344 移动常量位置
|
2019-06-25 16:10:47 +08:00 |
|
Fury Zhu
|
57b0fe3b52
|
Merge pull request #1414 from IanCao/fix11
【issue】#1278
|
2019-06-24 14:21:22 +08:00 |
|
rushsky518
|
88c3ad0c53
|
#1344 客户端本地缓存目录，剔除特殊字符串
|
2019-06-24 14:10:48 +08:00 |
|
caoyixiong
|
502fa0dcdc
|
【issue】 #1425
|
2019-06-24 10:54:15 +08:00 |
|
rushsky518
|
6d5191f11a
|
#1344 server-addr 支持 http 字符串
|
2019-06-24 10:41:37 +08:00 |
|
Fury Zhu
|
1898bcfb89
|
Merge pull request #1403 from slievrly/modifier
optimize modifier access
|
2019-06-24 10:17:39 +08:00 |
|
Fury Zhu
|
0867117e3f
|
Merge branch 'develop' into master
|
2019-06-23 06:50:16 +08:00 |
|
caoyixiong
|
5c108ea0c4
|
fix
|
2019-06-22 10:40:53 +08:00 |
|
caoyixiong
|
1decd04008
|
#1278
|
2019-06-21 11:41:55 +08:00 |
|
caoyixiong
|
887d3b6c63
|
Update BeatReactorTest.java
|
2019-06-20 20:17:06 +08:00 |
|
caoyixiong
|
5ad978b663
|
add BeatReactorTest
|
2019-06-20 19:53:17 +08:00 |
|
slievrly
|
e01a44702b
|
optimize charset、continue and return
Signed-off-by: slievrly <slievrly@163.com>
|
2019-06-19 23:47:55 +08:00 |
|
slievrly
|
21bf279532
|
optimize modifier access
Signed-off-by: slievrly <slievrly@163.com>
|
2019-06-19 23:12:43 +08:00 |
|
slievrly
|
443679c1c8
|
remove unused import
|
2019-06-19 22:52:31 +08:00 |
|
slievrly
|
8d74ac90aa
|
optimize array and negated codestyle
|
2019-06-19 22:35:52 +08:00 |
|
IanCao
|
7b839d0f83
|
fix bug
|
2019-06-19 19:46:40 +08:00 |
|
IanCao
|
16f8a16cb3
|
fix bug
|
2019-06-19 17:13:35 +08:00 |
|
IanCao
|
5757881c0e
|
update
|
2019-06-19 16:59:28 +08:00 |
|
IanCao
|
f2d22f181a
|
fix
|
2019-06-19 16:58:27 +08:00 |
|
chuntaojun
|
c91f99b82e
|
fix(nacos-client:config): Fix code conflicts
|
2019-06-18 23:27:28 +08:00 |
|
IanCao
|
d7908c651d
|
change into 2 threadpool(mainloop & taskThreadpool)
|
2019-06-18 17:49:44 +08:00 |
|
Fury Zhu
|
d5e8ef5063
|
Merge branch 'develop' into study
|
2019-06-18 10:47:21 +08:00 |
|
Fury Zhu
|
b29e4c8e3f
|
Merge pull request #1380 from chuntaojun/fix_issue_1317
Fix issue 1317
|
2019-06-18 10:12:32 +08:00 |
|
chuntaojun
|
2a67382a7a
|
refactor(nacos-client:config): Modify exception handling
|
2019-06-17 21:11:25 +08:00 |
|
IanCao
|
d0bf21a756
|
fix bug
|
2019-06-17 18:28:03 +08:00 |
|
IanCao
|
6b4a9b72a5
|
fix bug
|
2019-06-17 18:07:54 +08:00 |
|
chuntaojun
|
21ff07563d
|
refactor(nacos-client:config): rmove un use construct of CacheData
|
2019-06-16 08:24:17 +08:00 |
|
chuntaojun
|
ade510f31d
|
feat(nacos-client:config): fix issue #1317
|
2019-06-15 23:37:12 +08:00 |
|
chuntaojun
|
240ee50aa2
|
fix(nacos-client:config): fix issue 1317
|
2019-06-15 19:12:54 +08:00 |
|
赵禹光
|
10aa620315
|
All overriding methods must be preceded by @Override annotations.
|
2019-06-14 18:54:04 +08:00 |
|
caoyixiong
|
4f56452999
|
Merge pull request #3 from alibaba/master
merge
|
2019-06-14 05:35:19 -05:00 |
|