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

233 Commits

Author SHA1 Message Date
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