Commit Graph

1726 Commits

Author SHA1 Message Date
xianlaioy
4fc07d4852
构建rDigits改成google的guava
new HashMap<Character, Integer>(16); 负载因子是0.75,digits实际大小是16会扩容一次。
2019-07-02 15:27:28 +08:00
得少
c453e2130d Compatible with stand-alone mode 2019-07-02 15:15:49 +08:00
chuntaojun
e9694cdc42 ci(travis): update travis.yaml 2019-07-02 13:28:30 +08:00
邪影oO
124bbc6271
Merge pull request #2 from alibaba/develop
更新代码
2019-07-02 13:17:02 +08:00
chuntaojun
e6b09cb647 fix(client): fix Correction parameter name 2019-07-02 13:07:02 +08:00
Fury Zhu
402b31adb6
Merge pull request #1254 from KeRan213539/exportAndImport
#1115 feature: configs export/import and clone
2019-07-02 12:42:30 +08:00
Fury Zhu
b599a9eb9e
Merge pull request #1452 from zhaoyuguang/zen0
useless import
2019-07-02 11:45:47 +08:00
Fury Zhu
702289ad69
Merge pull request #1454 from zhaoyuguang/zen1
Fix #1453
2019-07-02 11:44:49 +08:00
得少
7336a8b7f5 fix #1458
support address server mode ,so nacos client will use the endpoint to initializer
2019-07-01 23:08:08 +08:00
LoadChange
a3800864ad feat: NewConfigEditor 2019-07-01 22:07:30 +08:00
邪影oO
39d49bb141
Merge branch 'develop' into exportAndImport 2019-07-01 17:54:44 +08:00
chuntaojun
ff9ddfc31c test(test): add issue #1455 test 2019-07-01 17:53:18 +08:00
keran
51990b6a11 还原误提交的 2019-07-01 17:52:17 +08:00
chuntaojun
a7d128923e fix(client): fix issue #1455 2019-07-01 17:49:30 +08:00
keran
e7ac873fe3 按照review意见修改 2019-07-01 17:49:18 +08:00
keran
61b6302625 按照review意见修改 2019-07-01 17:48:45 +08:00
Fury Zhu
819d5d1db5
Merge pull request #1404 from slievrly/charset
optimize charset、continue and return
2019-07-01 13:12:03 +08:00
赵禹光
ea5eaf5441 fix2 2019-07-01 11:59:04 +08:00
赵禹光
179f810d89 bugfix and opt 2019-07-01 11:45:19 +08:00
赵禹光
d7ce18233a useless import 2019-07-01 10:08:38 +08:00
Fury Zhu
dc7485b108
Merge pull request #1427 from chuntaojun/feat_config_prefix
[FEATURE] @NacosConfigurationProperties support prefix setting
2019-06-30 22:54:27 +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
Fury Zhu
defe701737
Merge pull request #1446 from Nicholas2015/hotfix_subscriber_array_494
Collective data de-duplication
2019-06-30 22:35:36 +08:00
Nicholas2015
71ee840111 Collective data de-duplication 2019-06-29 12:59:35 +08:00
nkorange
2c4e659d6c Update version to 1.0.2-SNAPSHOT 2019-06-28 17:51:04 +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
nkorange
86f0f3c6d7 #1229 Add test case 2019-06-28 17:06:06 +08:00
nkorange
88e11393a6 Merge remote-tracking branch 'upstream/develop' into develop 2019-06-28 16:40:22 +08:00
nkorange
fbb9ec8b20 #494 Add test cases 2019-06-28 16:40:05 +08:00
keran
98edb0edfa 统一code枚举和result生成工具 2019-06-28 15:43:16 +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
Fury Zhu
75b52924ae
Merge pull request #1436 from loadchange/feat/1.1.0
Feat component subscribers
2019-06-27 18:46:18 +08:00
caoyixiong
65a4d27e1e fix 2019-06-26 12:15:11 +08:00
caoyixiong
34025a5132 format code 2019-06-26 12:07:33 +08:00
LoadChange
6be57033c2 feat: component subscribers 2019-06-26 11:33:38 +08:00
caoyixiong
781273faa6
Merge pull request #5 from alibaba/develop
merge
2019-06-25 21:47:24 -05:00
slievrly
f17f40e0af fix review
Signed-off-by: slievrly <slievrly@163.com>
2019-06-25 21:42:13 +08:00
caoyixiong
56be528ce4 format code and remove useless 2019-06-25 17:36:43 +08:00