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

492 Commits

Author SHA1 Message Date
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
IanCao
581e732305 Just return empty instance list if service not found #1367 2019-06-14 17:40:33 +08:00
chuntaojun
75868623b2 fix(nacos-api/nacos-client): Fix setting parameter acquisition problem and nacos properties add new 2019-06-14 17:06:50 +08:00
IanCao
aae3b72aa0 fix bug 2019-06-13 14:38:00 +08:00
IanCao
a98db447fe format code 2019-06-13 12:26:22 +08:00
caoyixiong
dbbb456e87
Merge pull request #2 from alibaba/master 
merge
 2019-06-12 21:00:53 -05:00
IanCao
266f81a01e format code 2019-06-13 09:57:11 +08:00
nkorange
a60bed8dee Update version to 1.0.1 2019-06-12 16:28:12 +08:00
nkorange
0b0d0c4c83 Optimize code 2019-06-12 14:33:38 +08:00
IanCao
e11c37bc6b client beat interval should be customized at instance level 2019-06-11 18:16:45 +08:00
nkorange
a7f3cabf3c Update version to 1.0.1-SNAPSHOT 2019-06-11 17:04:36 +08:00
chuntaojun
aa41a10616 fix(nacos-client:config): Fix failed custom parameter setting error 2019-06-11 13:26:20 +08:00
chuntaojun
be3cb036a2 refactor(nacos-client:config): remove un use constructor 2019-06-11 10:01:55 +08:00
chuntaojun
dd9676c2e4 fix(nacos-client): fix merge conflict 2019-06-11 09:16:22 +08:00
chuntaojun
0e653a9b39 refactor(nacos-client:config): Modify the long poll timeout parameter to add Max retry custom Settin 2019-06-11 09:12:59 +08:00
Fury Zhu
4ad21f2dae
Merge branch 'develop' into master 2019-06-10 16:24:16 +08:00
IanCao
eee5b34d39 format code 2019-06-10 15:38:58 +08:00
IanCao
1566cdcd95 formant code 2019-06-10 13:31:33 +08:00
IanCao
850223580a format code 2019-06-10 12:25:56 +08:00
IanCao
b989e50791 format code 2019-06-10 12:23:48 +08:00
chuntaojun
d43e079a97 test(nacos-test:config): add ConfigLongPoll_ITCase 2019-06-07 22:51:16 +08:00
chuntaojun
ecc015402e refactor(nacos-client): 修改与本pr无关的注释信息 2019-06-07 21:25:09 +08:00
chuntaojun
456e84785f refactor(nacos-client:config): Rewrite the HTTP retry rule 2019-06-07 18:41:08 +08:00
chuntaojun
92ff0a0873 fix(remove ConfigLongPollTest): 2019-06-07 16:58:29 +08:00
chuntaojun
be213f5601 test(nacos-client): add ConfigLongPollTest 2019-06-07 16:47:25 +08:00
chuntaojun
5623577a36 refactor(nacos-client): 修改config的LongPoll轮询的机制 2019-06-06 21:44:42 +08:00
chuntaojun
1f102f52f4 feat: 2019-06-06 20:38:24 +08:00
chuntaojun
72a3a9b213 feat: 2019-06-05 22:31:09 +08:00
nkorange
3a1869bcd6 Fix #1215 2019-06-05 11:16:57 +08:00
Fury Zhu
9319b76d22
Merge pull request #1307 from pbting/namespace_unified 
Namespace And Endpoint Support Multi Enviroment Switch
 2019-06-04 17:15:26 +08:00
nkorange
138a15dcf3 Remove useless test 2019-06-04 16:53:17 +08:00
pbting
3b869fcdbe change the comment from Chinese to English 2019-06-04 16:44:12 +08:00
pbting
9d57976167 change the comment from Chinese to English 2019-06-04 16:21:21 +08:00
pbting
302ae79b3f 1. 注释改成中文 
2. StringUtils 统一改成
3. 参数命名改为 nacos 前缀
 2019-06-04 15:55:47 +08:00
pbting
9963ca5f3f change the version 2019-05-31 15:25:25 +08:00
pbting
c4be24a536 nacos client namespace support multi enviroment switch 2019-05-31 15:21:58 +08:00
chuntaojun
01b74be838 refactor(client): delete useless test case 2019-05-13 11:19:52 +08:00
Fury Zhu
df6f3a8df7
Merge pull request #1130 from chuntaojun/feature_service_curd 
[ISSUE #747、#1154] Add create and update service methods in SDK and update instance operation
 2019-05-09 10:45:54 +08:00
chuntaojun
ac36a41d86 refactor(api、client): modify MaintainService to NamingMaintainService 2019-05-09 10:07:09 +08:00
chuntaojun
141f8a19ea refactor(client): 2019-05-08 15:29:01 +08:00
Fury Zhu
756862060f
Merge pull request #1122 from Diffblue-benchmarks/add-diffblue-tests 
Add unit tests for com.alibaba.nacos.client.utils.StringUtils
 2019-05-08 08:26:24 +08:00
Fury Zhu
73ebb86055
Merge pull request #1170 from ddatsh/master 
fix typo
 2019-05-07 17:52:07 +08:00
chuntaojun
4817b26bc9 refactor(client): Fix the issues raised in the comments 2019-05-07 11:11:24 +08:00
peter zhang
eef6e73d94
fix typo 
motify > modify
 2019-05-06 15:25:02 +08:00
chuntaojun
f8ec782080 refactor(client): Delete Chinese comments 2019-05-05 10:12:30 +08:00
chuntaojun
320aca4d90 style(api): The revised code is in compliance with the specification 2019-04-30 19:27:06 +08:00
chuntaojun
f2c046a395 refactor(client): Service operation function module split 2019-04-30 17:46:10 +08:00
chuntaojun
79c3fc6547 Merge branch 'develop' of https://github.com/chuntaojun/nacos into feature_service_curd 2019-04-28 14:18:36 +08:00
chuntaojun
ea214e1d50 feat(client): add feature of service curd 2019-04-27 22:32:28 +08:00
huangyonghui
35f3842d1c format code 2019-04-26 16:59:18 +08:00
huangyonghui
8ac94b61b4 NamingEvent add getGroupName and getClusters method 2019-04-24 15:08:16 +08:00
Keep
55242c8200
Merge pull request #996 from Summerslyb/fix-log4j2 
[ISSUE #827] Fix Nacos Naming's log settings affect the root log
 2019-04-19 20:29:33 +08:00
Eric Hettiaratchi
da2f4a1fd5 Add unit tests for com.alibaba.nacos.client.utils.StringUtils 
These tests were written using Diffblue Cover.
 2019-04-18 10:28:31 +01:00
nkorange
a87cc12d47 Update version to 1.0.0 2019-04-15 20:01:34 +08:00
nkorange
699bdcb6dc Update to 1.0.0-SNAPSHOT 2019-04-15 16:36:10 +08:00
得少
427a746e82 change the default value of isUseEndpointParsingRule from false to true 2019-04-12 12:49:46 +08:00
water.lyl
8175cd9aeb namespace default empty 2019-04-11 00:58:06 +08:00
nkorange
3c1c98aaf1 Update version to 1.0.0 2019-04-10 22:04:27 +08:00
SLKun
ce0b863e47 fixes #827 2019-04-04 11:37:16 +08:00
得少
b71faa8496 change the stringutils dependency 2019-04-03 22:15:09 +08:00
得少
5a5e723cb2 erge branch 'develop' of https://github.com/pbting/nacos into develop 2019-04-03 19:37:14 +08:00
得少
a8ee39323f StringUtils change the dependency 2019-04-03 19:36:31 +08:00
pbting
b7a1fb22b3
Merge branch 'develop' into develop 2019-04-03 19:08:09 +08:00
得少
4c86e63271 change the code 2019-04-03 18:45:16 +08:00
得少
eca7a9a422 support parsing endpoint rule 2019-04-03 18:31:27 +08:00
Fury Zhu
e0547c82ca
Merge pull request #997 from alibaba/feature_naming_group 
Feature naming group
 2019-04-02 20:57:04 +08:00
yanlinly
acaee3ffb5
Merge pull request #993 from alibaba/del_warnings 
Remove spotbugs-annotations dependency
 2019-04-02 10:31:06 +08:00
water.lyl
0b6246e9f5 remove lgpl dependency 2019-04-01 21:16:44 +08:00
xuechaos
178b80ea41 del warnings spotbugs-annotations #981 2019-04-01 21:16:14 +08:00
nkorange
4c5b06c5bb Optimize code 2019-03-29 19:29:42 +08:00
water.lyl
d11fd7f73e support aliyun ram role 2019-03-27 14:13:15 +08:00
nkorange
14ecd9c230 #502 Fix data inconsistent bug 2019-03-26 14:07:06 +08:00
nkorange
a745423dec Merge branch 'develop' into feature_naming_group 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
#	pom.xml
#	test/pom.xml
 2019-03-25 15:03:31 +08:00
nkorange
dc51aa5703 Merge branch 'hotfix_server_mode' into develop 2019-03-22 17:31:36 +08:00
nkorange
fcf968c36b Update version to 1.0.0-RC2 2019-03-22 17:29:26 +08:00
hxy1991
dcaca7e9a2 Fixes #925 2019-03-19 14:36:57 +08:00
nkorange
52d4e01bc7 #502 Fix several bugs 2019-03-18 20:57:28 +08:00
nkorange
a902194bc6 Close #910 2019-03-18 10:31:57 +08:00
nkorange
488075fa52 Update version to 1.0.0-RC1 2019-03-15 15:48:30 +08:00
nkorange
86b524127d Merge branch 'develop' into feature_naming_group 2019-03-14 16:17:59 +08:00
nkorange
6034bdbdb9 #502 Compatible with 0.8.0 2019-03-14 16:04:07 +08:00
Fury Zhu
594741ce09
Merge pull request #897 from fluffywar/patch-1 
更新HomePage
 2019-03-14 09:26:04 +08:00
fluffywar
bcde863f61
更新HomePage 
仓库里的显示的主页不对
https://mvnrepository.com/artifact/com.alibaba.nacos/nacos-client/0.9.1
 2019-03-13 22:17:24 +08:00
nkorange
902a77aedd Merge branch 'develop' into feature_naming_group 2019-03-13 18:43:13 +08:00
得少
6626b95273 change the isNotBlank to isBlank 2019-03-11 20:53:01 +08:00
nkorange
ac67b95d9f Merge branch 'develop' into feature_naming_group 2019-03-11 17:36:23 +08:00
nkorange
5f07ce99e4 Fix #869 2019-03-11 17:32:52 +08:00
hxy1991
a57529ad7e Fixes #880 2019-03-11 16:03:49 +08:00
nkorange
6ae100e390 Fix http client error 2019-03-08 10:43:26 +08:00
nkorange
366d9f3c30 Fix merge conflict 2019-03-07 19:36:40 +08:00
nkorange
dae2809630 Merge branch 'develop' into feature_naming_group 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	client/src/main/java/com/alibaba/nacos/client/naming/utils/UtilAndComs.java
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	pom.xml
#	test/pom.xml
 2019-03-07 19:24:22 +08:00
hxy1991
2584e59edf Fixes #868 2019-03-07 14:46:34 +08:00
nkorange
dd0bd51617 Fix #866 2019-03-06 20:55:30 +08:00
nkorange
c4ad0888e0 #869 Clarify exception message 2019-03-06 11:59:15 +08:00
nkorange
7947fc29b1 #269 fix bug 2019-03-05 14:54:53 +08:00
得少
369f19608e #863 2019-03-05 13:07:23 +08:00
nkorange
116e9119c2 #269 fix send client beat bug 2019-03-05 11:35:58 +08:00
得少
a9ff49692f Optimize code design 2019-03-05 10:08:28 +08:00
得少
a05be5f97b log format 2019-03-04 19:23:11 +08:00
得少
0774cb23d4 format log 2019-03-04 19:15:04 +08:00
得少
1869bea58f format log 2019-03-04 18:50:35 +08:00
nkorange
8c23f34806 #269 fix bug 2019-03-04 17:12:29 +08:00
得少
43a51c0f25 #861 2019-03-04 16:56:01 +08:00
nkorange
616a8031bc Merge branch 'develop' into feature_naming_group 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/conf/application.properties
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	pom.xml
#	test/pom.xml
 2019-03-04 10:12:11 +08:00
xuechaos
80c260e207 Release 0.9.0 Nacos : Nacos server function mode and fix 13 issues 
* [#840] Nacos server adds startup mode to distinguish between config and naming.
* [#762] Register instance returns failed when the health check mode is 'server' in standalone mode.
* [#473] Nacos Cluster Mode kubernate Startup nacos.log error Log.
* [#240] Log strong dependence problem.
* [#824] getServicesOfServer throws exception if service list is empty.
* [#802] Nacos server multi-boot mode support.
* [#800] Nacos's client-to-server addressing mode document introduction.
* [#768] The interval at which the heartbeat is sent in BeatReactor is not controlled by the server return value.
* [#759] why instance can't auto-delete.
* [#756] Format of instance and service should be validated.
* [#720] Memory leak in PushService.
* [#653] IoUtils under nacos-common-0.2.1-RC1.jar lacks "" judgment on encoding.
* [#588] Client compatible to jdk1.6. On branch develop
 2019-03-01 00:46:50 +08:00
xuechaos
f88b8018b5 merge develop to fix merge 2019-02-28 19:50:33 +08:00
xuechaos
0ca7323df9 #588 build client and dependenties use 1.6 2019-02-28 17:52:06 +08:00
hxy1991
41e6ec9cbb Fixes #826 2019-02-28 17:50:29 +08:00
得少
c279d31c10 Merge remote-tracking branch 'origin/develop' into support_ans_developer 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/identify/CredentialWatcher.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
 2019-02-27 20:42:30 +08:00
nkorange
ddf194ea00 Fix merge conflicts 2019-02-27 13:01:56 +08:00
nkorange
493715973f Merge branch 'develop' into feature_naming_group 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
 2019-02-26 17:29:22 +08:00
hxy1991
0e9d3e678a Fixes #240 #826 #827 #828 2019-02-26 14:22:38 +08:00
nkorange
8d762a5403 #502 User server proxy instead of client proxy 2019-02-22 21:57:33 +08:00
pbting
f5d2782901
Update NamingProxy.java 2019-02-22 17:43:54 +08:00
得少
b3ee9698fa #817 2019-02-22 17:06:02 +08:00
nkorange
918dcf9905 #502 Fix bug 2019-02-20 20:09:59 +08:00
qingliang.ql
45d94f8935 metrics 2019-02-18 15:14:48 +08:00
qingliang.ql
474438001d Merge branch 'develop' into feature_metrics 2019-02-18 10:50:45 +08:00
nkorange
9409ebfd8b Merge branch 'feature_naming_ap' into feature_naming_group 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
 2019-02-18 08:49:41 +08:00
nkorange
ede55b0e4f Merge branch 'develop' into feature_naming_ap 2019-02-18 08:46:35 +08:00
Darkness463
5760d13520 Fix https://github.com/alibaba/nacos/issues/768: Client beat interval. 2019-02-15 21:51:47 +08:00
nkorange
451863fe33 Update version to 0.8.1 2019-02-15 11:54:10 +08:00
nkorange
469d976aee #502 Fix sync timestamp repeat bug 2019-02-15 11:40:19 +08:00
pbting
5e78e9a315
Merge branch 'feature_support_ans' into 0.8.0-poc-support-ans 2019-02-15 11:08:03 +08:00
pbting
15e0f30849 fix #367 2019-02-14 18:00:01 +08:00
pbting
e9bbe492bb code format with idea 2019-02-13 16:12:16 +08:00
nkorange
9783240e9d #269 Support service group 2019-02-13 15:46:28 +08:00
pbting
1a6fa9e69c support ans 2019-02-13 15:42:41 +08:00
qingliang.ql
4eaf0e7fbf fix not support java 1.7 2019-02-13 15:31:17 +08:00
nkorange
81dd9fbc6b #745 Support service creation in AP mode 2019-02-12 20:11:57 +08:00
nkorange
58b8d1640f #744 Add server status, #629 Add partition service warm up logic 2019-02-09 15:43:03 +08:00
nkorange
026ec980c5 #502 Fix test case not pass problem 2019-02-02 11:32:39 +08:00
nkorange
ab562117d5 #502 Fix HTTP 302 use GET problem. 2019-02-01 19:59:41 +08:00
nkorange
d3a4834672 #650 Server list manager detects healthy servers 2019-01-30 10:06:37 +08:00
nkorange
4560b3ca25 Merge branch 'develop' into feature_naming_ap 2019-01-25 11:51:31 +08:00
wuyoushan
b26f9f2fae fix HttpSimpleClient npe bug 2019-01-23 16:40:46 +08:00
nkorange
6ebde678d3 #502 Reorganize parameter mapping. 2019-01-23 15:33:20 +08:00
water.lyl
f29209b114 release 0.8 2019-01-22 22:16:13 +08:00
nkorange
f2b43fb240 #502 Update author information 2019-01-19 21:23:35 +08:00
nkorange
d0bfc0e179 Merge branch 'feature_multi_tenant' into feature_naming_ap 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/MysqlHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/TcpSuperSenseProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
 2019-01-14 16:59:13 +08:00
nkorange
7abee38ff4 Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
 2019-01-14 16:01:58 +08:00
nkorange
fdc48028fc Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
 2019-01-14 16:01:14 +08:00
Fury Zhu
15aec2aa61
Merge branch 'develop' into feature_subscription_by_query_optional 2019-01-14 14:28:53 +08:00
nkorange
baa4b4c1f1 #502 Update pom version 2019-01-13 10:26:23 +08:00
nkorange
55e1269ee1 #498 Merge develop 2019-01-12 22:43:24 +08:00
qingliang.ql
93d2bd253d fix invoke method error 2019-01-11 15:47:42 +08:00
qingliang.ql
55c8f038e3 merge develop 2019-01-11 14:27:19 +08:00
Keep
21b7f96809
Merge pull request #446 from lostcharlie/develop 
[ISSUE #442] Fix typos in class names and variables.
 2019-01-11 14:19:43 +08:00
nkorange
9898a3c8e4 Merge branch 'develop' into feature_multi_tenant 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
#	test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java
 2019-01-11 14:08:13 +08:00
qingliang.ql
eb2c33a88e metrics agent 2019-01-11 13:56:37 +08:00
nkorange
ad0a059a1d fix #592 2019-01-11 13:07:08 +08:00
nkorange
63cf9dd00a Fix #599 2019-01-09 20:36:08 +08:00
qingliang.ql
052901f27f support java 6 2019-01-09 20:06:02 +08:00
qingliang.ql
4101814db6 add license 2019-01-09 12:05:14 +08:00
qingliang.ql
fb5bbf3689 merge develop 2019-01-09 11:27:51 +08:00
qingliang.ql
4bcf4313e3 collect metrics to metrics monitor 2019-01-09 10:35:24 +08:00
nkorange
c7800b42bd fix #587 2019-01-09 10:08:05 +08:00
Keep
33e5e47832
Merge pull request #563 from huangyunbin/limiter 
#562 Limiter DEFAULT_LIMIT optimization
 2019-01-08 11:28:00 +08:00
qingliang.ql
d1a09847fe client metrics 2019-01-07 20:31:45 +08:00
nkorange
fed3c3f986 #498 Rename healthController bean and update pom version to 0.8.0-SNAPSHOT 2019-01-07 17:57:13 +08:00
FrankBian
41001899db format code: add @Override; translate some chinese msg to english; remove unneccessary method modifier 2019-01-07 15:48:01 +08:00
nkorange
720ab596a7 #497 Make subscription by query optional 2019-01-04 15:24:10 +08:00
cloud.huang
5881214631 #562 Limiter DEFAULT_LIMIT optimization 2019-01-03 18:43:53 +08:00
nkorange
571031eb0c Fix #527 2018-12-27 00:28:39 +08:00
nkorange
478cb1533e #498 Naming supports namespace 2018-12-25 16:48:27 +08:00
nkorange
947e0439b0 #269 Register instance with tenant info 2018-12-19 11:02:31 +08:00
hxy1991
0b65e34fd0 Fixes #336 #439 2018-12-19 10:36:59 +08:00
nkorange
dc36c24f17 #187 Add debug log 2018-12-18 17:35:22 +08:00
nkorange
066aaeaec0 Merge branch 'master' into 0.7.0 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	console/src/main/resources/static/console-fe/src/i18ndoc.js
#	console/src/main/resources/static/console-fe/src/locales/en-US.js
#	console/src/main/resources/static/console-fe/src/locales/zh-CN.js
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	pom.xml
#	test/pom.xml
 2018-12-14 17:55:20 +08:00
nkorange
be64c1acf7 Update version to 0.7.0 2018-12-14 17:48:57 +08:00
nkorange
d2e4f4e6b4 Merge branch 'feature_cmdb' into 0.7.0 
# Conflicts:
#	api/pom.xml
#	api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/conf/application.properties
#	distribution/conf/nacos-logback.xml
#	distribution/pom.xml
#	distribution/release-nacos.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	pom.xml
#	test/pom.xml
 2018-12-14 17:15:32 +08:00
nkorange
7a64ce2177 #187 Fix bug 2018-12-14 17:00:18 +08:00
Zhen Tang
6fb97c44e7 Revert changes in HTTP header for backward compatibility. 2018-12-13 09:13:51 +08:00
Zhen Tang
98e447e146 Fix typo: Long pulling -> Long polling. 2018-12-13 09:13:28 +08:00
Zhen Tang
d5fcfc4a81 Fix typo: PushRecver -> PushReceiver 2018-12-13 09:13:05 +08:00
nkorange
a5e564dbe5 Update version to 0.6.1 2018-12-11 17:15:57 +08:00
nkorange
1b3c5fb4ba Prepare for 0.6.1 2018-12-11 16:34:43 +08:00
nkorange
8c50599a15 #429 Filter services by metadata 2018-12-11 16:10:48 +08:00
hxy1991
97743685ac Fixes #363 2018-12-10 19:53:15 +08:00
nkorange
7115834a98 #421 Fixed 2018-12-10 19:52:58 +08:00
nkorange
3198ec69ca #187 Refactor some logic 2018-12-10 15:37:48 +08:00
xuechaos
d4edde980b Nacos release 0.6.0 version 
#388 Cluster name should be provided in the Instance
#377 Clean up messy code in Naming module
#369 Support instance list persisted on disk
#366 findbugs-maven-plugin version
#362 The metadata will lost when online or offline instance through web ui
#352 Refactoring internationalization Nacos console
#278 Nacos docker img
#243 optimize the efficiency of integration testing, it’s taking too long now
 2018-12-07 15:19:43 +08:00
hxy1991
25819dce28 Fixes #229 2018-12-05 22:36:33 +08:00
nkorange
aace49640a #187 provide CMDB module 2018-12-05 12:08:49 +08:00
nkorange
78523976ba #97 Support integrating to third-party CMDB to filter service providers by their labels. 2018-12-03 17:56:11 +08:00
hxy1991
cbc8b0a75a Merge branch 'upstream-develop' 
# Conflicts:
#	api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java
 2018-12-03 10:29:40 +08:00
JianweiWang
be0ba62bbd
Merge pull request #378 from alibaba/feature_debug_log 
#377 Clean up code
 2018-12-02 18:00:36 +08:00
nkorange
5f60644d9e #377 Clean up code 2018-12-02 17:40:06 +08:00
hxy1991
30e7c5273a Fixes #363 2018-12-01 13:57:03 +08:00
nkorange
e3e6682231 Modify author info 2018-11-30 13:25:58 +08:00
liaozan
98ec99d84d
fix typo 2018-11-24 13:16:38 +08:00
nkorange
62352515d9 Hide mvn repository config 2018-11-20 09:12:20 +08:00
dungu.zpf
d795ad7d2b 0.5.0 release 2018-11-19 19:54:08 +08:00
nkorange
93246b3ded Merge branch 'naming-model-refactor' into develop 
# Conflicts:
#	console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js
#	console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
 2018-11-16 19:59:15 +08:00
Fury Zhu
ea03905ae9
Merge branch 'master' into naming-model-refactor 2018-11-16 18:16:51 +08:00
nkorange
46c141900e Fix PMD 2018-11-16 12:07:25 +08:00
hxy1991
af21897608 correct license 2018-11-16 10:28:28 +08:00
nkorange
eba3ca9c74 Fix ip registered failed bug 2018-11-15 15:25:45 +08:00
nkorange
361ae0b2dd Fix raft publish bug 2018-11-15 14:19:08 +08:00
lingwei.clw
b22284fc90 新增测试用例 2018-11-14 12:06:58 +08:00
nkorange
d3751a99af #209 Disable service and cluster level customization in client 2018-11-08 16:34:18 +08:00
nkorange
3c608ab2e5 Fix #241 2018-11-08 16:28:36 +08:00
water.lyl
7fdd80cc31 update version to 0.4.0 2018-11-05 20:34:37 +08:00
nkorange
1a9a282682 #176 Bypass local cache at client start by default. 2018-10-31 17:14:17 +08:00
nkorange
6e3f2ba31a Merge branch 'master' into develop 2018-10-31 15:42:23 +08:00
nkorange
3e01285ab7 Merge branch 'hotfix-clientbeat-lose-info' into raft-performance 2018-10-30 20:11:30 +08:00
nkorange
dc7cb2bdee Fix #190 2018-10-30 17:59:05 +08:00
water.lyl
563105ae4f Fix #106 2018-10-30 17:52:01 +08:00
nkorange
aa7e2e41e7 remove ip use weak raft 2018-10-30 16:16:01 +08:00
nkorange
ceb2787944 Merge branch 'hotfix-register-hangs' into raft-performance 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	pom.xml
#	test/pom.xml
 2018-10-30 08:54:50 +08:00
nkorange
6466218baf Raft performance improved. 2018-10-29 20:34:12 +08:00
xuechaos
077c4cdb6f release Nacos 0.3.0, update version to 0.3.0 2018-10-26 21:55:05 +08:00
nkorange
abdc48fc84 Fix register instance with customized cluster name failed bug. 2018-10-25 15:56:02 +08:00
nkorange
855037cac6 Fix client side health check error 2018-10-25 13:22:22 +08:00
wyp12
1cf0a5b731 Merge remote-tracking branch 'origin/hotfix-clientbeat-failed' into feature_ServiceMesh 2018-10-24 18:00:02 +08:00
nkorange
f4e8684fdf Fix #149 2018-10-24 17:54:34 +08:00
wyp12
5cc9137d66 update 2018-10-23 14:56:26 +08:00
xuechaos
1fbcf24521 update 0.3.0-RC1 uppercase letter 2018-10-19 18:36:29 +08:00
nkorange
c63f5899f6 Fix #139 2018-10-19 16:55:44 +08:00
nkorange
6da8bf89fc Resolve conflicts and fix log error 2018-10-18 22:23:26 +08:00
nkorange
534995a405 Resolve conflicts 2018-10-18 18:59:45 +08:00
nkorange
baa8594fe7 Merge branch 'master' into 0.3.0 
# Conflicts:
#	api/pom.xml
#	config/pom.xml
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
#	console/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	naming/src/main/resources/application.properties
 2018-10-18 17:11:32 +08:00
wyp12
251b2f01d8 merge master 2018-10-17 19:45:35 +08:00
aCoder2013
a11d205fce Fix potential NPE 2018-10-16 21:07:55 +08:00
小马哥
5c3ebf8f9f
Merge branch 'master' into 0.2.2 2018-10-15 17:10:48 +08:00
nkorange
71cf53361f Fix test failed bug 2018-10-14 12:07:50 +08:00