From c37586d596ee4241386c63b2f9b533119bb97869 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: Wed, 6 Mar 2019 23:39:38 +0800
Subject: [PATCH] =?UTF-8?q?wiki=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upgrade.properties                            |   8 +-
 .../wiki/controller/WikiCommonController.java |   2 +-
 .../src/main/resources/doc-wiki.html          | 252 +++++++++++-------
 3 files changed, 154 insertions(+), 108 deletions(-)

diff --git a/upgrade.properties b/upgrade.properties
index 9aebea2e..f39bff95 100644
--- a/upgrade.properties
+++ b/upgrade.properties
@@ -1,6 +1,6 @@
-# 本文件用于已部署好的系统检测自己是否需要升级使用
+# 鏈枃浠剁敤浜庡凡閮ㄧ讲濂界殑绯荤粺妫�娴嬭嚜宸辨槸鍚﹂渶瑕佸崌绾т娇鐢�
 lastVersion=1.0.1
-upgradeContent=1、增加wiki文档模块;2、dubbo文档支持使用元数据生成参数和返回值;3、框架进行了大的拆分;4、增加升级通知;5、细节优化;
-upgradeUrl=
-nextStep=
+upgradeContent=1銆佸鍔爓iki鏂囨。妯″潡;2銆乨ubbo鏂囨。鏀寔浣跨敤鍏冩暟鎹敓鎴愬弬鏁板拰杩斿洖鍊�;3銆佹鏋惰繘琛屼簡澶х殑鎷嗗垎;4銆佸鍔犲崌绾ч�氱煡;5銆佺粏鑺備紭鍖�;
+upgradeUrl=https://gitee.com/zyplayer/zyplayer-doc/releases
+nextStep=1銆佹敮鎸佺洿鎺ュ悓姝ュ埌git鐨勬枃妗�;2銆佹敮鎸佸井淇℃枃绔犳媺鍙�;
 
diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java
index 399aa33e..64fd775b 100644
--- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java
+++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java
@@ -53,7 +53,7 @@ public class WikiCommonController {
 		DocUserDetails currentUser = DocUserUtil.getCurrentUser();
 		String path = uploadPath + "/" + DateTime.now().toString("yyyy/MM/dd") + "/";
 		File newFile = new File(path);
-		if (!newFile.exists() && !newFile.mkdir()) {
+		if (!newFile.exists() && !newFile.mkdirs()) {
 			return DocResponseJson.warn("鍒涘缓鏂囦欢澶瑰け璐�");
 		}
 		String simpleUUID = RandomUtil.simpleUUID();
diff --git a/zyplayer-doc-wiki/src/main/resources/doc-wiki.html b/zyplayer-doc-wiki/src/main/resources/doc-wiki.html
index 74a2ed28..9b85e49b 100644
--- a/zyplayer-doc-wiki/src/main/resources/doc-wiki.html
+++ b/zyplayer-doc-wiki/src/main/resources/doc-wiki.html
@@ -12,7 +12,7 @@
 	<div id="app">
 		<el-container style="height: 100%;">
 			<el-aside width="auto" style="height: 100%;">
-				<!--<div class="logo" @click="aboutDialogVisible = true">zyplayer-doc-wiki</div>-->
+				<div class="logo" @click="aboutDialogVisible = true">zyplayer-doc-wiki</div>
 				<div style="padding: 10px;">
 					<div align="center"><el-button type="primary" v-on:click="createWiki" icon="el-icon-plus" style="width: 100%;">鍒涘缓鏂囨。</el-button></div>
 					<!--<el-row><el-switch v-model="isCollapse"></el-switch></el-row>-->
@@ -22,100 +22,116 @@
 					<el-tree :props="defaultProps" @node-click="handleNodeClick" :load="loadNodeChildren" lazy></el-tree>
 				</div>
 			</el-aside>
-			<el-main class="doc-body-box">
-				<el-row type="border-card" v-show="rightContentType == 0">
-					<div style="margin-top: 30px;color: #666; text-align: center;">娆㈣繋浣跨敤鍦ㄧ嚎鏂囨。</div>
-				</el-row>
-				<el-row type="border-card" v-show="rightContentType == 1">
-					<div class="wiki-title">
-						{{wikiPage.name}}
-						<div style="float: right;">
-							<el-button type="text" icon="el-icon-edit" v-on:click="editWiki">缂栬緫</el-button>
-							<el-button type="text" icon="el-icon-setting">璁块棶鏉冮檺</el-button>
-						</div>
-					</div>
-					<div class="wiki-author">
-						鍒涘缓鏃堕棿锛歿{wikiPage.createUserName}}銆�{{wikiPage.createTime}}銆�銆�鏈�鍚庝慨鏀癸細{{wikiPage.updateUserName}}銆�{{wikiPage.updateTime}}
-					</div>
-					<div class="wiki-files">
-						<div style="margin-bottom: 5px; height: 40px;">
+			<el-container>
+				<el-header style="text-align: right;height: 50px;">
+					<el-dropdown @command="notOpen" trigger="click">
+						<i class="el-icon-setting" style="margin-right: 15px; font-size: 16px;cursor: pointer;color: #fff;"> </i>
+						<el-dropdown-menu slot="dropdown">
+							<el-dropdown-item command="">鎴戠殑璧勬枡</el-dropdown-item>
+							<el-dropdown-item command="">閫�鍑虹櫥褰�</el-dropdown-item>
+						</el-dropdown-menu>
+					</el-dropdown>
+				</el-header>
+				<el-main class="doc-body-box">
+					<el-row type="border-card" v-show="rightContentType == 0">
+						<div style="margin-top: 30px;color: #666; text-align: center;">娆㈣繋浣跨敤鍦ㄧ嚎鏂囨。</div>
+					</el-row>
+					<el-row type="border-card" v-show="rightContentType == 1">
+						<div class="wiki-title">
+							{{wikiPage.name}}
 							<div style="float: right;">
-								<!--:on-preview="handlePreview"-->
-								<!--:on-remove="handleRemove"-->
-								<!--:before-remove="beforeRemove"-->
-								<!--:on-exceed="handleExceed"-->
-								<el-upload
-										class="upload-page-file"
-										action="zyplayer-doc-wiki/common/upload"
-										:on-success="uploadFileSuccess"
-										:on-error="uploadFileError"
-										name="files"
-										show-file-list
-										multiple
-										:data="uploadFormData"
-										:limit="999">
-									<el-button icon="el-icon-upload">涓婁紶闄勪欢</el-button>
-								</el-upload>
+								<el-button type="text" icon="el-icon-edit" v-on:click="editWiki">缂栬緫</el-button>
+								<el-button type="text" icon="el-icon-setting" v-on:click="editWikiAuth">璁块棶鏉冮檺</el-button>
 							</div>
 						</div>
-						<el-table v-show="pageFileList.length > 0" :data="pageFileList" border style="width: 100%; margin-bottom: 5px;">
-							<el-table-column label="鏂囦欢鍚�">
-								<template slot-scope="scope">
-									<a target="_blank" :href="scope.row.fileUrl">{{scope.row.fileName}}</a>
-								</template>
-							</el-table-column>
-							<el-table-column prop="createUserName" label="鍒涘缓浜�"></el-table-column>
-							<el-table-column prop="createTime" label="鍒涘缓鏃堕棿"></el-table-column>
-							<el-table-column label="鎿嶄綔">
-								<template slot-scope="scope">
-									<el-button v-on:click="deletePageFile(scope.row)">鍒犻櫎</el-button>
-								</template>
-							</el-table-column>
-						</el-table>
-					</div>
-					<div class="wiki-content">
-						<div v-html="pageContent.content"></div>
-					</div>
-					<div style="margin-top: 20px; font-size: 14px;">
-						<span style="vertical-align: top;" class="is-link">
-							<img src="webjars/doc-wiki/img/zan.png" style="vertical-align: middle;">
-							<span v-show="wikiPage.selfZan == 0" v-on:click="zanPage(1)">璧�</span>
-							<span v-show="wikiPage.selfZan == 1" v-on:click="zanPage(0)">韪�</span>
-						</span>
-						<span style="margin-left: 10px;vertical-align: top;">
-							<span v-if="wikiPage.selfZan == 0 && wikiPage.zanNum <= 0">鎴愪负绗竴涓禐鍚岃��</span>
-							<span v-else-if="wikiPage.selfZan == 0 && wikiPage.zanNum > 0"><span class="is-link" v-on:click="showZanPageUser">{{wikiPage.zanNum}}浜�</span>璧炰簡瀹�</span>
-							<span v-else-if="wikiPage.selfZan == 1 && wikiPage.zanNum <= 1">鎴戣禐浜嗗畠</span>
-							<span v-else-if="wikiPage.selfZan == 1 && wikiPage.zanNum > 1"><span class="is-link" v-on:click="showZanPageUser">鎴戝拰{{wikiPage.zanNum-1}}涓叾浠栦汉</span>璧炰簡瀹�</span>
-						</span>
-					</div>
-					<div v-show="commentList.length > 0" style="margin-top: 20px;">
-						<div style="margin-bottom: 10px;">璇勮鍒楄〃锛�</div>
-						<div v-for="(item,index) in commentList" :key="item.id" :data-id="item.id" :data-index="index" style="border-top: 1px solid #ccc;padding: 10px;">
-							<div>{{item.createUserName}}锛�<div style="color: #888;font-size: 13px;float: right;">{{item.createTime}}</div></div>
-							<div style="padding-top: 10px;">銆�{{item.content}}</div>
+						<div class="wiki-author">
+							鍒涘缓鏃堕棿锛歿{wikiPage.createUserName}}銆�{{wikiPage.createTime}}銆�銆�鏈�鍚庝慨鏀癸細{{wikiPage.updateUserName}}銆�{{wikiPage.updateTime}}
 						</div>
-					</div>
-					<div style="margin-top: 10px;">
-						<el-input type="textarea" v-model="commentTextInput" :rows="2" placeholder="璇疯緭鍏ヨ瘎璁哄唴瀹�"></el-input>
-						<div align="right" style="margin-top: 5px;">
-							<el-button v-on:click="submitPageComment">鎻愪氦璇勮</el-button>
+						<div class="wiki-files">
+							<div style="margin-bottom: 5px; height: 40px;">
+								<div style="float: right;">
+									<!--:on-preview="handlePreview"-->
+									<!--:on-remove="handleRemove"-->
+									<!--:before-remove="beforeRemove"-->
+									<!--:on-exceed="handleExceed"-->
+									<el-upload
+											class="upload-page-file"
+											action="zyplayer-doc-wiki/common/upload"
+											:on-success="uploadFileSuccess"
+											:on-error="uploadFileError"
+											name="files"
+											show-file-list
+											multiple
+											:data="uploadFormData"
+											:limit="999">
+										<el-button icon="el-icon-upload">涓婁紶闄勪欢</el-button>
+									</el-upload>
+								</div>
+							</div>
+							<el-table v-show="pageFileList.length > 0" :data="pageFileList" border style="width: 100%; margin-bottom: 5px;">
+								<el-table-column label="鏂囦欢鍚�">
+									<template slot-scope="scope">
+										<a target="_blank" :href="scope.row.fileUrl">{{scope.row.fileName}}</a>
+									</template>
+								</el-table-column>
+								<el-table-column prop="createUserName" label="鍒涘缓浜�"></el-table-column>
+								<el-table-column prop="createTime" label="鍒涘缓鏃堕棿"></el-table-column>
+								<el-table-column label="鎿嶄綔">
+									<template slot-scope="scope">
+										<el-button v-on:click="deletePageFile(scope.row)">鍒犻櫎</el-button>
+									</template>
+								</el-table-column>
+							</el-table>
 						</div>
-					</div>
-				</el-row>
-				<el-row type="border-card" v-show="rightContentType == 2">
-					<div style="margin-bottom: 10px;">
-						鐖剁骇锛歿{lastClickNode.nodePath || '/'}}銆�
-						<el-tooltip class="item" content="鍦ㄦ牴鐩綍鍒涘缓鏂囨。">
-							<el-button type="text" @click="lastClickNode={}" style="padding: 0 10px;">鏍圭洰褰�</el-button>
-						</el-tooltip>
-					</div>
-					<el-input v-model="newPageTitle" placeholder="璇疯緭鍏ユ爣棰�"></el-input>
-					<div id="newPageContentDiv" style="margin: 10px 0;"></div>
-					<el-button type="primary" v-on:click="createWikiSave">淇濆瓨</el-button>
-					<el-button v-on:click="createWikiCancel">鍙栨秷</el-button>
-				</el-row>
-			</el-main>
+						<div class="wiki-content">
+							<div v-html="pageContent.content"></div>
+						</div>
+						<div style="margin-top: 20px; font-size: 14px;">
+							<span style="vertical-align: top;" class="is-link">
+								<img src="webjars/doc-wiki/img/zan.png" style="vertical-align: middle;">
+								<span v-show="wikiPage.selfZan == 0" v-on:click="zanPage(1)">璧�</span>
+								<span v-show="wikiPage.selfZan == 1" v-on:click="zanPage(0)">韪�</span>
+							</span>
+							<span style="margin-left: 10px;vertical-align: top;">
+								<span v-if="wikiPage.selfZan == 0 && wikiPage.zanNum <= 0">鎴愪负绗竴涓禐鍚岃��</span>
+								<span v-else-if="wikiPage.selfZan == 0 && wikiPage.zanNum > 0"><span class="is-link" v-on:click="showZanPageUser">{{wikiPage.zanNum}}浜�</span>璧炰簡瀹�</span>
+								<span v-else-if="wikiPage.selfZan == 1 && wikiPage.zanNum <= 1">鎴戣禐浜嗗畠</span>
+								<span v-else-if="wikiPage.selfZan == 1 && wikiPage.zanNum > 1"><span class="is-link" v-on:click="showZanPageUser">鎴戝拰{{wikiPage.zanNum-1}}涓叾浠栦汉</span>璧炰簡瀹�</span>
+							</span>
+						</div>
+						<div v-show="commentList.length > 0" class="comment-box" style="margin-top: 20px;">
+							<div style="margin-bottom: 10px;">璇勮鍒楄〃锛�</div>
+							<div v-for="(item,index) in commentList" :key="item.id" :data-id="item.id" :data-index="index" style="border-top: 1px solid #eee;padding: 10px;">
+								<div>
+									<div :style="'background-color: '+item.color" class="head">{{item.createUserName.substr(0,1)}}</div>
+								</div>
+								<div style="padding-left: 55px;">
+									{{item.createUserName}}銆�<span style="color: #888;font-size: 13px;">{{item.createTime}}</span>
+								</div>
+								<pre style="padding: 10px 0 0 55px;">{{item.content}}</pre>
+							</div>
+						</div>
+						<div style="margin: 20px 0 50px 0;">
+							<el-input type="textarea" v-model="commentTextInput" :rows="5" placeholder="璇疯緭鍏ヨ瘎璁哄唴瀹�"></el-input>
+							<div align="right" style="margin-top: 5px;">
+								<el-button v-on:click="submitPageComment">鎻愪氦璇勮</el-button>
+							</div>
+						</div>
+					</el-row>
+					<el-row type="border-card" v-show="rightContentType == 2">
+						<div style="margin-bottom: 10px;">
+							鐖剁骇锛歿{lastClickNode.nodePath || '/'}}銆�
+							<el-tooltip class="item" content="鍦ㄦ牴鐩綍鍒涘缓鏂囨。">
+								<el-button type="text" @click="lastClickNode={}" style="padding: 0 10px;">鏍圭洰褰�</el-button>
+							</el-tooltip>
+						</div>
+						<el-input v-model="newPageTitle" placeholder="璇疯緭鍏ユ爣棰�"></el-input>
+						<div id="newPageContentDiv" style="margin: 10px 0;"></div>
+						<el-button type="primary" v-on:click="createWikiSave">淇濆瓨</el-button>
+						<el-button v-on:click="createWikiCancel">鍙栨秷</el-button>
+					</el-row>
+				</el-main>
+			</el-container>
 		</el-container>
 		<!--鐐硅禐浜哄憳寮圭獥-->
 		<el-dialog title="璧炰簡瀹冪殑浜�" :visible.sync="zanUserDialogVisible" width="600px">
@@ -153,6 +169,7 @@
 <script>
 	var page = {
 		newPageContentEditor: '',
+		colorArr: ["#67C23A", "#409EFF", "#E6A23C", "#F56C6C", "#909399", "#303133"],
 	};
 	var app = new Vue({
 		el: '#app',
@@ -221,8 +238,10 @@
 				var param = {pageId: app.wikiPage.id, content: app.commentTextInput};
 				ajaxTemp("zyplayer-doc-wiki/page/comment/update", "post", "json", param, function (json) {
 					if (validateResult(json)) {
+						var data = json.data;
+						data.color = page.colorArr[Math.ceil(Math.random() * page.colorArr.length) - 1];
 						app.commentTextInput = "";
-						app.commentList.push(json.data);
+						app.commentList.push(data);
 					}
 				});
 			},
@@ -236,19 +255,31 @@
 				}
 			},
 			deletePageFile(row) {
-				var param = {id: row.id, delFlag: 1};
-				ajaxTemp("zyplayer-doc-wiki/page/file/update", "post", "json", param, function (json) {
-					if (validateResult(json)) {
-						var pageFileList = [];
-						for (var i = 0; i < app.pageFileList.length; i++) {
-							if (app.pageFileList[i].id != row.id) {
-								pageFileList.push(app.pageFileList[i]);
+				this.$confirm('纭畾瑕佸垹闄ゆ鏂囦欢鍚楋紵', '鎻愮ず', {
+					confirmButtonText: '纭畾',
+					cancelButtonText: '鍙栨秷',
+					type: 'warning'
+				}).then(() => {
+					var param = {id: row.id, delFlag: 1};
+					ajaxTemp("zyplayer-doc-wiki/page/file/update", "post", "json", param, function (json) {
+						if (validateResult(json)) {
+							var pageFileList = [];
+							for (var i = 0; i < app.pageFileList.length; i++) {
+								if (app.pageFileList[i].id != row.id) {
+									pageFileList.push(app.pageFileList[i]);
+								}
 							}
+							app.pageFileList = pageFileList;
 						}
-						app.pageFileList = pageFileList;
-					}
+					});
 				});
 			},
+			editWikiAuth() {
+				Toast.notOpen();
+			},
+			notOpen() {
+				Toast.notOpen();
+			},
 			editWiki() {
 				this.rightContentType = 2;
 				this.newPageId = app.wikiPage.id;
@@ -316,7 +347,11 @@
 				var param = {pageId: pageId};
 				ajaxTemp("zyplayer-doc-wiki/page/comment/list", "post", "json", param, function (json) {
 					if (validateResult(json)) {
-						app.commentList = json.data || [];
+						var commentList = json.data || [];
+						for (var i = 0; i < commentList.length; i++) {
+							commentList[i].color = page.colorArr[Math.ceil(Math.random() * page.colorArr.length) - 1];
+						}
+						app.commentList = commentList;
 					}
 				});
 			},
@@ -373,12 +408,17 @@
 		padding: 0;
 		height: 100%;
 	}
-	pre{margin: 0;}
+	pre{margin: 0;white-space: pre-wrap;font-size: 14px; font-family: auto;}
 	.el-menu {
 		box-sizing: border-box;
 		border-right: 0;
 		margin-right: 3px;
 	}
+	.el-header {
+		background-color: #409EFF;
+		color: #333;
+		line-height: 50px;
+	}
 	.doc-body-box{
 		overflow-x: hidden;height: calc(100vh);overflow-y: auto;width: 100%;
 		padding: 10px;border-left: 1px solid #f1f1f1; box-sizing: border-box;
@@ -386,7 +426,7 @@
 	.el-tree{margin-right: 3px;}
 	.logo{
 		background: #409EFF; cursor: pointer;
-		width: 100%; height:60px;line-height:60px;font-size: 25px;color: #fff;text-align: center;
+		width: 100%; height:50px;line-height:50px;font-size: 25px;color: #fff;text-align: center;
 	}
 	.wiki-title{font-size: 20px;}
 	.wiki-author{font-size: 14px;padding: 10px 0;}
@@ -394,6 +434,12 @@
 	
 	.upload-page-file .el-upload-list{display: none;}
 	.is-link{color: #1e88e5;cursor: pointer;}
+
+	/*璇勮*/
+	.comment-box .head{
+		float: left;background-color: #ccc;border-radius: 50%;margin-right: 10px;
+		width: 45px; height: 45px; line-height: 45px;text-align: center;color: #fff;
+	}
 </style>
 </html>