update to v1.0.34-release

KOHGYLW · May 19, 2020 · eaf74ae · eaf74ae
1 parent 2a81d74
commit eaf74ae
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -77,10 +77,11 @@ _注：kift为该功能的开发名称，其实际成果命名为kiftd。_
 
 > 提示：当您更新版本后，请手动清除浏览器的缓存，之后刷新网盘主页以确保数据文件保持最新！否则可能导致新版页面功能无法使用。
 
-### 常规更新v1.0.33
+### 常规更新v1.0.34
 _本次更新为维护性的更新，修复一些已经发现的问题并优化使用体验，推荐所有用户升级。_
-+ 升级了内置的图片预览插件，并修复了一个存在于“图片预览”功能中的安全性漏洞。
-+ 进一步完善了文件系统。
++ 进一步完善了文件系统——修复了当上传的文件夹中含有特殊字符且上传路径中存在重名文件夹时，选择“保留两者”会中断上传操作的问题。
++ 修复了一个存在于“上传文件夹”功能的非法命名漏洞。
++ 其他一些细节优化。
 
 
 > 需要查看更多版本历史信息？请访问： https://kohgylw.gitee.io/News.html 

diff --git a/kiftd-1.0.33-RELEASE.jar → kiftd-1.0.34-RELEASE.jar b/kiftd-1.0.33-RELEASE.jar → kiftd-1.0.34-RELEASE.jar
diff --git a/kiftd说明文档.pdf b/kiftd说明文档.pdf
diff --git a/webContext/home.html b/webContext/home.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<!-- 青阳网络文件传输系统 kiftd v1.0.33-RELEASE -->
+<!-- 青阳网络文件传输系统 kiftd v1.0.34-RELEASE -->
 <!-- 欢迎访问主界面 -->
 <!-- by 青阳龙野（[email protected]） -->
 <html>
@@ -101,32 +101,34 @@
 											class="glyphicon glyphicon-cog"></span> 操作 <span
 											class="caret"></span></a>
 										<ul class="dropdown-menu" id="fileListDropDown">
-											<li id="uploadFileButtonLi"><a href="javascript:void(0);">上传文件 <span
-													class="pull-right"><span
+											<li id="uploadFileButtonLi"><a
+												href="javascript:void(0);">上传文件 <span class="pull-right"><span
 														class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>+U</span></a></li>
-											<li id="uploadFolderButtonLi"><a href="javascript:void(0);">上传文件夹 <span
+											<li id="uploadFolderButtonLi"><a
+												href="javascript:void(0);">上传文件夹 <span
 													class="pull-right"><span
 														class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>+F</span></a></li>
 											<li role="separator" class="divider"></li>
-											<li id="createFolderButtonLi"><a href="javascript:void(0);">新建文件夹 <span
+											<li id="createFolderButtonLi"><a
+												href="javascript:void(0);">新建文件夹 <span
 													class="pull-right"><span
 														class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>+N</span></a></li>
 											<li role="separator" class="divider"></li>
-											<li id="copyFileButtonLi"><a href="javascript:void(0);"><span id='copySignTx'>复制
-														<span class="pull-right"><span
+											<li id="copyFileButtonLi"><a href="javascript:void(0);"><span
+													id='copySignTx'>复制 <span class="pull-right"><span
 															class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>+C</span>
 												</span></a></li>
-											<li id="cutFileButtonLi"><a href="javascript:void(0);"><span id='cutSignTx'>剪切
-														<span class="pull-right"><span
+											<li id="cutFileButtonLi"><a href="javascript:void(0);"><span
+													id='cutSignTx'>剪切 <span class="pull-right"><span
 															class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>+X</span>
 												</span></a></li>
-											<li id="stickFileButtonLi" class="hidden"><a href="javascript:void(0);"><span
-													id='stickSignTx'>粘贴<span id="stickFilesCount"></span>
-														<span class="pull-right"><span
+											<li id="stickFileButtonLi" class="hidden"><a
+												href="javascript:void(0);"><span id='stickSignTx'>粘贴<span
+														id="stickFilesCount"></span> <span class="pull-right"><span
 															class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>+V</span>
 												</span></a></li>
-											<li id="deleteSeelectFileButtonLi"><a href="javascript:void(0);">删除 <span
-													class="pull-right"><span
+											<li id="deleteSeelectFileButtonLi"><a
+												href="javascript:void(0);">删除 <span class="pull-right"><span
 														class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>+D</span></a></li>
 										</ul></li>
 								</ul>
@@ -293,7 +295,8 @@ <h4 class="modal-title" id="deleteFolderModelTitle">
 					<h5 id="deleteFolderMessage"></h5>
 				</div>
 				<div class="modal-footer">
-					<button id="cancelDeleteFolderBtn" type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+					<button id="cancelDeleteFolderBtn" type="button"
+						class="btn btn-default" data-dismiss="modal">取消</button>
 					<span id="deleteFolderBox"></span>
 				</div>
 			</div>
@@ -545,7 +548,8 @@ <h4 class="modal-title" id="deleteFileModelTitle">
 					<h5 id="deleteFileMessage" class="wordbreak"></h5>
 				</div>
 				<div class="modal-footer">
-					<button id="cancelDeleteFileBox" type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+					<button id="cancelDeleteFileBox" type="button"
+						class="btn btn-default" data-dismiss="modal">取消</button>
 					<span id="deleteFileBox"></span>
 				</div>
 			</div>
@@ -609,7 +613,8 @@ <h5>
 					</h5>
 				</div>
 				<div class="modal-footer">
-					<button id="cancelDownloadAllCheckedBtn" type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+					<button id="cancelDownloadAllCheckedBtn" type="button"
+						class="btn btn-default" data-dismiss="modal">取消</button>
 					<span id="downloadAllCheckedBox"></span>
 				</div>
 			</div>
@@ -698,7 +703,8 @@ <h4>提示：存在同名文件！</h4>
 					</div>
 				</div>
 				<div class="modal-footer">
-					<button id="cancelMoveFilesBtn" type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+					<button id="cancelMoveFilesBtn" type="button"
+						class="btn btn-default" data-dismiss="modal">取消</button>
 					<span id="moveFilesBox"></span>
 				</div>
 			</div>

diff --git a/webContext/js/home.js b/webContext/js/home.js
@@ -3010,8 +3010,7 @@ function getDownloadURL() {
 							+ window.location.host
 							+ "/externalLinksController/downloadFileByKey/"
 							+ encodeURIComponent(getDownloadFileName.replace(
-									/\'/g, '').replace(/\r/g, "").replace(
-									/\n/g, "")) + "?dkey=" + result;
+									/\\/g, "_")) + "?dkey=" + result;
 					// 显示链接内容
 					$("#downloadHrefBox").html(
 							"<a href='" + dlurl + "'>" + dlurl + "</a>");
@@ -3541,9 +3540,8 @@ function getFileChain(fileId, fileName) {
 								+ "//"
 								+ window.location.host
 								+ "/externalLinksController/chain/"
-								+ encodeURIComponent(fileName
-										.replace(/\'/g, '').replace(/\r/g, "")
-										.replace(/\n/g, "")) + "?ckey="
+								+ encodeURIComponent(fileName.replace(/\\/g,
+										"_")) + "?ckey="
 								+ encodeURIComponent(result));
 				$("#copyChainBtn").attr('disabled', false);
 				break;
@@ -3819,7 +3817,7 @@ function updateTheFolderInfo() {
 
 // 替换所有引号，将其进一步转义，主要用于传递带引号的文件名
 function replaceAllQuotationMarks(txt) {
-	return txt.replace(/\"/g, "\\\"");
+	return txt.replace(/\\/g, "\\\\").replace(/\"/g, "\\\"");
 }
 
 // 对所有可能进入html的字符串进行转义操作

diff --git a/webContext/js/home.min.js b/webContext/js/home.min.js