manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

开放文档逻辑修改，增加开关

Browse Source
This commit is contained in:
暮光：城中城
2019-01-30 23:10:28 +08:00
parent 496bb0d106
commit 620c7d02e8
5 changed files with 64 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java
View File

@@ -290,7 +290,7 @@ public class MgDocumentController {
* @return 添加结果
*/
@PostMapping(value = "/addSwaggerResources")
public ResponseJson<Object> addSwaggerResources(String resourcesUrl, String rewriteDomainUrl, String oldUrl) {
public ResponseJson<Object> addSwaggerResources(String resourcesUrl, String rewriteDomainUrl, String oldUrl, Integer openVisit) {
String swaggerResourcesStr = storageService.get(StorageKeys.SWAGGER_RESOURCES_LIST);
// 转成set，防止重复
List<SwaggerResourcesInfoVo> resourcesList = new LinkedList<>();
@@ -306,13 +306,13 @@ public class MgDocumentController {
oldUrl = this.encodeUrlParam(oldUrl);
resourcesUrl = this.encodeUrlParam(resourcesUrl);
String resourcesStr = HttpRequest.get(resourcesUrl).timeout(3000).execute().body();
boolean isLocation = this.addSwaggerLocationList(resourcesStr, rewriteDomainUrl, resourcesUrl, oldUrl);
boolean isLocation = this.addSwaggerLocationList(resourcesStr, rewriteDomainUrl, resourcesUrl, oldUrl, openVisit);
if (!isLocation) {
List<SwaggerResource> resourceList = JSON.parseArray(resourcesStr, SwaggerResource.class);
if (resourceList == null || resourceList.isEmpty()) {
return DocResponseJson.warn("该地址未找到文档");
}
this.addSwaggerLocationList(resourceList, resourcesUrl);
this.addSwaggerLocationList(resourceList, resourcesUrl, rewriteDomainUrl, openVisit);
SwaggerResourcesInfoVo resourcesInfoVo = new SwaggerResourcesInfoVo(resourcesUrl, resourceList);
resourcesInfoVo.setRewriteDomainUrl(rewriteDomainUrl);
resourcesList.add(resourcesInfoVo);
@@ -398,14 +398,24 @@ public class MgDocumentController {
/**
* 直接添加地址
*/
private boolean addSwaggerLocationList(String resourcesStr, String rewriteDomainUrl, String locationUrl, String oldUrl) {
private boolean addSwaggerLocationList(String resourcesStr, String rewriteDomainUrl, String locationUrl, String oldUrl, Integer openVisit) {
try {
SwaggerLocationVo swaggerLocationVo = JSON.parseObject(resourcesStr, SwaggerLocationVo.class);
if (swaggerLocationVo != null && StringUtils.isNotBlank(swaggerLocationVo.getSwagger())) {
List<LocationListVo> locationList = this.getLocationSet();
locationList = locationList.stream().filter(val -> !Objects.equals(val.getLocation(), oldUrl)).collect(Collectors.toList());
// 组装新的对象
LocationListVo locationListVo = new LocationListVo(locationUrl, "");
locationListVo.setRewriteDomainUrl(rewriteDomainUrl);
locationListVo.setOpenVisit(openVisit);
// 如果旧的不为空，使用旧的uuid
for (LocationListVo location : locationList) {
if (Objects.equals(location.getLocation(), oldUrl) && StringUtils.isNotBlank(location.getUuid())) {
locationListVo.setUuid(location.getUuid());
break;
}
}
// 去除旧的，加入新的
locationList = locationList.stream().filter(val -> !Objects.equals(val.getLocation(), oldUrl)).collect(Collectors.toList());
locationList.add(locationListVo);
this.storageSwaggerLocationList(locationList);
return true;
@@ -419,13 +429,16 @@ public class MgDocumentController {
/**
* 直接添加地址
*/
private void addSwaggerLocationList(List<SwaggerResource> resourceList, String resourcesUrl) {
private void addSwaggerLocationList(List<SwaggerResource> resourceList, String resourcesUrl, String rewriteDomainUrl, Integer openVisit) {
List<LocationListVo> locationList = this.getLocationSet();
// 加入到location列表
String resourcesDomain = resourcesUrl.substring(0, resourcesUrl.lastIndexOf("/") + 1);
for (SwaggerResource swaggerResource : resourceList) {
String location = this.getLocationUrl(resourcesDomain, swaggerResource.getLocation(), swaggerResource.getName());
locationList.add(new LocationListVo(location, resourcesUrl));
LocationListVo locationListVo = new LocationListVo(location, resourcesUrl);
locationListVo.setRewriteDomainUrl(rewriteDomainUrl);
locationListVo.setOpenVisit(openVisit);
locationList.add(locationListVo);
}
this.storageSwaggerLocationList(locationList);
}

5
zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgOpenDocController.java
View File

@@ -68,12 +68,15 @@ public class MgOpenDocController {
locationList = JSON.parseArray(swaggerLocationListStr, LocationListVo.class);
}
if (StringUtils.isNotBlank(choiceLocationList)) {
locationList = locationList.stream().filter(val -> Objects.equals(val.getUuid(), choiceLocationList)).collect(Collectors.toList());
// uuid相同而且开启了文档
locationList = locationList.stream().filter(val -> Objects.equals(val.getUuid(), choiceLocationList) && Objects.equals(val.getOpenVisit(), 1)).collect(Collectors.toList());
} else {
DocResponseJson.ok().send(response);
return;
}
if (locationList.size() <= 0) {
DocResponseJson.ok().send(response);
return;
}
List<String> swaggerResourceStrList = new LinkedList<>();
for (LocationListVo location : locationList) {

9
zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/vo/LocationListVo.java
View File

@@ -11,6 +11,7 @@ public class LocationListVo {
private String uuid;
private String location;
private String resources;
private Integer openVisit;
private String rewriteDomainUrl;
public LocationListVo(){
@@ -96,4 +97,12 @@ public class LocationListVo {
public void setUuid(String uuid) {
this.uuid = uuid;
}
public Integer getOpenVisit() {
return openVisit;
}
public void setOpenVisit(Integer openVisit) {
this.openVisit = openVisit;
}
}