zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #818 from pbting/feature_support_ans

Browse Source 
Support higher priority system properties for NamingService
This commit is contained in:
Fury Zhu 2019-02-22 18:44:06 +08:00 committed by GitHub
commit 3e1225b373
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
api/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java
View File

@ -22,10 +22,6 @@ package com.alibaba.nacos.api;
*/
public class PropertyKeyConst {
public final static String SERVER_PORT = "serverPort";
public final static String WEB_CONTEXT = "webContext";
public final static String ENDPOINT = "endpoint";
public final static String NAMESPACE = "namespace";

31
api/src/main/java/com/alibaba/nacos/api/SystemPropertyKeyConst.java Normal file
View File

@ -0,0 +1,31 @@
/*
* Copyright (C) 2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.nacos.api;
/**
* Properties that are preferred to which in {@link PropertyKeyConst}
*
* @author pbting
* @date 2019-02-22 3:38 PM
*/
public interface SystemPropertyKeyConst {
String NAMING_SERVER_PORT = "nacos.naming.exposed.port";
String NAMING_WEB_CONTEXT = "nacos.naming.web.context";
String NACOS_NAMING_REQUEST_MODULE = "nacos.naming.request.module";
}

2
client/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

3
client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
View File

@ -16,6 +16,7 @@
package com.alibaba.nacos.client.naming;
import com.alibaba.nacos.api.PropertyKeyConst;
import com.alibaba.nacos.api.SystemPropertyKeyConst;
import com.alibaba.nacos.api.common.Constants;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
@ -154,7 +155,7 @@ public class NacosNamingService implements NamingService {
private void initWebRootContext() {
// support the web context with ali-yun if the app deploy by EDAS
String webContext = System.getProperties().getProperty(PropertyKeyConst.WEB_CONTEXT);
String webContext = System.getProperties().getProperty(SystemPropertyKeyConst.NAMING_WEB_CONTEXT);
if (StringUtils.isNotEmpty(webContext)) {
UtilAndComs.WEB_CONTEXT = webContext.indexOf("/") > -1 ? webContext
: "/" + webContext;

8
client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
View File

@ -18,7 +18,7 @@ package com.alibaba.nacos.client.naming.net;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.alibaba.nacos.api.PropertyKeyConst;
import com.alibaba.nacos.api.SystemPropertyKeyConst;
import com.alibaba.nacos.api.common.Constants;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.pojo.Instance;
@ -82,7 +82,7 @@ public class NamingProxy {
}
}
String serverPort = System.getProperties().getProperty(PropertyKeyConst.SERVER_PORT);
String serverPort = System.getProperties().getProperty(SystemPropertyKeyConst.NAMING_SERVER_PORT);
if (StringUtils.isNotEmpty(serverPort)) {
this.serverPort = Integer.valueOf(serverPort.trim());
}
@ -116,9 +116,11 @@ public class NamingProxy {
try {
String urlString = "http://" + endpoint + "/nacos/serverlist";
String nacosNamingMode = System.getProperty(SystemPropertyKeyConst.NACOS_NAMING_REQUEST_MODULE, "Naming");
List<String> headers = Arrays.asList("Client-Version", UtilAndComs.VERSION,
"Accept-Encoding", "gzip,deflate,sdch", "Connection", "Keep-Alive",
"RequestId", UuidUtils.generateUuid());
"RequestId", UuidUtils.generateUuid(), "Request-Module", nacosNamingMode);
HttpClient.HttpResult result = HttpClient.httpGet(urlString, headers, null,
UtilAndComs.ENCODING);

2
cmdb/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<artifactId>nacos-all</artifactId>
<groupId>com.alibaba.nacos</groupId>
<version>0.8.1</version>
<version>0.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
common/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
config/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
console/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
</parent>
<artifactId>nacos-console</artifactId>
<!--<packaging>war</packaging>-->

2
core/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
distribution/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
example/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
naming/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
pom.xml
View File

@ -21,7 +21,7 @@
<inceptionYear>2018</inceptionYear>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
<packaging>pom</packaging>
<name>Alibaba NACOS ${project.version}</name>

2
test/pom.xml
View File

@ -17,7 +17,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>