zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,924 Commits 2 Branches 3 Tags 58 MiB
6ad8da4f68
Commit Graph

521 Commits

Author SHA1 Message Date
chuntaojun
7586354476 refactor: bug fix and refactor init logic 2020-04-13 16:13:49 +08:00
wolfgang.zhu
445377d49c fix #2577: Naming client http read timeout and connect timeout controlled by the same property 2020-04-04 12:56:57 +08:00
chuntaojun
42626c029b docs: 2020-04-03 19:06:55 +08:00
Peter Zhu
2e1b5a0303
Merge pull request #2569 from Maijh97/develop 
Change NamingProxy#reqAPI method throw exception log describe
 2020-04-02 09:56:30 +08:00
mai.jh
237edb07b5 fix throw exception log describe 2020-04-01 17:45:59 +08:00
chuntaojun
2e7549a0e2 refactor: Roll back the code 2020-04-01 16:51:03 +08:00
chuntaojun
b3fdacf035 refactor: 2020-04-01 16:37:29 +08:00
chuntaojun
d8714843a0 fix: hotfix issue 2560 2020-04-01 14:37:26 +08:00
wolfdriver
8055985df4 去除无用代码 2020-03-29 22:54:33 +08:00
chuntaojun
586838e0a0 Merge branch 'develop' of https://github.com/alibaba/nacos into feature_consistency 2020-03-29 13:26:19 +08:00
maijh97
e9d7310b58 fix #1674 'delayTime' move method local variable 2020-03-29 12:21:43 +08:00
maijh97
60a518b944 fix #1674 field name change 2020-03-28 22:03:00 +08:00
maijh97
4226a49813 fix #1674 2020-03-28 20:43:09 +08:00
chuntaojun
89a8dddc1c Merge branch 'develop' of https://github.com/alibaba/nacos into feature_consistency 2020-03-28 17:38:26 +08:00
nkorange
ea2a83c4be Update version to 1.2.1 2020-03-27 15:48:32 +08:00
chuntaojun
e0dd6cc652 fix: 2020-03-27 13:54:52 +08:00
chuntaojun
36b99c74ac test: fix BeatReactorTest 2020-03-27 13:15:31 +08:00
chuntaojun
ce6dc51bcf fix: fix some bugs 2020-03-26 20:32:52 +08:00
theonefx
bebea333f5 spelling mistake 2020-03-26 10:55:44 +08:00
theonefx
fa1421b5f1 fix: https://github.com/alibaba/nacos/issues/2527 2020-03-26 00:07:15 +08:00
zhenxianyimeng
6785491f15 replace deprecated methods in ParamUtil 2020-03-11 18:16:14 +08:00
chuntaojun
f65e4fcbc0 refactor(naming): Optimize the empty service removal logic 2020-03-06 16:32:59 +08:00
nkorange
82d7147a58 Update version to 1.2.0 2020-03-03 16:24:08 +08:00
nkorange
31e6063209 Update version to 1.2.0-beta.1 2020-02-23 20:02:13 +08:00
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
nkorange
7bbd867c2c #1105 Fix test case error 2020-01-16 22:39:09 +08:00
nkorange
bc5e3e1cce #1105 Finish auth IT cases 2020-01-15 17:57:01 +08:00
nkorange
1fb1f5f3e3 #1105 Add auth test case for config 2020-01-14 18:01:00 +08:00
Peter Zhu
a425f7258e
Merge branch 'develop_1.2.0' into develop 2020-01-10 17:58:30 +08:00
Peter Zhu
1849d96935
Merge pull request #1715 from rushsky518/develop 
receive config change event
 2020-01-10 15:41:24 +08:00
nkorange
41dfcf5596 #1105 Read cache instead of accessing DB directly. 2020-01-06 14:35:11 +08:00
nkorange
080ca1e73d #1105 Access control finish 81% 2019-12-18 20:30:06 +08:00
nkorange
e2c553cbca #1105 Access control finish 80% 2019-12-18 20:25:10 +08:00
nkorange
952ee8a3c1 #1105 Access control finish 50% 2019-12-11 19:25:33 +08:00
nkorange
a32a4f780c Fix #2123 2019-12-06 15:58:23 +08:00
nkorange
38590d060c Fix #2123 2019-12-06 11:53:01 +08:00
nkorange
d150d97d0a Fix close connection exception. 2019-12-04 14:35:01 +08:00
nkorange
2781c6c84f Update version to 1.2.0-SNAPSHOT 2019-12-02 14:56:15 +08:00
rushsky518
2acee95885 #1550 完善单元测试 2019-11-30 13:22:47 +08:00
rushsky518
1a4c8f8af1 #1550 加测试用例 2019-11-28 15:56:29 +08:00
rushsky518
3c1d6d00c3 #1550 添加单元测试；部分类移动到 api 模块 2019-11-28 11:56:04 +08:00
rushsky518
ee660f335d #1550 correct while 2019-11-27 20:58:55 +08:00
rushsky518
93773c47d6 #1550 抽象出 spi 接口 2019-11-26 21:35:05 +08:00
Cosmos
6bb0e4b6e0 add client context path config 2019-11-25 16:52:50 +08:00
rushsky518
f535ab9846 #1550 普通 listener 时，不保存 lastContent 2019-11-24 16:53:06 +08:00
rushsky518
64b6dbe9cb #1550 把 lastContent 放入 listener 中 2019-11-22 14:43:30 +08:00
withthewind
ec6e52ee9d optimize: the Boolean.parseBoolean(String s) method should be used when converting a String to a Boolean type 2019-11-21 15:59:28 +08:00
chuntaojun
89b2d000f0 refactor(client/config): update timeout compute 2019-11-12 09:41:05 +08:00
liaochuntao
23ddb69cba refactor(client/config): increase the client's read timeout 
In order to prevent the server from handling the delay of the client's long task, increase the
client's read timeout to avoid this problem.
 2019-11-12 09:10:15 +08:00
nkorange
d034412fdd fix #1858 2019-11-11 09:38:57 +08:00
Fury Zhu
8c104bc432
Merge pull request #2009 from Albert-Hugo/hotfix_2006 
[#2006] Change to throw NacosException
 2019-11-07 16:23:56 +08:00
nkorange
c431a852b5 #2018 Close inpuststream instead of connection. 2019-11-07 16:02:01 +08:00
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