From 92f9601a9cdc653391b583a6fc2ed4fa63ff3f3b Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Sun, 9 Apr 2023 22:45:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BC=80=E5=8F=91=E4=B8=AD...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../blog/service/impl/AttachService.java      | 17 +++++++++--
 .../manage/AttachManageComponent.vue          | 29 ++++++++++---------
 .../swagger/models/blog-update-require-vo.ts  |  2 +-
 blog-frontend/src/views/BlogEditView.vue      |  1 -
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/blog-backend/src/main/java/cn/hamster3/application/blog/service/impl/AttachService.java b/blog-backend/src/main/java/cn/hamster3/application/blog/service/impl/AttachService.java
index 82242f9..16ec78e 100644
--- a/blog-backend/src/main/java/cn/hamster3/application/blog/service/impl/AttachService.java
+++ b/blog-backend/src/main/java/cn/hamster3/application/blog/service/impl/AttachService.java
@@ -48,15 +48,21 @@ public class AttachService implements IAttachService {
         if (checked != null) {
             return checked;
         }
-        log.info("prepare to save file: {}({} bytes)", file.getOriginalFilename(), file.getSize());
+        log.info("prepare to save file: {}({} kb)", file.getOriginalFilename(), file.getSize() / 1024.0);
+        long time1 = System.currentTimeMillis();
         AttachEntity attachEntity = new AttachEntity();
         attachEntity.setFilename(file.getOriginalFilename());
         attachEntity.setContentType(file.getContentType());
         attachEntity.setData(file.getBytes());
         attachEntity = attachRepo.save(attachEntity);
+        long time2 = System.currentTimeMillis();
+        log.info("file upload finished, took {} ms", time2 - time1);
 
         File localCacheFile = new File(ATTACH_FOLDER, String.valueOf(attachEntity.getId()));
         Files.copy(file.getInputStream(), localCacheFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        log.info("written attach data to local cache file: {}. took {} ms",
+                localCacheFile.getName(),
+                System.currentTimeMillis() - time2);
 
         return ResponseVO.success(attachEntity.getId());
     }
@@ -113,16 +119,23 @@ public class AttachService implements IAttachService {
         if (!attachRepo.existsById(attachID)) {
             return ResponseVO.notFound();
         }
+        log.info("update attach {}, save file {} to database. ({} kb)", attachID,
+                file.getOriginalFilename(), file.getSize() / 1024.0);
+        long time1 = System.currentTimeMillis();
         attachRepo.updateFilenameAndContentTypeAndDataById(
                 file.getOriginalFilename(),
                 file.getContentType(),
                 file.getBytes(),
                 attachID
         );
+        long time2 = System.currentTimeMillis();
+        log.info("file upload finished, took {} ms", time2 - time1);
 
         File localCacheFile = new File(ATTACH_FOLDER, String.valueOf(attachID));
         Files.copy(file.getInputStream(), localCacheFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-        log.info("written attach data to local cache file: {}", localCacheFile.getName());
+        log.info("written attach data to local cache file: {}. took {} ms",
+                localCacheFile.getName(),
+                System.currentTimeMillis() - time2);
 
         return ResponseVO.success();
     }
diff --git a/blog-frontend/src/components/manage/AttachManageComponent.vue b/blog-frontend/src/components/manage/AttachManageComponent.vue
index 41ad8b1..2e67de7 100644
--- a/blog-frontend/src/components/manage/AttachManageComponent.vue
+++ b/blog-frontend/src/components/manage/AttachManageComponent.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted, ref } from "vue";
 import { ElMessage } from "element-plus";
-import type { UploadRawFile, UploadRequestOptions } from "element-plus";
+import type { UploadRequestOptions } from "element-plus";
 
 import { api } from "@/api";
 import type { AttachInfoResponseVO } from "@/swagger";
@@ -32,7 +32,7 @@ function loadPage(newPage: number) {
 }
 
 function uploadAttach(options: UploadRequestOptions) {
-  api.AttachController.createAttachForm(options.file).then((resp) => {
+  return api.AttachController.createAttachForm(options.file).then((resp) => {
     const vo = resp.data;
     if (vo.code === 200) {
       ElMessage({
@@ -48,7 +48,6 @@ function uploadAttach(options: UploadRequestOptions) {
       });
     }
   });
-  return false;
 }
 
 async function updateAttach(options: UploadRequestOptions) {
@@ -111,13 +110,13 @@ function deleteAttach(id: number) {
         </template>
         <p>
           由 {{ attach.creator.nickname }} 首次创建于
-          {{ attach.createTime.toTimeString() }}
+          {{ attach.createTime.toLocaleString() }}
         </p>
         <p>
           由 {{ attach.creator.nickname }} 最后修改于
-          {{ attach.updateTime.toTimeString() }}
+          {{ attach.updateTime.toLocaleString() }}
         </p>
-        <div style="display: flex" class="attach-card-buttons">
+        <div class="attach-card-buttons">
           <div style="flex-grow: 1"></div>
           <el-upload
             :http-request="updateAttach"
@@ -131,7 +130,11 @@ function deleteAttach(id: number) {
           >
             <el-button type="success">编辑</el-button>
           </el-upload>
-          <el-button type="danger" @click="deleteAttach(attach.id)">
+          <el-button
+            type="danger"
+            @click="deleteAttach(attach.id)"
+            style="margin-left: 15px"
+          >
             删除
           </el-button>
           <div style="flex-grow: 1"></div>
@@ -167,19 +170,19 @@ function deleteAttach(id: number) {
 
 .attach-list {
   display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
   margin-left: 5px;
   margin-right: 5px;
 }
 
 .attach-card {
-  margin-left: 12px;
+  margin-bottom: 15px;
+  max-width: 400px;
 }
 
-attach-card-buttons {
+.attach-card-buttons {
   display: flex;
-}
-
-.attach-card-buttons > * {
-  margin-left: 15px;
+  margin-top: 15px;
 }
 </style>
diff --git a/blog-frontend/src/swagger/models/blog-update-require-vo.ts b/blog-frontend/src/swagger/models/blog-update-require-vo.ts
index 2343aac..bdd4efc 100644
--- a/blog-frontend/src/swagger/models/blog-update-require-vo.ts
+++ b/blog-frontend/src/swagger/models/blog-update-require-vo.ts
@@ -52,5 +52,5 @@ export interface BlogUpdateRequireVO {
      * @type {Array<string>}
      * @memberof BlogUpdateRequireVO
      */
-    tags?: Array<string>;
+    tags: Array<string>;
 }
diff --git a/blog-frontend/src/views/BlogEditView.vue b/blog-frontend/src/views/BlogEditView.vue
index 2ec3743..dd940b4 100644
--- a/blog-frontend/src/views/BlogEditView.vue
+++ b/blog-frontend/src/views/BlogEditView.vue
@@ -40,7 +40,6 @@ onMounted(() => {
         editBlog.top = blog?.top;
         editBlog.publish = blog?.publish;
         editBlog.content = blog?.content ?? "";
-        tags.value = blog?.tags.toString();
       } else {
         ElMessage({
           type: "error",