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 @@