From b05c2158de2570f8b7f2366c2ab952b614a0c9f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?= <806783409@qq.com> Date: Mon, 7 Sep 2020 21:07:30 +0800 Subject: [PATCH] =?UTF-8?q?wiki=E5=8E=86=E5=8F=B2=E6=94=AF=E6=8C=81push?= =?UTF-8?q?=E5=88=B0=E8=BF=9C=E7=A8=8B=E4=BB=93=E5=BA=93=EF=BC=8C=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/DocLoginOriginInterceptor.java | 2 +- .../support/ElasticSearchUtil.java | 6 +- .../doc/manage/task/SchedulerTask.java | 5 +- .../src/main/resources/application.yml | 10 +++- .../wiki-ui/src/views/page/Show.vue | 8 ++- .../wiki/controller/WikiPageController.java | 9 ++- .../doc/wiki/service/git/GitService.java | 56 +++++++++++++++---- .../{app.d1dc89b9.css => app.e1e856e7.css} | 2 +- ...ef05a2.css => chunk-07e56bb7.63072588.css} | 2 +- ...d2b8a1.css => chunk-5544a2b8.b3d0f39b.css} | 0 .../src/main/resources/doc-wiki.html | 2 +- .../src/main/resources/js/app.8a617a58.js | 1 - .../src/main/resources/js/app.9c54b8f0.js | 1 + ...9b21a8c7.js => chunk-009efa60.dbe73c24.js} | 0 ...74268f53.js => chunk-07e56bb7.e67dab8e.js} | 2 +- ...69ced152.js => chunk-34407190.0d583c2d.js} | 0 ...80332c84.js => chunk-4b763d50.1adcb2f6.js} | 0 ...a272f03c.js => chunk-5544a2b8.6714a421.js} | 0 ...54a578cc.js => chunk-578c28a7.6a10864d.js} | 0 ...1238356c.js => chunk-5dc97978.14484106.js} | 0 20 files changed, 78 insertions(+), 28 deletions(-) rename zyplayer-doc-wiki/src/main/resources/css/{app.d1dc89b9.css => app.e1e856e7.css} (61%) rename zyplayer-doc-wiki/src/main/resources/css/{chunk-07e56bb7.1eef05a2.css => chunk-07e56bb7.63072588.css} (65%) rename zyplayer-doc-wiki/src/main/resources/css/{chunk-5544a2b8.17d2b8a1.css => chunk-5544a2b8.b3d0f39b.css} (100%) delete mode 100644 zyplayer-doc-wiki/src/main/resources/js/app.8a617a58.js create mode 100644 zyplayer-doc-wiki/src/main/resources/js/app.9c54b8f0.js rename zyplayer-doc-wiki/src/main/resources/js/{chunk-009efa60.9b21a8c7.js => chunk-009efa60.dbe73c24.js} (100%) rename zyplayer-doc-wiki/src/main/resources/js/{chunk-07e56bb7.74268f53.js => chunk-07e56bb7.e67dab8e.js} (71%) rename zyplayer-doc-wiki/src/main/resources/js/{chunk-34407190.69ced152.js => chunk-34407190.0d583c2d.js} (100%) rename zyplayer-doc-wiki/src/main/resources/js/{chunk-4b763d50.80332c84.js => chunk-4b763d50.1adcb2f6.js} (100%) rename zyplayer-doc-wiki/src/main/resources/js/{chunk-5544a2b8.a272f03c.js => chunk-5544a2b8.6714a421.js} (100%) rename zyplayer-doc-wiki/src/main/resources/js/{chunk-578c28a7.54a578cc.js => chunk-578c28a7.6a10864d.js} (100%) rename zyplayer-doc-wiki/src/main/resources/js/{chunk-5dc97978.1238356c.js => chunk-5dc97978.14484106.js} (100%) diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/DocLoginOriginInterceptor.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/DocLoginOriginInterceptor.java index 87d697b9..810a0421 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/DocLoginOriginInterceptor.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/config/DocLoginOriginInterceptor.java @@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletResponse; @Component public class DocLoginOriginInterceptor implements HandlerInterceptor { - @Value("${zyplayer.doc.manage.originDomainRegex:''}") + @Value("${zyplayer.doc.manage.originDomainRegex:}") private String originDomainRegex; @Override diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/ElasticSearchUtil.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/ElasticSearchUtil.java index 9bffb8c0..7a555402 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/ElasticSearchUtil.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/ElasticSearchUtil.java @@ -24,11 +24,11 @@ import java.util.concurrent.ConcurrentHashMap; public class ElasticSearchUtil { private static Logger logger = LoggerFactory.getLogger(ElasticSearchUtil.class); - @Value(value = "${zyplayer.doc.manage.elasticsearch.hostPort:''}") + @Value(value = "${zyplayer.doc.manage.elasticsearch.hostPort:}") private String hostAndPort; - @Value(value = "${zyplayer.doc.manage.elasticsearch.scheme:''}") + @Value(value = "${zyplayer.doc.manage.elasticsearch.scheme:}") private String esScheme; - @Value("${zyplayer.doc.manage.elasticsearch.open:''}") + @Value("${zyplayer.doc.manage.elasticsearch.open:}") private String elasticsearchOpen; private static final Object createLock = new Object(); diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/SchedulerTask.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/SchedulerTask.java index 5c3f24d1..eca9ab5e 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/SchedulerTask.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/SchedulerTask.java @@ -10,7 +10,6 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; -import java.io.IOException; import java.io.StringReader; import java.util.Objects; import java.util.Properties; @@ -18,9 +17,9 @@ import java.util.Properties; @Component public class SchedulerTask { - @Value("${zyplayer.doc.manage.version:''}") + @Value("${zyplayer.doc.manage.version:}") private String nowVersion; - @Value("${zyplayer.doc.manage.upgradePropertiesUrl:''}") + @Value("${zyplayer.doc.manage.upgradePropertiesUrl:}") private String upgradePropertiesUrl; @PostConstruct diff --git a/zyplayer-doc-manage/src/main/resources/application.yml b/zyplayer-doc-manage/src/main/resources/application.yml index b8337f39..5f9cc568 100644 --- a/zyplayer-doc-manage/src/main/resources/application.yml +++ b/zyplayer-doc-manage/src/main/resources/application.yml @@ -46,7 +46,15 @@ zyplayer: # 是否检查目录有被系统定期清理的风险,强烈建议开启 upload-path-check: true # git本地仓库地址,用于管理WIKI的历史版本 - git-file-path: d:/zyplayerDoc/wikiGitFiles + git-local-path: d:/zyplayerDoc/wikiGitFiles + # git远程仓库地址,可选配置项,如果存在则会每次修改后push到此仓库,必须先创建远程仓库,项目初始化时会去拉取 + # 如果没有配置此项,则只会在维护一个本地的git仓库,使用简单 + # 例:https://gitee.com/zyplayer/zyplayer-doc-wiki-files.git + git-remote-url: + # git远程仓库登录账号 + git-remote-username: + # git远程仓库登录密码 + git-remote-password: # ------swagger相关配置------ swagger: proxy-request: diff --git a/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue b/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue index 1d27d336..6c0fcff1 100644 --- a/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue +++ b/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue @@ -140,12 +140,13 @@