From cf33e28f816c83a0c374b946b18b4425e3b95a61 Mon Sep 17 00:00:00 2001
From: Jarrett <291979254@qq.com>
Date: Mon, 5 Aug 2024 23:45:38 +0800
Subject: [PATCH 1/5] add: change the style of tables
---
 src/views/admin/AdminReview.vue &#124; 2 +-
 src/views/admin/CommentManage.vue &#124; 2 +-
 src/views/admin/DocLog.vue &#124; 2 +-
 src/views/admin/ReviewInfo.vue &#124; 2 +-
 src/views/category/DocTable.vue &#124; 10 ++++++++--
 src/views/users/UserTable.vue &#124; 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/views/admin/AdminReview.vue b/src/views/admin/AdminReview.vue
index 731073d..7236c21 100644
--- a/src/views/admin/AdminReview.vue
+++ b/src/views/admin/AdminReview.vue
@@ -1,6 +1,6 @@
 <template>
 <div ref="tableRef">
- <table class="undef">
 <template #action="{ row, index }">
 <button type="primary" size="small" @click="approve(index)">通过</button>
diff --git a/src/views/admin/CommentManage.vue b/src/views/admin/CommentManage.vue
index 642b4ef..f16bb28 100644
--- a/src/views/admin/CommentManage.vue
+++ b/src/views/admin/CommentManage.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 <div ref="tableRef">
- <table class="undef">
+ <table class="undef">
 <template #docName="{ row }">
 <p @click="preview(row.docId)">
 {{ row.docName }}</p>
diff --git a/src/views/admin/DocLog.vue b/src/views/admin/DocLog.vue
index d3a5990..6665914 100644
--- a/src/views/admin/DocLog.vue
+++ b/src/views/admin/DocLog.vue
@@ -1,6 +1,6 @@
 <template>
 <div ref="tableRef">
- <table class="undef">
+ <table class="undef">
 <template #action="{ row, index }">
 <button type="error" size="small" @click="remove(index)">删 除</button>
 </template>
diff --git a/src/views/admin/ReviewInfo.vue b/src/views/admin/ReviewInfo.vue
index b022b14..f29371f 100644
--- a/src/views/admin/ReviewInfo.vue
+++ b/src/views/admin/ReviewInfo.vue
@@ -1,6 +1,6 @@
 <template>
 <div ref="tableRef">
- <table class="undef">
+ <table class="undef">
 <template #checkSate="{row ,index}">
 <tag v-if="row.checkState === true" color="success">通过</tag>
 <tag v-else-if="row.checkState === false" color="error">拒绝</tag>
diff --git a/src/views/category/DocTable.vue b/src/views/category/DocTable.vue
index 5ad567c..d034d17 100644
--- a/src/views/category/DocTable.vue
+++ b/src/views/category/DocTable.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 <div ref="docTable">
- <table class="undef">
 <template #name="{ row }">
 <p @click="preview(row.id)">
@@ -13,6 +13,7 @@
 </p>
 </template>
 <template #action="{ row, index }">
+ <button type="info" size="small" @click="download(index)">下载</button>
 <button type="success" size="small" @click="show(index)">详情</button>
 <button type="primary" size="small" @click="edit_document(index)">编辑
 </button>
@@ -155,6 +156,7 @@ import DocumentRequest from "@/api/document"
 import {parseTime} from "@/utils"
 import fileTool from "@/utils/fileUtil"
 import DocEditModal from "@/views/category/DocEditModal";
+import StaticSource from "@/api/staticSourceUrl"
 
 const stateMap = {
 WAITE: {
@@ -280,7 +282,7 @@ export default {
 {
 title: '操作',
 slot: 'action',
- width: 200,
+ width: 260,
 align: 'center',
 fixed: 'right',
 }
@@ -509,6 +511,10 @@ export default {
 },
 saved() {
 this.getListData(this.cateId, this.filterWord)
+ },
+ download(index) {
+ let checked_doc = Object.create(this.data[index])
+ window.open(StaticSource.docPreviewUrl(checked_doc.id), "_blank");
 }
 }
 }
diff --git a/src/views/users/UserTable.vue b/src/views/users/UserTable.vue
index 55d3a84..d940d5e 100644
--- a/src/views/users/UserTable.vue
+++ b/src/views/users/UserTable.vue
@@ -1,6 +1,6 @@
 <template>
 <div ref="tableRef">
- <table class="undef">
+ <table class="undef">
 <template #name="{ row }">
 {{ row.username }}
 </template>
From 438f665d0b4d4d152dba6fcdf339f41bd62e6cde Mon Sep 17 00:00:00 2001
From: Jarrett <291979254@qq.com>
Date: 2024年8月17日 17:36:11 +0800
Subject: [PATCH 2/5] add: user download file by hmac key
---
 package-lock.json &#124; 5 +
 package.json &#124; 1 +
 src/api/document.js &#124; 14 ++
 src/api/staticSourceUrl.js &#124; 10 +-
 src/api/url.js &#124; 6 +
 src/utils/throttle.js &#124; 28 ++++
 src/views/preview/docOperation.vue &#124; 215 ++++++++++++++++++++++++++++-
 7 files changed, 273 insertions(+), 6 deletions(-)
 create mode 100644 src/utils/throttle.js
diff --git a/package-lock.json b/package-lock.json
index 03f68b9..90c0a94 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4582,6 +4582,11 @@
 "schema-utils": "^2.5.0"
 }
 },
+ "file-saver": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
+ "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+ },
 "file-uri-to-path": {
 "version": "1.0.0",
 "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
diff --git a/package.json b/package.json
index bfcf94c..9ac0543 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
 "ali-oss": "^6.17.1",
 "axios": "^0.27.2",
 "docx-preview": "^0.1.4",
+ "file-saver": "^2.0.5",
 "jszip": "^3.10.1",
 "mammoth": "^1.4.21",
 "marked": "^4.2.12",
diff --git a/src/api/document.js b/src/api/document.js
index c54a2d8..4f0c86a 100644
--- a/src/api/document.js
+++ b/src/api/document.js
@@ -13,6 +13,9 @@ import {
 DOC_TXT_URL,
 DOC_REBUILD_URL,
 
+ DOC_GENERATE_DOWNLOAD_KEY,
+ DOC_DOWNLOAD,
+
 ADD_LIKE_URL,
 GET_LIKE_URL
 
@@ -75,5 +78,16 @@ export default {
 return Get(GET_LIKE_URL, param)
 },
 
+ generateDownloadKey: (param) => {
+ return Get(DOC_GENERATE_DOWNLOAD_KEY, param)
+ },
+
+ downloadFile: (param) => {
+ console.log(param)
+ console.log("--------")
+ // 这里要求返回的内容是二进制的blob
+ return Get(DOC_DOWNLOAD, param, "blob")
+ }
+
 }
 
diff --git a/src/api/staticSourceUrl.js b/src/api/staticSourceUrl.js
index 11fdf0b..ad39f59 100644
--- a/src/api/staticSourceUrl.js
+++ b/src/api/staticSourceUrl.js
@@ -1,10 +1,13 @@
-import {GetStaticSource} from "@/api/request";
+import {GetStaticSource, GetStaticSourceWithoutToken} from "@/api/request";
+
+import {DOC_DOWNLOAD} from "@/api/url"
 
 const DOC_PREVIEW_URL2 = '/files/view2/';
 const DOC_PREVIEW_URL = '/files/view/';
 
 const IMAGE_URL = '/files/image2/'
 
+
 export default {
 
 docPreviewUrl: (param) => {
@@ -13,6 +16,9 @@ export default {
 
 imageUrl: (param) => {
 return GetStaticSource(IMAGE_URL, param);
- }
+ },
 
+ downloadFileUrl: (param) => {
+ return GetStaticSourceWithoutToken(DOC_DOWNLOAD, param)
+ }
 }
\ No newline at end of file
diff --git a/src/api/url.js b/src/api/url.js
index 33945d8..e9e4d4c 100644
--- a/src/api/url.js
+++ b/src/api/url.js
@@ -26,6 +26,9 @@ const DOC_VIEW_URL = '/files/view/'; // 预览文档
 const DOC_TXT_URL = '/files/text/'; // 下载文本文件
 const DOC_REBUILD_URL = '/files/rebuildIndex'; // 重建文档索引
 
+const DOC_GENERATE_DOWNLOAD_KEY = "files/generateDownloadLink"; // 产生下载的key
+const DOC_DOWNLOAD = "/files/downloadFile"; // 文件下载链接
+
 const COLLECT_ADD_URL = '/collect/auth/insert'; // 收藏增加
 const COLLECT_REMOVE_URL = '/collect/auth/remove'; // 收藏减少
 
@@ -107,6 +110,9 @@ module.exports = {
 DOC_TXT_URL,
 DOC_REBUILD_URL,
 
+ DOC_GENERATE_DOWNLOAD_KEY,
+ DOC_DOWNLOAD,
+
 COLLECT_ADD_URL,
 COLLECT_REMOVE_URL,
 
diff --git a/src/utils/throttle.js b/src/utils/throttle.js
new file mode 100644
index 0000000..bfb0488
--- /dev/null
+++ b/src/utils/throttle.js
@@ -0,0 +1,28 @@
+// utils/throttle.js
+
+/**
+ * 节流函数
+ * @param {Function} func 要节流的函数
+ * @param {number} limit 节流时间间隔(毫秒)
+ * @return {Function} 节流后的函数
+ */
+export function throttle(func, limit) {
+ let lastFunc;
+ let lastRan;
+ return function() {
+ const context = this;
+ const args = arguments;
+ if (!lastRan) {
+ func.apply(context, args);
+ lastRan = Date.now();
+ } else {
+ clearTimeout(lastFunc);
+ lastFunc = setTimeout(function() {
+ if ((Date.now() - lastRan)>= limit) {
+ func.apply(context, args);
+ lastRan = Date.now();
+ }
+ }, limit - (Date.now() - lastRan));
+ }
+ }
+}
diff --git a/src/views/preview/docOperation.vue b/src/views/preview/docOperation.vue
index 2470d2b..a659034 100644
--- a/src/views/preview/docOperation.vue
+++ b/src/views/preview/docOperation.vue
@@ -1,7 +1,9 @@
 <template>
 <div>
- <div :1' && likeStatus === 1) - &#124;&#124; (item.index === '2' && collectStatus===1) ? 'pushed' : '' " + <div + :disabled': isDisabled, + 'pushed': (item.index === '1' && likeStatus === 1) &#124;&#124; (item.index === '2' && collectStatus === 1)}" v-for="item in data" @click="operate(item)">
 <div>
 item.src
@@ -14,8 +16,15 @@
 </template>
 
 
@@ -117,4 +318,10 @@ img {
 /*width: 48px;*/
 /*height: 48px;*/
 }
+
+.disabled {
+ opacity: 0.5;
+ cursor: not-allowed;
+ pointer-events: none; /* Prevents click events */
+}
 </style>
\ No newline at end of file
From be2a25f84c7ca1c1239f6cea662a7deed20b35c8 Mon Sep 17 00:00:00 2001
From: Jarrett <291979254@qq.com>
Date: 2024年8月17日 17:39:57 +0800
Subject: [PATCH 3/5] fix: log action error
---
 src/api/request.js &#124; 18 ++++++++++++------
 src/views/admin/DocLog.vue &#124; 12 +++---------
 2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/api/request.js b/src/api/request.js
index 6abff26..cad77d7 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -89,16 +89,18 @@ instance.interceptors.response.use(response => {
 *@param{String} url [请求地址]
 *@param{Object} params 请求参数
 */
-export function Get(url, params) {
+export function Get(url, params = {}, responseType = 'json') {
 return new Promise((resolve, reject) => {
 instance.get(url, {
- params: params
+ params: params,
+ responseType: responseType
 }).then((res) => {
- resolve(res.data);
+ // 如果是 blob 类型,直接返回响应,而不是 res.data
+ resolve(responseType === 'blob' ? res : res.data);
 }).catch((error) => {
- reject(error.data);
- })
- })
+ reject(error);
+ });
+ });
 }
 
 /*
@@ -185,4 +187,8 @@ export function BackendUrl() {
 export function GetStaticSource(url, param) {
 const token = localStorage.getItem("token")
 return instance.defaults.baseURL + url + param + "?token=" + token;
+}
+
+export function GetStaticSourceWithoutToken(url, param) {
+ return instance.defaults.baseURL + url + param;
 }
\ No newline at end of file
diff --git a/src/views/admin/DocLog.vue b/src/views/admin/DocLog.vue
index 6665914..d2dc2bb 100644
--- a/src/views/admin/DocLog.vue
+++ b/src/views/admin/DocLog.vue
@@ -49,12 +49,12 @@ export default {
 {
 title: '用户',
 key: 'user',
- width: 200
+ width: 120
 },
 {
 title: '动作',
 key: 'action',
- width: 180
+ width: 120
 },
 {
 title: '文档名称',
@@ -69,12 +69,6 @@ export default {
 }
 ],
 data: [],
-
- actionMap: {
- DELETE: '删除',
- GET: '查询'
- },
-
 height: 600,
 currentPage: this.$route.query.page &#124;&#124; 1,
 totalItems: 5,
@@ -110,7 +104,7 @@ export default {
 obj['id'] = resultElement['id']
 obj['time'] = parseTime(new Date(resultElement['createDate']), '{y}年{m}月{d}日 {h}:{i}:{s}');// resultElement['createTime']
 obj['user'] = resultElement['userName']
- obj['action'] = this.actionMap[resultElement['action']] &#124;&#124; "未知动作"
+ obj['action'] = resultElement['action'] &#124;&#124; "未知动作"
 obj['name'] = resultElement['docName']
 this.data.push(obj)
 obj = {}
From fec20eb0e6a9473737bb4c85eea8d1815cb80f27 Mon Sep 17 00:00:00 2001
From: Jarrett <291979254@qq.com>
Date: Sun, 1 Sep 2024 15:38:17 +0800
Subject: [PATCH 4/5] add: bei an
---
 src/views/users/LoginNew.vue &#124; 3 +++
 1 file changed, 3 insertions(+)
diff --git a/src/views/users/LoginNew.vue b/src/views/users/LoginNew.vue
index 8f0cd91..ec02ab1 100644
--- a/src/views/users/LoginNew.vue
+++ b/src/views/users/LoginNew.vue
@@ -8,6 +8,9 @@
 
 </col>
 </row>
+ <div>
+ <br><a href="https://beian.miit.gov.cn/">蜀ICP备2021021531号-2</a>
+ </div>
 </div>
 </div>
 </template>
From 1c5c2a0aea37898c07ac9b53f70d36eaa2b97cd5 Mon Sep 17 00:00:00 2001
From: Jarrett <291979254@qq.com>
Date: 2024年11月17日 11:55:38 +0800
Subject: [PATCH 5/5] add: ppt file preview
---
 src/views/admin/DocLog.vue &#124; 2 --
 src/views/preview/index.vue &#124; 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/views/admin/DocLog.vue b/src/views/admin/DocLog.vue
index d2dc2bb..2446b70 100644
--- a/src/views/admin/DocLog.vue
+++ b/src/views/admin/DocLog.vue
@@ -129,8 +129,6 @@ export default {
 },
 
 removeBatch() {
-
- this.$Message.info('receive cancel');
 let currentSelection = this.$refs.logTable.getSelection();
 if (currentSelection.length < 1) { this.$Message.warning("请勾选!") diff --git a/src/views/preview/index.vue b/src/views/preview/index.vue index 46f992e..02a7de8 100644 --- a/src/views/preview/index.vue +++ b/src/views/preview/index.vue @@ -148,6 +148,7 @@ export default { case 'doc': this.component = () => import('@/views/preview/WordView3')
 break
+ case 'ppt':
 case 'pptx':
 // this.component = () => import('@/views/preview/PPTxView')
 this.component = () => import('@/views/preview/PptxView2')
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://github.com/Jarrettluo/all-docs-vue/compare/master...develop.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/Jarrettluo/all-docs-vue/compare/master...develop.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>