Commit Graph

597 Commits

Author SHA1 Message Date
pbting
da8e09ff4b if not set the context path with the WebServerInitializedEvent then real '/' is context path 2019-08-06 15:45:53 +08:00
pbting
25a87a8e22 Subject to the actual startup context path 2019-08-06 15:39:16 +08:00
nkorange
11bd0ccd76 Update version to 1.1.2-SNAPSHOT 2019-08-02 12:35:04 +08:00
nkorange
d6c5a76dd1 Fix bug 2019-08-02 12:32:11 +08:00
赵禹光
6ecabd70e7 reverse Service Name and Group Name 2019-08-01 21:37:26 +08:00
赵禹光
3085bcf67e Unified constant use 2019-08-01 21:00:24 +08:00
赵禹光
6a9b414315 fix bug 2019-08-01 20:56:52 +08:00
赵禹光
408b36307d Delete the code that caused the list multi-element 2019-08-01 20:30:10 +08:00
赵禹光
d9d79dd21c Remove unnecessary code 2019-08-01 20:28:33 +08:00
赵禹光
8d2711ae60 revert error code 2019-08-01 20:26:23 +08:00
赵禹光
87850d46b8 Merge commit 'df82ed3c296b12c3731badc40b1f881e5f1c183b' into zen5
# Conflicts:
#	console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js
#	console/src/main/resources/static/js/main.js
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
2019-08-01 19:55:10 +08:00
Fury Zhu
bf3e822d5b
Merge pull request #1576 from zhaoyuguang/fix-1535-1
FIX close: 1535 Add a button to hide the empty service on console at service list page
2019-08-01 15:52:25 +08:00
赵禹光
9745e87079 clear code 2019-08-01 15:38:05 +08:00
赵禹光
50fb50e6a1 no message 2019-08-01 12:33:29 +08:00
赵禹光
a5b67493e8 Merge commit '838ef83f9f19d25a9f29c808d77d7ea4a6854ee2' into fix-1535-1
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
2019-08-01 11:16:43 +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
赵禹光
cc27d67ef9 没有过滤条件直接返回原始Service列表 2019-08-01 09:33:49 +08:00
赵禹光
22b0ed7cc0 fix CI 2019-07-31 21:09:21 +08:00
赵禹光
ee0c469471 后端支持 2019-07-31 21:03:49 +08:00
pbting
3d1cf6e092 Merge branch 'upstream_develop' into feature_enhance_interface 2019-07-31 16:25:56 +08:00
Fury Zhu
e5df89fde1
Merge pull request #1623 from nkorange/feature_forbid_invalid_namespace
Fix namespace vulnerability
2019-07-30 16:36:36 +08:00
Fury Zhu
1c68568f4d
Merge pull request #1587 from rushsky518/develop
distro use local time to record heartbeat
2019-07-30 16:35:16 +08:00
赵禹光
de49db7ee6 Merge commit 'dea95fa11af55f3da8bc6d4cfe3e1ee8842cb9ee' into zen5
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
2019-07-30 15:48:37 +08:00
nkorange
207e54631c Fix namespace vulnerability 2019-07-30 00:40:21 +08:00
nkorange
e5d0d66492 Fix #1591 2019-07-26 17:10:02 +08:00
nkorange
8d453e62a8 Fix #1591 2019-07-23 16:36:55 +08:00
rushsky518
e259dc34e8 #1529
distro 使用本地时间记录心跳
2019-07-22 19:24:46 +08:00
pbting
2e2f480c06 add method for ServiceManager with putServiceIfAbsent 2019-07-18 16:28:12 +08:00
pbting
13784d6217 support when instance heartbeat timeout will publish an event 2019-07-18 15:00:30 +08:00
nkorange
1711c3765f Fix #290 2019-07-15 15:47:02 +08:00
赵禹光
31e81e05f6 Merge commit '06304f583c27034337c16babfb99bbf004b78191' into zen5 2019-07-12 23:38:54 +08:00
赵禹光
7d0aebccbc fix 1541 2019-07-12 23:38:35 +08:00
pbting
d5bd6b4927 enhance serviceManager#removeInstance interface 2019-07-12 17:20:39 +08:00
赵禹光
fb5a352ec6 fmt 2019-07-11 20:24:13 +08:00
赵禹光
ff804eb340 ClientBeatCheckTask.java useless import 2019-07-11 20:14:04 +08:00
得少
14ac4ac1d1 support ServiceChangeEvent 2019-07-10 17:49:34 +08:00
nkorange
1915e9c087 Fix NPE 2019-07-09 18:59:52 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
得少
48918cbbc7 change the design for nacos address 2019-07-04 21:50:43 +08:00
得少
7f97289340 Merge branch 'develop' into feature_address_server 2019-07-04 15:07:03 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
得少
7336a8b7f5 fix #1458
support address server mode ,so nacos client will use the endpoint to initializer
2019-07-01 23:08:08 +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
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
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
Fury Zhu
fac3dc8a23
Merge branch 'develop' into charset 2019-06-27 18:50:57 +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
Fury Zhu
57b0fe3b52
Merge pull request #1414 from IanCao/fix11
【issue】#1278
2019-06-24 14:21:22 +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
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
1decd04008 #1278 2019-06-21 11:41:55 +08:00
IanCao
490f194b82 server update client interval 2019-06-20 17:53:28 +08:00
Fury Zhu
490e93ddcf
Merge pull request #1402 from slievrly/optimize
remove unused import
2019-06-20 13:58:50 +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
nkorange
b52ba3ed91 Fix #1397 2019-06-19 17:57:26 +08:00
Fury Zhu
cca2ca9752
Merge pull request #1373 from IanCao/fix11
Just return empty instance list if service not found #1367
2019-06-19 15:34:17 +08:00
IanCao
e6631316b4 add ClientBeatCheckTaskTest junit test 2019-06-18 17:32:14 +08:00
Fury Zhu
d5e8ef5063
Merge branch 'develop' into study 2019-06-18 10:47:21 +08:00
IanCao
6b4a9b72a5 fix bug 2019-06-17 18:07:54 +08:00
Fury Zhu
5fba6242ef
Merge pull request #1297 from Nicholas2015/feature_get_subscribers
Feature get subscribers
2019-06-17 17:24:47 +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
838eb60cc5 add testcase 2019-06-14 17:46:42 +08:00
IanCao
581e732305 Just return empty instance list if service not found #1367 2019-06-14 17:40:33 +08:00
Nicholas2015
13331c50d1 add assert 2019-06-13 22:41:54 +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
a7f3cabf3c Update version to 1.0.1-SNAPSHOT 2019-06-11 17:04:36 +08:00
IanCao
ba7cbf1a7f FIX BUG 2019-06-11 16:34:34 +08:00
IanCao
63560370ae Different instance has different TTL. 2019-06-11 14:40:28 +08:00
Fury Zhu
4ad21f2dae
Merge branch 'develop' into master 2019-06-10 16:24:16 +08:00
Fury Zhu
555e323302
Merge pull request #1258 from universefeeler/master
[ISSUE #876] feature(console):support console show cluster node state
2019-06-10 16:16:36 +08:00
IanCao
574a47ca6d remove useless code 2019-06-10 16:05:52 +08:00
IanCao
eee5b34d39 format code 2019-06-10 15:38:58 +08:00
Nicholas2015
6be91e9b45 add assert 2019-06-09 21:33:56 +08:00
Nicholas2015
e1c1b32ae7 add assert 2019-06-09 20:27:16 +08:00
Nicholas2015
7d52d47f74 add test case 2019-06-08 20:52:10 +08:00
universefeeler
d08557a725 chore(clusterNode): adjust some code 2019-06-07 00:19:25 +08:00
Nicholas2015
dc61375c29 common params to constant 2019-06-05 21:48:25 +08:00
nkorange
6521aa3783 Fix #1334 2019-06-05 17:54:25 +08:00
universefeeler
4fe09db8ab fixed(naming): add licensed for ClusterStateView.java 2019-06-05 14:56:34 +08:00
universefeeler
ef8e1aac36 Merge remote-tracking branch 'upstream/develop' 2019-06-04 23:43:37 +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
Nicholas2015
bbb2108fd2 code format and some code detail 2019-06-04 17:10:27 +08:00
Fury Zhu
403e9b830a
Merge pull request #1303 from IanCao/master
close stream safety & format code
2019-06-04 16:12:03 +08:00
Fury Zhu
f2c061040c
Merge pull request #1309 from IanCao/fixbug2
FIX #1308
2019-06-04 16:09:30 +08:00
nkorange
fbc72f0def Close #1319 2019-06-04 15:03:05 +08:00
IanCao
dd8ee44d65 fix 2019-05-31 16:14:58 +08:00
IanCao
40188f5eda fix bug 2019-05-31 15:38:34 +08:00
IanCao
8acce1c5e2 format code 2019-05-31 15:28:34 +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
Nicholas2015
20af90b821 add license 2019-05-29 22:54:35 +08:00
Nicholas2015
f6d4ee1252 get subscriber list 2019-05-26 23:43:58 +08:00
universefeeler
c15276cfcb [ISSUE #876] feature(console):support console show cluster node state 2019-05-23 02:41:41 +08:00
Fury Zhu
dd029a913a
Merge pull request #1240 from nkorange/feature_enable_to_enabled
Fix #1007
2019-05-20 19:24:57 +08:00
nkorange
3148ba0e91 Fix #1007 2019-05-20 12:39:43 +08:00
Andy
22310d0f18 Correct some unit test cases 2019-05-18 21:14:20 +08:00
Andy
2bb33878b9 Quick fixing for the cluster deserialization issue 2019-05-16 21:41:09 +08:00
Fury Zhu
1f1b047984
Merge pull request #1126 from XCXCXCXCX/ISSUE_#359
[#359] provide a way for user to implement their health checkers.
2019-05-12 11:04:14 +08:00
XCXCXCXCX
23454ffd84 fix something 2019-05-12 10:32:09 +08:00
XCXCXCXCX
6dc3882eef fix something 2019-05-10 13:47:22 +08:00
XCXCXCXCX
c137994384 fix pmd 2019-05-09 11:31:03 +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
dungu.zpf
33de06a55e Fix #1062 2019-05-09 10:18:12 +08:00
XCXCXCXCX
af8e0951ad expose endpoint for front 2019-05-09 09:57:44 +08:00
XCXCXCXCX
6695805c69 Let nacos-server.jar import external jar package 2019-05-08 09:14:54 +08:00
Fury Zhu
968a69c260
Merge pull request #1151 from jifengnan/develop
[ISSUE #1150] Correct the Relationship between Services and Clusters
2019-05-08 08:22:25 +08:00
Andy
8e29a348a9 Deleted the chinese comments 2019-05-07 21:24:57 +08:00
XCXCXCXCX
ef7e250675 do not allow to add same type 2019-05-05 14:55:31 +08:00
Andy
4fd773b534 Rollback to use NamingUtils to grab service name and group name 2019-05-04 21:06:31 +08:00
chuntaojun
1b76780cd1 refactor(naming): Modify the inheritance of NoneSelector class 2019-04-30 19:08:16 +08:00
chuntaojun
f2c046a395 refactor(client): Service operation function module split 2019-04-30 17:46:10 +08:00
Fury Zhu
0ebc68c3ac
Merge pull request #1159 from alibaba/hotfix_server_list_inconsistent
Hotfix server list inconsistent
2019-04-30 17:23:27 +08:00
nkorange
3d684b6f56 Fix #1091 2019-04-30 16:18:35 +08:00
Andy
312b75bc1b Add licence info 2019-04-30 00:35:59 +08:00
Andy
22a2969593 1. 修正服务和集群之间的关系(Correct the relationship between the service and cluster)
2. 创建集群时必须提供名字和所属服务(The name and the service are required to create a cluster)
3. 修正UtilsAndCommons.shakeUp的注释
2019-04-30 00:14:51 +08:00
XCXCXCXCX
0d436deca0 fix something 2019-04-29 20:54:17 +08:00
XCXCXCXCX
5fec1098a9 fix about licence position 2019-04-28 09:35:39 +08:00
XCXCXCXCX
38f65089fd add license 2019-04-27 14:52:39 +08:00
XCXCXCXCX
6615ae8106 [#359] Use SPI to make health scalable 2019-04-27 13:55:04 +08:00
huangyonghui
b67956f0b4 add only digit and dot char for ip validation 2019-04-23 10:28:36 +08:00
Albert-Hugo
e6f82a940e remove useless validate code 2019-04-20 10:35:01 +08:00
huangyonghui
2cb387892a to support registering instance with host name 2019-04-19 11:52:15 +08:00
Fury Zhu
96e8e142f9
Merge pull request #1067 from paulzhangcc/feature-fix-1036
fix-1036
2019-04-16 15:55:48 +08:00
nkorange
a87cc12d47 Update version to 1.0.0 2019-04-15 20:01:34 +08:00
paulzhangcc
1a41ab6cfb fix-1036 :获取真正的GroupName,并设置.替代默认值 2019-04-15 18:17:41 +08:00
nkorange
699bdcb6dc Update to 1.0.0-SNAPSHOT 2019-04-15 16:36:10 +08:00
peachyy
67b7fc3497
Merge branch 'develop' into master 2019-04-15 14:10:38 +08:00
nkorange
eca0ea5760 Add log 2019-04-15 10:49:41 +08:00
得少
427a746e82 change the default value of isUseEndpointParsingRule from false to true 2019-04-12 12:49:46 +08:00
peachyy
2119aa1bdd add testcase 2019-04-11 14:46:08 +08:00
nkorange
ec7c119a72 Fix test case error 2019-04-11 00:09:14 +08:00
nkorange
3c1c98aaf1 Update version to 1.0.0 2019-04-10 22:04:27 +08:00
Fury Zhu
3d94644eb4
Merge pull request #1043 from alibaba/hotfix_recognize_080_data
Hotfix recognize 080 data
2019-04-10 21:07:40 +08:00
nkorange
278aa7eb31 Fix #923 2019-04-10 20:10:55 +08:00
nkorange
8d9b91e712 Fix #1041 2019-04-10 20:03:52 +08:00
nkorange
857f9bd15e Fix #1033 2019-04-10 11:29:05 +08:00
nkorange
026c430512 Fix #1029 2019-04-09 19:56:48 +08:00
nkorange
cab10aa914 Merge branch 'master' into develop
# 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
#	pom.xml
#	test/pom.xml
2019-04-09 16:30:03 +08:00