wiki文档优化，系统升级信息获取和展示

upgrade.properties

@@ -1,6 +1,6 @@
 # 本文件用于已部署好的系统检测自己是否需要升级使用
 lastVersion=1.0.1
-upgradeContent=1、增加wiki文档模块;2、dubbo文档支持使用元数据生成参数和返回值;3、框架进行了大的拆分;4、增加升级通知;5、细节优化;
+upgradeContent=1、增加wiki文档模块；2、dubbo文档支持使用元数据生成参数和返回值；3、框架进行了大的拆分；4、增加升级通知；5、细节优化
 upgradeUrl=https://gitee.com/zyplayer/zyplayer-doc/releases
-nextStep=1、支持直接同步到git的文档;2、支持微信文章拉取;
+nextStep=1、支持直接同步到git的文档；2、支持微信文章拉取
 

zyplayer-doc-db/src/main/resources/doc-db.html

@@ -175,6 +175,22 @@
 									<a target="_blank" href="http://zyplayer.com">暮光：城中城</a>
 								</div>
 							</div>
+							<div class="form-group upgrade-info">
+								<label class="col-sm-2 no-padding">当前版本：</label>
+								<div class="col-md-10 col-sm-10" id="upgradeNowVersion"></div>
+							</div>
+							<div class="form-group upgrade-info">
+								<label class="col-sm-2 no-padding">最新版本：</label>
+								<div class="col-md-10 col-sm-10" id="upgradeLastVersion"></div>
+							</div>
+							<div class="form-group upgrade-info">
+								<label class="col-sm-2 no-padding">升级地址：</label>
+								<div class="col-md-10 col-sm-10" id="upgradeUrl"></div>
+							</div>
+							<div class="form-group upgrade-info">
+								<label class="col-sm-2 no-padding">升级内容：</label>
+								<div class="col-md-10 col-sm-10" id="upgradeContent"></div>
+							</div>
 							<div class="form-group">
 								<div class="col-sm-2 no-padding"></div>
 								<div class="col-md-10 col-sm-10">

zyplayer-doc-db/src/main/resources/webjars/doc-db/css/doc-db.css

@@ -1,41 +1,43 @@
-html,body{width: 100%;height: 100%;}
+html,body{width: 100%;height: 100%;}
-
+
-.container{padding-top: 20px;}
+.container{padding-top: 20px;}
-
+
-.table-info,.table-columns{margin-top: 10px;}
+.table-info,.table-columns{margin-top: 10px;}
-
+
-.table-info .desc{margin-top: 10px;}
+.table-info .desc{margin-top: 10px;}
-#tableDescInput{display: none;}
+#tableDescInput{display: none;}
-
+
-#tableDescShow .icon-edit{cursor: pointer;margin-left: 20px;display: none;}
+#tableDescShow .icon-edit{cursor: pointer;margin-left: 20px;display: none;}
-
+
-.modal-table-box{margin-top: 10px; max-height: 500px;overflow-y: auto;}
+.modal-table-box{margin-top: 10px; max-height: 500px;overflow-y: auto;}
-
+
-#fuzzySearchModal .table td:nth-child(3){word-break:break-all;max-width: 400px;}
+#fuzzySearchModal .table td:nth-child(3){word-break:break-all;max-width: 400px;}
-#doExport{margin-right: 10px;}
+#doExport{margin-right: 10px;}
-
+
-#exportModal .alert{margin-top: 10px;}
+#exportModal .alert{margin-top: 10px;}
-
+
-#exportUl{list-style: none;}
+#exportUl{list-style: none;}
-#exportUl li{float: left; border: 1px solid #ccc;padding: 10px 15px; margin: 0 10px 10px 0; background-color: #ccc;cursor: pointer;}
+#exportUl li{float: left; border: 1px solid #ccc;padding: 10px 15px; margin: 0 10px 10px 0; background-color: #ccc;cursor: pointer;}
-#exportUl li.checked{border: 1px solid #3f51b5;background-color: #8666b8;color:#fff;}
+#exportUl li.checked{border: 1px solid #3f51b5;background-color: #8666b8;color:#fff;}
-
+
-/* S-覆盖原生样式 */
+.upgrade-info{display: none;}
-.chosen-container-single .chosen-single div b {margin-top: 8px;}
+
-/* E-覆盖原生样式 */
+/* S-覆盖原生样式 */
-
+.chosen-container-single .chosen-single div b {margin-top: 8px;}
-/* S-JSON展示的样式 */
+/* E-覆盖原生样式 */
-pre.json{margin-top:0px;margin-bottom:0px;}
+
-pre.json .canvas{font:10pt georgia;background-color:#ececec;color:#000000;border:1px solid #cecece;}
+/* S-JSON展示的样式 */
-pre.json .objectBrace{color:#00aa00;font-weight:bold;}
+pre.json{margin-top:0px;margin-bottom:0px;}
-pre.json .arrayBrace{color:#0033ff;font-weight:bold;}
+pre.json .canvas{font:10pt georgia;background-color:#ececec;color:#000000;border:1px solid #cecece;}
-pre.json .propertyName{color:#cc0000;font-weight:bold;}
+pre.json .objectBrace{color:#00aa00;font-weight:bold;}
-pre.json .string{color:#007777;}
+pre.json .arrayBrace{color:#0033ff;font-weight:bold;}
-pre.json .number{color:#aa00aa;}
+pre.json .propertyName{color:#cc0000;font-weight:bold;}
-pre.json .boolean{color:#0000ff;}
+pre.json .string{color:#007777;}
-pre.json .function{color:#aa6633;text-decoration:italic;}
+pre.json .number{color:#aa00aa;}
-pre.json .null{color:#0000ff;}
+pre.json .boolean{color:#0000ff;}
-pre.json .comma{color:#000000;font-weight:bold;}
+pre.json .function{color:#aa6633;text-decoration:italic;}
-pre img{cursor: pointer;}
+pre.json .null{color:#0000ff;}
-/* E-JSON展示的样式 */
+pre.json .comma{color:#000000;font-weight:bold;}
-
+pre img{cursor: pointer;}
+/* E-JSON展示的样式 */
+

zyplayer-doc-db/src/main/resources/webjars/doc-db/js/doc-db.js

@@ -168,6 +168,7 @@ $(document).ready(function(){
 		}
 	});
 	initData();
+	checkSystemUpgrade();
 });
 
 function initData(){
@@ -375,3 +376,20 @@ function fuzzySearchByDesc(){
 	});
 }
 
+function checkSystemUpgrade() {
+	ajaxTemp("system/info/upgrade", "post", "json", {}, function (json) {
+		if (json.errCode == 200 && !!json.data) {
+			$(".upgrade-info").show();
+			$("#upgradeNowVersion").html(json.data.nowVersion);
+			$("#upgradeLastVersion").html(json.data.lastVersion);
+			$("#upgradeUrl").html("<a target='_blank' href='" + json.data.upgradeUrl + "'>" + json.data.upgradeUrl + "</a>");
+			$("#upgradeContent").html(json.data.upgradeContent);
+			console.log("zyplayer-doc发现新版本："
+				+ "\n升级地址：" + json.data.upgradeUrl
+				+ "\n当前版本：" + json.data.nowVersion
+				+ "\n最新版本：" + json.data.lastVersion
+				+ "\n升级内容：" + json.data.upgradeContent
+			);
+		}
+	});
+}

zyplayer-doc-dubbo/src/main/resources/doc-dubbo.html

@@ -162,6 +162,14 @@
 				<el-form-item label="开发人员：">
 					<a target="_blank" href="http://zyplayer.com">暮光：城中城</a>
 				</el-form-item>
+				<template v-if="upgradeInfo.lastVersion">
+					<el-form-item label="当前版本：">{{upgradeInfo.nowVersion}}</el-form-item>
+					<el-form-item label="最新版本：">{{upgradeInfo.lastVersion}}</el-form-item>
+					<el-form-item label="升级地址：">
+						<a target="_blank" :href="upgradeInfo.upgradeUrl">{{upgradeInfo.upgradeUrl}}</a>
+					</el-form-item>
+					<el-form-item label="升级内容：">{{upgradeInfo.upgradeContent}}</el-form-item>
+				</template>
 				<el-form-item label="">
 					欢迎加群讨论，QQ群号：466363173，欢迎提交需求，欢迎使用和加入开发！
 				</el-form-item>
@@ -219,6 +227,8 @@
 					value: 'java.lang.Integer'
 				}],
 				paramTypeValue: "java.lang.String",
+				// 升级信息
+				upgradeInfo: {},
 			}
 		},
 		watch: {
@@ -228,6 +238,7 @@
 			// 无论发布在哪、如何修改源码，请勿删除本行原作者信息，感谢
 			console.log("%c项目信息：\n开发者列表：暮光：城中城\n项目地址：https://gitee.com/zyplayer/zyplayer-doc", "color:red");
 			this.doGetServiceList();
+			this.checkSystemUpgrade();
 		},
 		methods: {
 			handleOpen(key, keyPath) {
@@ -423,7 +434,20 @@
 						app.requestResult = json.errMsg;
 					}
 				});
-			}
+			},
+			checkSystemUpgrade() {
+				ajaxTemp("system/info/upgrade", "post", "json", {}, function (json) {
+					if (json.errCode == 200 && !!json.data) {
+						app.upgradeInfo = json.data;
+						console.log("zyplayer-doc发现新版本："
+							+ "\n升级地址：" + json.data.upgradeUrl
+							+ "\n当前版本：" + json.data.nowVersion
+							+ "\n最新版本：" + json.data.lastVersion
+							+ "\n升级内容：" + json.data.upgradeContent
+						);
+					}
+				});
+			},
 		}
 	});
 

zyplayer-doc-grpc/src/main/resources/doc-grpc.html

@@ -93,6 +93,14 @@
 				<el-form-item label="开发人员：">
 					<a target="_blank" href="http://zyplayer.com">暮光：城中城</a>
 				</el-form-item>
+				<template v-if="upgradeInfo.lastVersion">
+					<el-form-item label="当前版本：">{{upgradeInfo.nowVersion}}</el-form-item>
+					<el-form-item label="最新版本：">{{upgradeInfo.lastVersion}}</el-form-item>
+					<el-form-item label="升级地址：">
+						<a target="_blank" :href="upgradeInfo.upgradeUrl">{{upgradeInfo.upgradeUrl}}</a>
+					</el-form-item>
+					<el-form-item label="升级内容：">{{upgradeInfo.upgradeContent}}</el-form-item>
+				</template>
 				<el-form-item label="">
 					欢迎加群讨论，QQ群号：466363173，欢迎提交需求，欢迎使用和加入开发！
 				</el-form-item>
@@ -149,6 +157,8 @@
 					value: 'java.lang.Integer'
 				}],
 				paramTypeValue: "java.lang.String",
+				// 升级信息
+				upgradeInfo: {},
 			}
 		},
 		watch: {
@@ -158,6 +168,7 @@
 			// 无论发布在哪、如何修改源码，请勿删除本行原作者信息，感谢
 			console.log("%c项目信息：\n项目地址：https://gitee.com/zyplayer/zyplayer-doc", "color:red");
 			this.doGetServiceList();
+			this.checkSystemUpgrade();
 		},
 		methods: {
 			handleOpen(key, keyPath) {
@@ -346,7 +357,20 @@
 					}
 				}
 				return requestResult;
-			}
+			},
+			checkSystemUpgrade() {
+				ajaxTemp("system/info/upgrade", "post", "json", {}, function (json) {
+					if (json.errCode == 200 && !!json.data) {
+						app.upgradeInfo = json.data;
+						console.log("zyplayer-doc发现新版本："
+							+ "\n升级地址：" + json.data.upgradeUrl
+							+ "\n当前版本：" + json.data.nowVersion
+							+ "\n最新版本：" + json.data.lastVersion
+							+ "\n升级内容：" + json.data.upgradeContent
+						);
+					}
+				});
+			},
 		}
 	});
 

zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/Application.java

@@ -9,6 +9,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 import java.net.InetAddress;
 import java.util.Optional;
@@ -16,6 +17,7 @@ import java.util.Optional;
 /**
  * 程序启动器
  */
+@EnableScheduling
 @SpringBootApplication
 @ComponentScan(basePackages = {"com.zyplayer.doc.manage", "com.zyplayer.doc.data"})
 public class Application extends SpringBootServletInitializer {

zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/DocGrpcConfig.java

@@ -1,13 +0,0 @@
-package com.zyplayer.doc.manage.framework.config;
-
-/**
- * 开启zyplayer-doc-grpc服务
- *
- * @author 暮光：城中城
- * @since 2018年11月11日
- */
-//@EnableDocGrpc
-//@Configuration
-public class DocGrpcConfig {
-
-}

zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/task/SchedulerTask.java

@@ -0,0 +1,47 @@
+package com.zyplayer.doc.manage.task;
+
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.zyplayer.doc.manage.utils.UpgradeUtil;
+import com.zyplayer.doc.manage.utils.bean.UpgradeInfo;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Objects;
+import java.util.Properties;
+
+@Component
+public class SchedulerTask {
+	
+	@Value("${zyplayer.doc.manage.version:''}")
+	private String nowVersion;
+	@Value("${zyplayer.doc.manage.upgradePropertiesUrl:''}")
+	private String upgradePropertiesUrl;
+	
+//	@Scheduled(cron = "0/10 * * * * ? ")
+	@Scheduled(cron = "0 0 1 * * ?")
+	public void upgradeTask() {
+		// 检查更新，访问的码云服务器获取升级内容的
+		if (StringUtils.isBlank(upgradePropertiesUrl)) {
+			return;
+		}
+		try {
+			String upgradeStr = HttpRequest.get(upgradePropertiesUrl).execute().body();
+			Properties properties = new Properties();
+			properties.load(new StringReader(upgradeStr));
+			if (Objects.equals(nowVersion, properties.getProperty("lastVersion"))) {
+				return;
+			}
+			properties.setProperty("nowVersion", nowVersion);
+			String jsonString = JSON.toJSONString(properties);
+			UpgradeUtil.upgradeInfo = JSON.parseObject(jsonString, UpgradeInfo.class);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+}
+

zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/utils/UpgradeUtil.java

@@ -0,0 +1,9 @@
+package com.zyplayer.doc.manage.utils;
+
+import com.zyplayer.doc.manage.utils.bean.UpgradeInfo;
+
+import java.util.Properties;
+
+public class UpgradeUtil {
+	public static UpgradeInfo upgradeInfo;
+}

zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/utils/bean/UpgradeInfo.java

@@ -0,0 +1,52 @@
+package com.zyplayer.doc.manage.utils.bean;
+
+/**
+ * 升级信息对象
+ */
+public class UpgradeInfo {
+	private String nowVersion;
+	private String lastVersion;
+	private String upgradeContent;
+	private String upgradeUrl;
+	private String nextStep;
+	
+	public String getLastVersion() {
+		return lastVersion;
+	}
+	
+	public void setLastVersion(String lastVersion) {
+		this.lastVersion = lastVersion;
+	}
+	
+	public String getUpgradeContent() {
+		return upgradeContent;
+	}
+	
+	public void setUpgradeContent(String upgradeContent) {
+		this.upgradeContent = upgradeContent;
+	}
+	
+	public String getUpgradeUrl() {
+		return upgradeUrl;
+	}
+	
+	public void setUpgradeUrl(String upgradeUrl) {
+		this.upgradeUrl = upgradeUrl;
+	}
+	
+	public String getNextStep() {
+		return nextStep;
+	}
+	
+	public void setNextStep(String nextStep) {
+		this.nextStep = nextStep;
+	}
+	
+	public String getNowVersion() {
+		return nowVersion;
+	}
+	
+	public void setNowVersion(String nowVersion) {
+		this.nowVersion = nowVersion;
+	}
+}

zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/SystemInfoController.java

@@ -0,0 +1,19 @@
+package com.zyplayer.doc.manage.web.manage;
+
+import com.zyplayer.doc.core.json.DocResponseJson;
+import com.zyplayer.doc.core.json.ResponseJson;
+import com.zyplayer.doc.manage.utils.UpgradeUtil;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/system/info")
+public class SystemInfoController {
+
+	@PostMapping("/upgrade")
+	public ResponseJson<Object> upgradeInfo() {
+		return DocResponseJson.ok(UpgradeUtil.upgradeInfo);
+	}
+
+}

zyplayer-doc-manage/src/main/resources/application.yml

@@ -32,8 +32,12 @@ zyplayer:
       proxy-request:
         # 允许代理请求的域名，正则表达式，多个使用 ; 分割，必须设置，防止通过代理接口访问到内部资源，实在觉得没必要可设置为：.+
         white-domain: \S+\.zyplayer\.com;127.0.1:8080;\S+\.xiaominfo\.com;
-    # zyplayer_doc_manage管理端的数据库配置
+    # zyplayer_doc_manage相关配置
     manage:
+      # 版本和升级信息获取地址
+      version: 1.0.1
+      upgradePropertiesUrl: https://gitee.com/zyplayer/zyplayer-doc/raw/master/upgrade.properties
+      # 管理端的数据库配置
       datasource:
         driverClassName: com.mysql.jdbc.Driver
         url: jdbc:mysql://127.0.0.1:3306/zyplayer_doc_manage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false

zyplayer-doc-swagger/src/main/resources/document.html

@@ -75,7 +75,8 @@
 									使用中您有任何的意见和建议都可到源码地址处反馈哦！<br/>
 									源码地址：<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://kongjianzhou.com">空间轴</a>、<a target="_blank" href="http://zyplayer.com">自由发挥</a>（都已很久未维护）
+									我的网站：<a target="_blank" href="http://kongjianzhou.com">空间轴</a>、<a target="_blank" href="http://zyplayer.com">自由发挥</a>（都已很久未维护）<br/>
+									<div id="upgradeInfoBox"></div>
 								</div>
 							</div>
 						</div>

zyplayer-doc-swagger/src/main/resources/webjars/mg-ui/js/mg-ui.js

@@ -71,6 +71,7 @@ $(document).ready(function(){
 	];
 	$('#rightZpages').tabs({tabs: tabsArr});
 	rightContentTabs = $('#rightZpages').data('zui.tabs');
+	checkSystemUpgrade();
 });
 
 /**
@@ -1051,3 +1052,23 @@ function initDashboard(){
 	$('#homePageDashboard').append('<div class="dashboard" data-height="320"></div>');
 	$('#homePageDashboard .dashboard').append(template);
 }
+
+function checkSystemUpgrade() {
+	ajaxTemp("system/info/upgrade", "post", "json", {}, function (json) {
+		if (json.errCode == 200 && !!json.data) {
+			$("#upgradeInfoBox").html(
+				"发现新版本"
+				+ "，当前版本：" + json.data.nowVersion
+				+ "，最新版本：<span style='color: #ff0000;'>" + json.data.lastVersion + "</span>"
+				+ "<br/>升级地址：<a target='_blank' href='" + json.data.upgradeUrl + "'>" + json.data.upgradeUrl + "</a>"
+				+ "<br/>升级内容：" + json.data.upgradeContent
+			);
+			console.log("zyplayer-doc发现新版本："
+				+ "\n升级地址：" + json.data.upgradeUrl
+				+ "\n当前版本：" + json.data.nowVersion
+				+ "\n最新版本：" + json.data.lastVersion
+				+ "\n升级内容：" + json.data.upgradeContent
+			);
+		}
+	});
+}

zyplayer-doc-wiki/src/main/resources/doc-wiki.html

@@ -237,6 +237,14 @@
 				<el-form-item label="开发人员：">
 					<a target="_blank" href="http://zyplayer.com">暮光：城中城</a>
 				</el-form-item>
+				<template v-if="upgradeInfo.lastVersion">
+					<el-form-item label="当前版本：">{{upgradeInfo.nowVersion}}</el-form-item>
+					<el-form-item label="最新版本：">{{upgradeInfo.lastVersion}}</el-form-item>
+					<el-form-item label="升级地址：">
+						<a target="_blank" :href="upgradeInfo.upgradeUrl">{{upgradeInfo.upgradeUrl}}</a>
+					</el-form-item>
+					<el-form-item label="升级内容：">{{upgradeInfo.upgradeContent}}</el-form-item>
+				</template>
 				<el-form-item label="">
 					欢迎加群讨论，QQ群号：466363173，欢迎提交需求，欢迎使用和加入开发！
 				</el-form-item>
@@ -312,30 +320,35 @@
 				recommentInfo: {},
 				// 页面跳转相关
 				initOver: false,
-				urlParam: {
+				doNotPushState: false,
-					pageId: 0
+				urlParamPageId: 0,
-				},
+				urlParam: {},
+				// 升级信息
+				upgradeInfo: {},
 			}
 		},
 		watch: {
-			urlParam: {
+			urlParamPageId: function (newVal, oldVal) {
-				handler(newVal, oldVal) {
+				if (!this.initOver) return;
-					if (!this.initOver) return;
+				var oldPageId = oldVal || 0;
-					var params = urlToParam(newVal).slice(1);
+				// console.log(app.doNotPushState, newVal, oldVal);
+				if (app.doNotPushState) {
+					app.doNotPushState = false;
+				} else {
+					this.urlParam.pageId = newVal;
+					var params = urlToParam(this.urlParam).slice(1);
 					window.history.pushState(null, null, '?' + params);
-					console.log(newVal, oldVal, params);
+				}
-					var oldPageId = oldVal.pageId || 0;
+				if (!!newVal && newVal > 0 && newVal !== oldPageId) {
-					if (!!newVal.pageId && newVal.pageId > 0 && newVal.pageId !== oldPageId) {
+					this.wikiPageExpandedKeys = [newVal];
-						this.wikiPageExpandedKeys = [parseInt(newVal.pageId)];
+					this.loadPageDetail(newVal);
-						this.loadPageDetail(newVal.pageId);
+				}
-					}
-				},
-				deep: true, immediate: true
 			}
 		},
 		mounted: function () {
 			this.init();
 			this.loadSpaceList();
+			this.checkSystemUpgrade();
 			this.initOver = true;
 		},
 		methods: {
@@ -568,7 +581,7 @@
 				ajaxTemp("zyplayer-doc-wiki/page/update", "post", "json", param, function (json) {
 					if (validateResult(json)) {
 						Toast.success("保存成功！");
-						app.loadPageDetail(json.data.id);
+						app.urlParamPageId = json.data.id;
 						app.doGetPageList(null);
 					}
 				});
@@ -580,7 +593,7 @@
 				}
 				console.log("点击节点：", data);
 				app.lastClickNode = data;
-				this.loadPageDetail(app.lastClickNode.id);
+				app.urlParamPageId = app.lastClickNode.id;
 			},
 			handleNodeExpand(node) {
 				if (node.children.length > 0 && node.children[0].needLoad) {
@@ -639,7 +652,6 @@
 						app.pageContent = json.data.pageContent || {};
 						app.pageFileList = json.data.fileList || [];
 						app.uploadFormData = {pageId: app.wikiPage.id};
-						app.urlParam.pageId = app.wikiPage.id;
 					}
 				});
 				this.loadCommentList(pageId);
@@ -725,13 +737,20 @@
 					}
 				}
 			},
-			init(){
+			checkSystemUpgrade() {
-				page.newPageContentEditor = new window.wangEditor('#newPageContentDiv');
+				ajaxTemp("system/info/upgrade", "post", "json", {}, function (json) {
-				page.newPageContentEditor.customConfig.uploadImgServer = 'zyplayer-doc-wiki/common/upload';
+					if (json.errCode == 200 && !!json.data) {
-				page.newPageContentEditor.customConfig.zIndex = 100;
+						app.upgradeInfo = json.data;
-				page.newPageContentEditor.customConfig.pasteFilterStyle = false;
+						console.log("zyplayer-doc发现新版本："
-				page.newPageContentEditor.create();
+							+ "\n升级地址：" + json.data.upgradeUrl
-				// 初始化页面参数
+							+ "\n当前版本：" + json.data.nowVersion
+							+ "\n最新版本：" + json.data.lastVersion
+							+ "\n升级内容：" + json.data.upgradeContent
+						);
+					}
+				});
+			},
+			createUrlParam() {
 				var url = document.location.toString();
 				if (url.indexOf("?") >= 0) {
 					var urlParam = {};
@@ -746,8 +765,23 @@
 							urlParam[param[0]] = param[1];
 						}
 					}
+					if (!!urlParam.pageId) {
+						this.urlParamPageId = parseInt(urlParam.pageId);
+					}
 					this.urlParam = urlParam;
 				}
+			},
+			init(){
+				page.newPageContentEditor = new window.wangEditor('#newPageContentDiv');
+				page.newPageContentEditor.customConfig.uploadImgServer = 'zyplayer-doc-wiki/common/upload';
+				page.newPageContentEditor.customConfig.zIndex = 100;
+				page.newPageContentEditor.customConfig.pasteFilterStyle = false;
+				page.newPageContentEditor.create();
+				this.createUrlParam();
+				window.addEventListener("popstate", function (e) {
+					app.doNotPushState = true;
+					app.createUrlParam();
+				}, false);
 			}
 		}
 	});

zyplayer-doc-wiki/src/main/resources/open-wiki.html

@@ -147,25 +147,27 @@
 				recommentInfo: {},
 				// 页面跳转相关
 				initOver: false,
-				urlParam: {
+				doNotPushState: false,
-					pageId: 0
+				urlParamPageId: 0,
-				},
+				urlParam: {},
 			}
 		},
 		watch: {
-			urlParam: {
+			urlParamPageId: function (newVal, oldVal) {
-				handler(newVal, oldVal) {
+				if (!this.initOver) return;
-					if (!this.initOver) return;
+				var oldPageId = oldVal || 0;
-					var params = urlToParam(newVal).slice(1);
+				// console.log(app.doNotPushState, newVal, oldVal);
+				if (app.doNotPushState) {
+					app.doNotPushState = false;
+				} else {
+					this.urlParam.pageId = newVal;
+					var params = urlToParam(this.urlParam).slice(1);
 					window.history.pushState(null, null, '?' + params);
-					console.log(newVal, oldVal, params);
+				}
-					var oldPageId = oldVal.pageId || 0;
+				if (!!newVal && newVal > 0 && newVal !== oldPageId) {
-					if (!!newVal.pageId && newVal.pageId > 0 && newVal.pageId !== oldPageId) {
+					this.wikiPageExpandedKeys = [newVal];
-						this.wikiPageExpandedKeys = [parseInt(newVal.pageId)];
+					this.loadPageDetail(newVal);
-						this.loadPageDetail(newVal.pageId);
+				}
-					}
-				},
-				deep: true, immediate: true
 			}
 		},
 		mounted: function () {
@@ -189,7 +191,7 @@
 				}
 				console.log("点击节点：", data);
 				app.lastClickNode = data;
-				this.loadPageDetail(app.lastClickNode.id);
+				app.urlParamPageId = app.lastClickNode.id;
 			},
 			handleNodeExpand(node) {
 				if (node.children.length > 0 && node.children[0].needLoad) {
@@ -208,7 +210,6 @@
 						app.pageContent = json.data.pageContent || {};
 						app.pageFileList = json.data.fileList || [];
 						app.uploadFormData = {pageId: app.wikiPage.id};
-						app.urlParam.pageId = app.wikiPage.id;
 					}
 				});
 			},
@@ -255,13 +256,7 @@
 					}
 				}
 			},
-			init(){
+			createUrlParam() {
-				page.newPageContentEditor = new window.wangEditor('#newPageContentDiv');
-				page.newPageContentEditor.customConfig.uploadImgServer = 'zyplayer-doc-wiki/common/upload';
-				page.newPageContentEditor.customConfig.zIndex = 100;
-				page.newPageContentEditor.customConfig.pasteFilterStyle = false;
-				page.newPageContentEditor.create();
-				// 初始化页面参数
 				var url = document.location.toString();
 				if (url.indexOf("?") >= 0) {
 					var urlParam = {};
@@ -276,8 +271,23 @@
 							urlParam[param[0]] = param[1];
 						}
 					}
+					if (!!urlParam.pageId) {
+						this.urlParamPageId = parseInt(urlParam.pageId);
+					}
 					this.urlParam = urlParam;
 				}
+			},
+			init(){
+				page.newPageContentEditor = new window.wangEditor('#newPageContentDiv');
+				page.newPageContentEditor.customConfig.uploadImgServer = 'zyplayer-doc-wiki/common/upload';
+				page.newPageContentEditor.customConfig.zIndex = 100;
+				page.newPageContentEditor.customConfig.pasteFilterStyle = false;
+				page.newPageContentEditor.create();
+				this.createUrlParam();
+				window.addEventListener("popstate", function (e) {
+					app.doNotPushState = true;
+					app.createUrlParam();
+				}, false);
 			}
 		}
 	});

zyplayer-doc-wiki/src/main/resources/webjars/doc-wiki/js/common.js

@@ -27,7 +27,7 @@ function deserialize(value) {
 }
 
 function validateResult(result) {
-	if(result.errCode == 200) {
+	if (result.errCode == 200) {
 		return true;
 	} else {
 		Toast.error(result.errMsg);