Commit Graph

1576 Commits

Author SHA1 Message Date
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
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
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
caoyixiong
56be528ce4 format code and remove useless 2019-06-25 17:36:43 +08:00
rushsky518
83a2ea673e 格式 2019-06-25 16:18:26 +08:00
rushsky518
f0553afa7b #1344 移动常量位置 2019-06-25 16:10:47 +08:00
chuntaojun
0885d08778 feat(api): @NacosConfigurationProperties support prefix setting 2019-06-24 20:25:24 +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
6d6e4a184c format 2019-06-24 14:00:49 +08:00
caoyixiong
2ca8e0c1b3 fix 2019-06-24 13:57:51 +08:00
caoyixiong
4c87550750 update nacosException 2019-06-24 13:55:50 +08:00
caoyixiong
09f5b84138
Merge pull request #4 from alibaba/develop
merge
2019-06-23 23:29:32 -05: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
c7fe374af6
Merge pull request #1413 from chuntaojun/develop
feat(nacos-api): add enableRemoteSyncConfig properties setting
2019-06-24 10:24:58 +08:00
Fury Zhu
94f034bccf
Merge pull request #1407 from slievrly/junit
optimize junit
2019-06-24 10:23:47 +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
042b7a2268
Merge pull request #1353 from IanCao/master
TTL and client beat interval should be customized at instance level.
2019-06-24 10:16:12 +08:00
Fury Zhu
c242c920b7
Merge pull request #1422 from Nicholas2015/hotfix_subscriber_494
add page info to subscriber service
2019-06-24 10:14:48 +08:00
LoadChange
9381a10d1f refactor: closes #1354 2019-06-23 21:55:11 +08:00
Fury Zhu
0867117e3f
Merge branch 'develop' into master 2019-06-23 06:50:16 +08:00
Nicholas2015
dbf6d45bf4 add page info 2019-06-22 13:31:00 +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
b2242194f4 fix 2019-06-20 23:11:02 +08:00
caoyixiong
887d3b6c63
Update BeatReactorTest.java 2019-06-20 20:17:06 +08:00