diff --git a/zyplayer-doc-db/pom.xml b/zyplayer-doc-db/pom.xml index 738f2f47..447e6685 100644 --- a/zyplayer-doc-db/pom.xml +++ b/zyplayer-doc-db/pom.xml @@ -21,7 +21,7 @@ 2018-05-22 16:06:06 - + org.springframework.boot spring-boot-starter-parent @@ -77,12 +77,12 @@ ${zyplayer.doc.version} - + UTF-8 UTF-8 1.8 - 1.0.2zyplayer.doc.version> + 1.0.2 true ${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version} @@ -233,4 +233,4 @@ - \ No newline at end of file + diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java index eaa47d4b..06089c14 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java @@ -111,16 +111,21 @@ public class DubboController { @PostMapping(value = "/reloadService") public DocResponseJson loadService() throws Exception { List providerList; - if (StringUtils.isBlank(serviceZookeeperUrl)) { - if (StringUtils.isBlank(nacosUrl) || StringUtils.isBlank(nacosService)) { - return DocResponseJson.warn("zyplayer.doc.dubbo.zookeeper.url、zyplayer.doc.dubbo.nacos.url 参数均未配置"); + try { + if (StringUtils.isBlank(serviceZookeeperUrl)) { + 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配置"); - providerList = this.getDubboInfoByNacos(); - } else { - providerList = this.getDubboInfoByZookeeper(); + mgDubboStorageService.put(StorageKeys.DUBBO_SERVICE_LIST, JSON.toJSONString(providerList)); + } catch (Exception e) { + e.printStackTrace(); + return DocResponseJson.warn("获取服务列表失败"); } - mgDubboStorageService.put(StorageKeys.DUBBO_SERVICE_LIST, JSON.toJSONString(providerList)); return DocResponseJson.ok(); } diff --git a/zyplayer-doc-manage/pom.xml b/zyplayer-doc-manage/pom.xml index 21de1f31..08a8dfcc 100644 --- a/zyplayer-doc-manage/pom.xml +++ b/zyplayer-doc-manage/pom.xml @@ -118,13 +118,13 @@ com.zyplayer zyplayer-doc-swagger - ${zyplayer.doc.swagger.version} + ${zyplayer.doc.version} com.zyplayer - doc-console-page - ${zyplayer.doc.swagger.version} + console-page + ${zyplayer.doc.version} diff --git a/zyplayer-doc-page/console-page/pom.xml b/zyplayer-doc-page/console-page/pom.xml index 26124f28..145078cc 100644 --- a/zyplayer-doc-page/console-page/pom.xml +++ b/zyplayer-doc-page/console-page/pom.xml @@ -2,10 +2,10 @@ - + 4.0.0 com.zyplayer - doc-console-page + console-page 1.0.2 管理页面前端 https://gitee.com/zyplayer/zyplayer-doc @@ -20,19 +20,19 @@ 2018-05-22 16:06:06 - + UTF-8 UTF-8 1.8 - 1.0.2zyplayer.doc.version> + 1.0.2 true ${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version} - + - + @@ -45,7 +45,7 @@ scm:git@git.oschina.net:zyplayer/zyplayer-doc.git git@git.oschina.net:zyplayer/zyplayer-doc.git - + snapshots @@ -56,7 +56,7 @@ https://oss.sonatype.org/service/local/staging/deploy/maven2/ - + diff --git a/zyplayer-doc-page/pom.xml b/zyplayer-doc-page/pom.xml index 86df4648..c843bc96 100644 --- a/zyplayer-doc-page/pom.xml +++ b/zyplayer-doc-page/pom.xml @@ -2,9 +2,9 @@ - + com.zyplayer - doc-page + zyplayer-doc-page 1.0.2 4.0.0 pom @@ -13,4 +13,4 @@ console-page - \ No newline at end of file + diff --git a/zyplayer-doc-swagger/src/main/resources/document.html b/zyplayer-doc-swagger/src/main/resources/document.html index 2f672d8c..904be683 100644 --- a/zyplayer-doc-swagger/src/main/resources/document.html +++ b/zyplayer-doc-swagger/src/main/resources/document.html @@ -73,9 +73,9 @@ 支持多项目同时展示，多种文档目录的展示方案，多种自定义配置，满足各种使用习惯。 本项目是完全从头写的，所以有任何属性未解析到、UI上有何建议都能及时处理得到。 使用中您有任何的意见和建议都可到源码地址处反馈哦！
- 源码地址：zyplayer-doc-swagger（还有其他很多功能哦）， - 前端框架：zui（很不错）， - 我的网站：空间轴、自由发挥（都已很久未维护）
+ 源码地址：zyplayer-doc-swagger， + 前端框架：zui， + 我的网站：空间轴、自由发挥
diff --git a/zyplayer-doc-swagger/src/main/resources/webjars/zpages/docShowConfig.html b/zyplayer-doc-swagger/src/main/resources/webjars/zpages/docShowConfig.html index 066a6258..9f083f39 100644 --- a/zyplayer-doc-swagger/src/main/resources/webjars/zpages/docShowConfig.html +++ b/zyplayer-doc-swagger/src/main/resources/webjars/zpages/docShowConfig.html @@ -68,7 +68,7 @@ - 文档在本地，想调试线上接口就可以勾选此参数，“在线调试”处的请求地址强制改为：“文档地址管理”处配置的重写域名+接口地址 + 文档在本地，想调试线上接口就可以勾选此参数，这样“在线调试”处的请求地址就会被强制改为：“文档地址管理”处配置的重写域名+接口地址 @@ -108,7 +108,7 @@ } }, methods: { - + }, mounted: function(){ getStorage(cacheKeys.userSettings, function(data){