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-06-27 22:56:40 +08:00
parent f144e77035
commit eb7112b956
7 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zyplayer-doc-db/pom.xml
View File

@@ -82,7 +82,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<zyplayer.doc.version<version>1.0.2</version>zyplayer.doc.version> <zyplayer.doc.version>1.0.2</zyplayer.doc.version>
<!-- 打包跳过单元测试 --> <!-- 打包跳过单元测试 -->
<skipTests>true</skipTests> <skipTests>true</skipTests>
<destDir>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</destDir> <destDir>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</destDir>

21
zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java
View File

@@ -111,16 +111,21 @@ public class DubboController {
@PostMapping(value = "/reloadService") @PostMapping(value = "/reloadService")
public DocResponseJson loadService() throws Exception { public DocResponseJson loadService() throws Exception {
List<DubboInfo> providerList; List<DubboInfo> providerList;
if (StringUtils.isBlank(serviceZookeeperUrl)) { try {
if (StringUtils.isBlank(nacosUrl) || StringUtils.isBlank(nacosService)) { if (StringUtils.isBlank(serviceZookeeperUrl)) {
return DocResponseJson.warn("zyplayer.doc.dubbo.zookeeper.url、zyplayer.doc.dubbo.nacos.url 参数均未配置"); if (StringUtils.isBlank(nacosUrl) || StringUtils.isBlank(nacosService)) {
return DocResponseJson.warn("zyplayer.doc.dubbo.zookeeper.url、zyplayer.doc.dubbo.nacos.url 参数均未配置");
}
logger.info("zookeeper参数未配置，使用nacos配置");
providerList = this.getDubboInfoByNacos();
} else {
providerList = this.getDubboInfoByZookeeper();
} }
logger.info("zookeeper参数未配置，使用nacos配置"); mgDubboStorageService.put(StorageKeys.DUBBO_SERVICE_LIST, JSON.toJSONString(providerList));
providerList = this.getDubboInfoByNacos(); } catch (Exception e) {
} else { e.printStackTrace();
providerList = this.getDubboInfoByZookeeper(); return DocResponseJson.warn("获取服务列表失败");
} }
mgDubboStorageService.put(StorageKeys.DUBBO_SERVICE_LIST, JSON.toJSONString(providerList));
return DocResponseJson.ok(); return DocResponseJson.ok();
} }

6
zyplayer-doc-manage/pom.xml
View File

@@ -118,13 +118,13 @@
<dependency> <dependency>
<groupId>com.zyplayer</groupId> <groupId>com.zyplayer</groupId>
<artifactId>zyplayer-doc-swagger</artifactId> <artifactId>zyplayer-doc-swagger</artifactId>
<version>${zyplayer.doc.swagger.version}</version> <version>${zyplayer.doc.version}</version>
</dependency> </dependency>
<!--zyplayer-doc-swagger--> <!--zyplayer-doc-swagger-->
<dependency> <dependency>
<groupId>com.zyplayer</groupId> <groupId>com.zyplayer</groupId>
<artifactId>doc-console-page</artifactId> <artifactId>console-page</artifactId>
<version>${zyplayer.doc.swagger.version}</version> <version>${zyplayer.doc.version}</version>
</dependency> </dependency>
<!--swagger-bootstrap-ui--> <!--swagger-bootstrap-ui-->
<dependency> <dependency>

4
zyplayer-doc-page/console-page/pom.xml
View File

@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.zyplayer</groupId> <groupId>com.zyplayer</groupId>
<artifactId>doc-console-page</artifactId> <artifactId>console-page</artifactId>
<version>1.0.2</version> <version>1.0.2</version>
<description>管理页面前端</description> <description>管理页面前端</description>
<url>https://gitee.com/zyplayer/zyplayer-doc</url> <url>https://gitee.com/zyplayer/zyplayer-doc</url>
@@ -25,7 +25,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<zyplayer.doc.version<version>1.0.2</version>zyplayer.doc.version> <zyplayer.doc.version>1.0.2</zyplayer.doc.version>
<!-- 打包跳过单元测试 --> <!-- 打包跳过单元测试 -->
<skipTests>true</skipTests> <skipTests>true</skipTests>
<destDir>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</destDir> <destDir>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</destDir>

2
zyplayer-doc-page/pom.xml
View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>com.zyplayer</groupId> <groupId>com.zyplayer</groupId>
<artifactId>doc-page</artifactId> <artifactId>zyplayer-doc-page</artifactId>
<version>1.0.2</version> <version>1.0.2</version>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

6
zyplayer-doc-swagger/src/main/resources/document.html
View File

@@ -73,9 +73,9 @@
支持多项目同时展示，多种文档目录的展示方案，多种自定义配置，满足各种使用习惯。 支持多项目同时展示，多种文档目录的展示方案，多种自定义配置，满足各种使用习惯。
本项目是完全从头写的，所以有任何属性未解析到、UI上有何建议都能及时处理得到。 本项目是完全从头写的，所以有任何属性未解析到、UI上有何建议都能及时处理得到。
使用中您有任何的意见和建议都可到源码地址处反馈哦！<br/> 使用中您有任何的意见和建议都可到源码地址处反馈哦！<br/>
源码地址：<a target="_blank" href="https://gitee.com/zyplayer/zyplayer-doc">zyplayer-doc-swagger</a>（还有其他很多功能哦）， 源码地址：<a target="_blank" href="https://gitee.com/zyplayer/zyplayer-doc">zyplayer-doc-swagger</a>，
前端框架：<a target="_blank" href="http://zui.sexy">zui</a>（很不错）， 前端框架：<a target="_blank" href="http://zui.sexy">zui</a>，
我的网站：<a target="_blank" href="http://kongjianzhou.com">空间轴</a>、<a target="_blank" href="http://zyplayer.com">自由发挥</a>（都已很久未维护）<br/> 我的网站：<a target="_blank" href="http://kongjianzhou.com">空间轴</a>、<a target="_blank" href="http://zyplayer.com">自由发挥</a><br/>
<div id="upgradeInfoBox"></div> <div id="upgradeInfoBox"></div>
</div> </div>
</div> </div>

2
zyplayer-doc-swagger/src/main/resources/webjars/zpages/docShowConfig.html
View File

@@ -68,7 +68,7 @@
<label><input type="radio" name="forceRewriteDomain" value="1" v-model="forceRewriteDomain">是</label> <label><input type="radio" name="forceRewriteDomain" value="1" v-model="forceRewriteDomain">是</label>
<label><input type="radio" name="forceRewriteDomain" value="0" v-model="forceRewriteDomain">否</label> <label><input type="radio" name="forceRewriteDomain" value="0" v-model="forceRewriteDomain">否</label>
</td> </td>
<td>文档在本地，想调试线上接口就可以勾选此参数，“在线调试”处的请求地址强制改为：“文档地址管理”处配置的重写域名+接口地址</td> <td>文档在本地，想调试线上接口就可以勾选此参数，这样“在线调试”处的请求地址就会被强制改为：“文档地址管理”处配置的重写域名+接口地址</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>