Merge branch 'upstream-develop'

README.md

@@ -76,6 +76,12 @@ You can view full documentation on the Nacos website:
 
 * [nacos.io](https://nacos.io/en-us/docs/what-is-nacos.html)
 
+### Other Related Project Repositories
+
+* [nacos-spring-project](https://github.com/nacos-group/nacos-spring-project) provides the integration functionality for Spring.
+* [nacos-sync](https://github.com/nacos-group/nacos-sync) is a tool to synchronize the service registration information from other tools like eureka, zookeeper, etc, to Nacos.
+* [spring-cloud-alibaba](https://github.com/spring-cloud-incubator/spring-cloud-alibaba) provides the one-stop solution for application development over Alibaba middleware which includes Nacos.
+
 ### Contact
 
 * #### Gitter-[Nacos Gitter](https://gitter.im/alibaba/nacos)

console/src/main/resources/static/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js

@@ -65,6 +65,10 @@ class ListeningToQuery extends React.Component {
         if (type === 1) {
             var ip = this.getValue('ip');
             queryUrl = `/nacos/v1/cs/listener?ip=${ip}`;
+            let tenant = window.nownamespace || getParams('namespace') || '';
+            if (tenant) {
+                queryUrl += '&tenant=' + tenant;
+            }
         } else {
             var dataId = this.getValue('dataId');
             var group = this.getValue('group');

console/src/main/resources/static/src/pages/ServiceManagement/ServiceList/ServiceList.js

@@ -88,7 +88,7 @@ class ServiceList extends React.Component {
                             Message.error(res)
                             return
                         }
-                        this.props.queryServiceList()
+                        this.queryServiceList()
                     },
                     error: res => Message.error(res.responseText || res.statusText),
                     complete: () => this.closeLoading()