rushsky518
98d35d2420
correct word spell
2019-11-05 13:41:05 +08:00
rushsky518
5a583f1997
#1550 clean code
2019-11-05 11:44:30 +08:00
huangyonghui
7956acbf64
[ #2006 ] change to throw NacosException to make client handle the right Exception case
2019-11-04 15:38:25 +08:00
Fury Zhu
4424af2a77
Merge branch 'develop' into master
2019-10-30 16:06:32 +08:00
nkorange
4d68565667
Update version to 1.1.4
2019-10-24 14:46:46 +08:00
Fury Zhu
3f68ce083d
Merge pull request #1953 from nkorange/feature_mcp
...
Feature mcp
2019-10-22 18:02:15 +08:00
Beldon
927e8d6fe4
Merge remote-tracking branch 'upstream/develop' into develop
...
# Conflicts:
# console/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
# naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
2019-10-21 22:36:24 +08:00
Fury Zhu
fcf62bbd5d
Merge branch 'develop' into feature_mcp
2019-10-21 16:21:42 +08:00
nkorange
f2021a5eda
Fix #1906
2019-10-15 20:02:08 +08:00
rushsky518
a815d7b7de
Merge branch 'develop' of https://github.com/rushsky518/nacos into develop
...
# Conflicts:
# config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
2019-10-11 20:09:19 +08:00
rushsky518
f3bd147317
#1550 nacos server return config type
2019-10-11 19:58:42 +08:00
ly
221d81dab8
Clean up redundant StringUtils
2019-09-25 20:49:37 +08:00
Fury Zhu
0f82e0d577
Merge pull request #1594 from Diffblue-benchmarks/add-diffblue-tests-2
...
Add unit tests for common.GroupKey and utils.MD5
2019-09-19 17:24:49 +08:00
Fury Zhu
72ea64ec4d
Merge branch 'develop' into develop
2019-09-19 17:23:50 +08:00
Fury Zhu
5bc80b948d
Merge branch 'master' into add-diffblue-tests-2
2019-09-19 17:10:48 +08:00
wangchenjun
4ed7aa350b
Avoiding conflicted for creating directory.
2019-09-17 16:34:06 +08:00
chuntaojun
5074d06903
Merge branch 'develop' of https://github.com/alibaba/nacos into develop
2019-09-11 22:44:02 +08:00
chuntaojun
8c47619af9
feat:
2019-09-11 22:43:57 +08:00
xianlaioy
08e69a0b21
refactor: 局部变量是线程安全的;
...
urlPattern改成static final;
GroupKey重构
2019-09-09 20:15:19 +08:00
Fury Zhu
29a013816a
Merge pull request #1752 from ly641921791/issue_1671
...
[ISSUE] #1671 Unified request header "Client-Version"
2019-09-06 15:06:16 +08:00
ly
3b4767384d
[ISSUE] #1671 Unified request header "Client-Version"
2019-08-23 00:02:00 +08:00
ezlippi.ouyang
210f77ee6c
fix: fix #1733
2019-08-21 13:10:13 +08:00
rushsky518
d6baf1dfcf
#1550 去除多余 import
2019-08-19 14:53:50 +08:00
rushsky518
01199aac69
#1550 correct 'yaml' literal
2019-08-19 14:08:00 +08:00
rushsky518
5174eac8d2
#1550 pmd check
2019-08-16 17:29:55 +08:00
rushsky518
b29e8c089c
#1550 yaml 展平
2019-08-16 17:11:24 +08:00
rushsky518
1877e7d307
#1550 流程调通
2019-08-15 17:37:03 +08:00
nkorange
6ca2ee0cf8
Update version to 1.1.3
2019-08-06 18:55:05 +08:00
nkorange
15c913e346
Update version to 1.1.2
2019-08-06 17:10:37 +08:00
nkorange
11bd0ccd76
Update version to 1.1.2-SNAPSHOT
2019-08-02 12:35:04 +08:00
Fury Zhu
838ef83f9f
Merge pull request #1534 from zhaoyuguang/zen3
...
format code
2019-08-01 11:04:24 +08:00
Fury Zhu
9b2367eb91
Merge pull request #1552 from nkorange/hotfix_log_optimization
...
Fix #290
2019-08-01 11:02:55 +08:00
Eric Hettiaratchi
425f4c019a
Add unit tests for common.GroupKey and utils.MD5
...
Fully-qualified classname
com.alibaba.nacos.client.config.common.GroupKey
com.alibaba.nacos.client.config.utils.MD5
These tests were written using Diffblue Cover.
2019-07-23 11:51:13 +01:00
nkorange
1711c3765f
Fix #290
2019-07-15 15:47:02 +08:00
赵禹光
4d771b340e
fmt AppTest
2019-07-11 20:19:24 +08:00
赵禹光
a265196a89
NacosNamingService.java useless import
2019-07-11 20:18:50 +08:00
ly
a87f0bd2bb
Fix #1519 The subscriber list is not displayed correctly
2019-07-11 01:48:11 +08:00
ly
a7e61dff8b
Fix #1519 The subscriber list is not displayed correctly
2019-07-10 20:33:39 +08:00
nkorange
65c2f55617
Fix standalone use derby failed bug
2019-07-09 11:04:00 +08:00
nkorange
fbf006dc99
Fix JDK 1.6 compile failed bug
2019-07-05 22:09:40 +08:00
nkorange
6c8b3ea88e
Update version to 1.1.0
2019-07-05 21:59:55 +08:00
Fury Zhu
1119e9e332
Merge pull request #1487 from zhaoyuguang/zen2
...
fix unuseless import
2019-07-05 16:43:11 +08:00
nkorange
4c055f38b9
Fix #1491
2019-07-05 16:33:52 +08:00
赵禹光
56f43fdcf4
fix a typo
2019-07-05 14:56:20 +08:00
nkorange
7c0e12d6fe
Fix beat info null bug
2019-07-05 12:48:13 +08:00
nkorange
49027b892d
Update version to 1.1.0-SNAPSHOT
2019-07-04 15:01:49 +08:00
Fury Zhu
c031a275f7
Merge pull request #1457 from chuntaojun/fix_issue_1455
...
Fix issue 1455
2019-07-03 18:33:48 +08:00
xianlaioy
4fc07d4852
构建rDigits改成google的guava
...
new HashMap<Character, Integer>(16); 负载因子是0.75,digits实际大小是16会扩容一次。
2019-07-02 15:27:28 +08:00
chuntaojun
e6b09cb647
fix(client): fix Correction parameter name
2019-07-02 13:07:02 +08:00
Fury Zhu
b599a9eb9e
Merge pull request #1452 from zhaoyuguang/zen0
...
useless import
2019-07-02 11:45:47 +08:00
chuntaojun
a7d128923e
fix(client): fix issue #1455
2019-07-01 17:49:30 +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
赵禹光
d7ce18233a
useless import
2019-07-01 10:08:38 +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