Commit Graph

491 Commits

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