7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
tanghc
2019-07-01 20:54:14 +08:00
parent b64539515e 6882ef5415
commit a8f22d681d
5 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/SopAdminConstants.java
View File

@@ -9,11 +9,6 @@ public class SopAdminConstants {
*/
public static final String SOP_SERVICE_ROUTE_PATH = "/com.gitee.sop.route";
/**
* zookeeper存放路由授权信息根目录
*/
public static final String SOP_ROUTE_PERMISSION_PATH = "/com.gitee.sop.isv.route.permission";
/**
* 消息监听路径
*/

5
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/bean/ZookeeperContext.java
View File

@@ -20,7 +20,6 @@ import java.util.Collections;
import java.util.List;
import static com.gitee.sop.adminserver.bean.SopAdminConstants.SOP_MSG_CHANNEL_PATH;
import static com.gitee.sop.adminserver.bean.SopAdminConstants.SOP_ROUTE_PERMISSION_PATH;
/**
* @author tanghc
@@ -77,10 +76,6 @@ public class ZookeeperContext {
return serviceIdPath + "/" + routeId;
}
public static String getRoutePermissionPath() {
return SOP_ROUTE_PERMISSION_PATH;
}
public static String getIsvInfoChannelPath() {
return SOP_MSG_CHANNEL_PATH + "/isvinfo";
}

5
sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/bean/SopConstants.java
View File

@@ -45,11 +45,6 @@ public class SopConstants {
*/
public static final String SOP_SERVICE_ROUTE_PATH = "/com.gitee.sop.route";
/**
* zookeeper存放路由授权信息根目录
*/
public static final String SOP_ROUTE_PERMISSION_PATH = "/com.gitee.sop.isv.route.permission";
/**
* 消息监听路径
*/

5
sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/ZookeeperContext.java
View File

@@ -18,7 +18,6 @@ import java.util.List;
import java.util.function.Consumer;
import static com.gitee.sop.gatewaycommon.bean.SopConstants.SOP_MSG_CHANNEL_PATH;
import static com.gitee.sop.gatewaycommon.bean.SopConstants.SOP_ROUTE_PERMISSION_PATH;
import static com.gitee.sop.gatewaycommon.bean.SopConstants.SOP_SERVICE_ROUTE_PATH;
/**
@@ -60,10 +59,6 @@ public class ZookeeperContext {
return SOP_SERVICE_ROUTE_PATH;
}
public static String getRoutePermissionPath() {
return SOP_ROUTE_PERMISSION_PATH;
}
public static String getIsvInfoChannelPath() {
return SOP_MSG_CHANNEL_PATH + "/isvinfo";
}

2
sop-website/website-server/src/main/java/com/gitee/sop/websiteserver/manager/DocManagerImpl.java
View File

@@ -86,7 +86,7 @@ public class DocManagerImpl implements DocManager {
protected void loadDocInfo(ServiceInstance serviceInstance) {
String query = this.buildQuery();
String url = "http://" + serviceInstance.getIpPort() + "/v2/api-docs" + query;
String url = "http://" + serviceInstance.getIp() + ":" + serviceInstance.getPort() + "/v2/api-docs" + query;
try {
log.info("读取swagger文档，url:{}", url);
ResponseEntity<String> entity = restTemplate.getForEntity(url, String.class);