From 86f1653258995333a21d4c00b854fbbd55e64758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E4=BC=9F=E5=AD=98?= <linweicun@southzn.com>
Date: Mon, 19 Feb 2024 11:27:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=88=86=E4=BA=AB=E7=AE=A1=E7=90=86):=20:?=
 =?UTF-8?q?sparkles:=20=E5=88=86=E4=BA=AB=E6=96=87=E6=A1=A3=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/utils/i18n/languages/en-us.js       |  4 ++
 front/src/utils/i18n/languages/zh-cn.js       |  4 ++
 front/src/views/project/ShareConfig/index.vue | 62 ++++++++++++++-----
 .../java/cn/torna/dao/entity/ShareConfig.java |  4 ++
 .../cn/torna/service/ShareConfigService.java  | 17 +++--
 .../java/cn/torna/service/UpgradeService.java | 13 ++++
 .../cn/torna/service/dto/ShareConfigDTO.java  |  4 ++
 .../web/controller/doc/vo/ShareConfigVO.java  |  4 ++
 .../web/controller/share/ShareController.java | 15 ++---
 9 files changed, 99 insertions(+), 28 deletions(-)

diff --git a/front/src/utils/i18n/languages/en-us.js b/front/src/utils/i18n/languages/en-us.js
index ead16bf2..1c76df4c 100644
--- a/front/src/utils/i18n/languages/en-us.js
+++ b/front/src/utils/i18n/languages/en-us.js
@@ -221,6 +221,10 @@ export default {
   'shareUrl': 'Share Url',
   'shareDoc': 'Share Doc',
   'shareStyle': 'Share Style',
+  'expirationTime': 'Expiration Time',
+  'permanentValidity': 'Permanent Validity',
+  'permanentValidityTip': 'Leave empty for perpetual validity',
+  'expirationTimePicker': 'Please Pick a day',
   'encryption': 'Encryption',
   'deleteRowConfirm': 'Delete record?',
   'remark': 'Remark',
diff --git a/front/src/utils/i18n/languages/zh-cn.js b/front/src/utils/i18n/languages/zh-cn.js
index acc6f5c5..f1d3676e 100644
--- a/front/src/utils/i18n/languages/zh-cn.js
+++ b/front/src/utils/i18n/languages/zh-cn.js
@@ -218,6 +218,10 @@ export default {
   'shareUrl': '分享链接',
   'shareDoc': '分享文档',
   'shareStyle': '分享形式',
+  'expirationTime': '过期时间',
+  'permanentValidity': '永久有效',
+  'permanentValidityTip': '留空表示永不过期',
+  'expirationTimePicker': '请选择日期',
   'encryption': '加密',
   'deleteRowConfirm': '确定要删除此记录吗',
   'remark': '备注',
diff --git a/front/src/views/project/ShareConfig/index.vue b/front/src/views/project/ShareConfig/index.vue
index 4e5c5282..af1196b3 100644
--- a/front/src/views/project/ShareConfig/index.vue
+++ b/front/src/views/project/ShareConfig/index.vue
@@ -31,7 +31,12 @@
           <el-tag v-if="scope.row.type === getEnums().SHARE_TYPE.ENCRYPT" type="warning">{{ $t('encryption') }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('creator')" prop="creatorName" width="120" />
+      <el-table-column :label="$t('expirationTime')" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.expirationTime ? scope.row.expirationTime : $t('permanentValidity') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('creator')" prop="creatorName" width="120"/>
       <el-table-column :label="$t('status')" width="80">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.status === getEnums().STATUS.ENABLE" type="success">{{ $t('enable') }}</el-tag>
@@ -59,10 +64,14 @@
       >
         <template slot-scope="scope">
           <el-link type="primary" :underline="false" @click="onTableUpdate(scope.row)">{{ $t('update') }}</el-link>
-          <el-link v-if="scope.row.status === getEnums().STATUS.ENABLE" type="warning" :underline="false" @click="onTableDisable(scope.row)">
+          <el-link v-if="scope.row.status === getEnums().STATUS.ENABLE" type="warning" :underline="false"
+                   @click="onTableDisable(scope.row)">
             {{ $t('disable') }}
           </el-link>
-          <el-link v-else type="success" :underline="false" @click="onTableEnable(scope.row)">{{ $t('enable') }}</el-link>
+          <el-link v-else type="success" :underline="false" @click="onTableEnable(scope.row)">{{
+              $t('enable')
+            }}
+          </el-link>
           <el-popconfirm
             :title="$t('deleteRowConfirm')"
             @confirm="onTableDelete(scope.row)"
@@ -102,7 +111,7 @@
         size="mini"
       >
         <el-form-item :label="$t('remark')">
-          <el-input v-model="dialogFormData.remark" :placeholder="$t('optional')" show-word-limit maxlength="50" />
+          <el-input v-model="dialogFormData.remark" :placeholder="$t('optional')" show-word-limit maxlength="50"/>
         </el-form-item>
         <el-form-item :label="$t('shareStyle')">
           <el-radio-group v-model="dialogFormData.type">
@@ -110,6 +119,20 @@
             <el-radio :label="2">{{ $t('encryption') }}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item :label="$t('expirationTime')">
+          <template slot="label">
+            <span>{{ $t('expirationTime') }}</span>
+            <el-tooltip placement="top" :content="$t('permanentValidityTip')">
+              <i class="el-icon-question"/>
+            </el-tooltip>
+          </template>
+          <el-date-picker
+            v-model="dialogFormData.expirationTime"
+            :picker-options="pickerOptions"
+            :placeholder="$t('expirationTimePicker')"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"/>
+        </el-form-item>
         <el-form-item :label="$t('selectDoc')">
           <el-radio-group v-model="dialogFormData.isAll">
             <el-radio :label="0">{{ $t('partDocs') }}</el-radio>
@@ -127,11 +150,14 @@
         <el-form-item v-show="dialogFormData.isShowDebug" :label="$t('debugEnv')">
           <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate">{{ $t('selectAll') }}</el-checkbox>
           <el-checkbox-group v-model="dialogFormData.moduleEnvironmentIdList">
-            <el-checkbox v-for="(env, index) in moduleEnvironmentList" :key="index" :label="env.id">{{ env.name }}</el-checkbox>
+            <el-checkbox v-for="(env, index) in moduleEnvironmentList" :key="index" :label="env.id">{{
+                env.name
+              }}
+            </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item v-show="dialogFormData.isAll === 0">
-          <doc-tree ref="docTreeRef" />
+          <doc-tree ref="docTreeRef"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -144,7 +170,7 @@
       :visible.sync="dialogViewVisible"
       @close="() => { $refs.docTreeViewRef.clear() }"
     >
-      <doc-tree ref="docTreeViewRef" view-mode />
+      <doc-tree ref="docTreeViewRef" view-mode/>
     </el-dialog>
   </div>
 </template>
@@ -152,10 +178,8 @@
 import DocTree from '@/components/DocTree'
 
 export default {
-  components: { DocTree },
-  props: {
-
-  },
+  components: {DocTree},
+  props: {},
   data() {
     return {
       moduleId: '',
@@ -175,6 +199,7 @@ export default {
       dialogFormData: {
         id: '',
         type: 1,
+        expirationTime: '',
         moduleId: '',
         isAll: 0,
         remark: '',
@@ -183,7 +208,11 @@ export default {
       },
       autoAppend: 1,
       moduleEnvironmentList: [],
-      dialogFormRules: {
+      dialogFormRules: {},
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7; // Disable dates before today
+        }
       }
     }
   },
@@ -223,6 +252,7 @@ export default {
       this.dialogFormData = {
         id: '',
         type: 1,
+        expirationTime: '',
         isShowDebug: 0,
         moduleId: '',
         isAll: 0,
@@ -235,13 +265,13 @@ export default {
       })
     },
     loadDebugEnvs(moduleId, shareConfigId) {
-      this.get('/module/environment/list', { moduleId: moduleId }, resp => {
+      this.get('/module/environment/list', {moduleId: moduleId}, resp => {
         this.moduleEnvironmentList = resp.data
       })
       if (!shareConfigId) {
         return
       }
-      this.get('/doc/share/listEnvironment', { id: shareConfigId }, resp => {
+      this.get('/doc/share/listEnvironment', {id: shareConfigId}, resp => {
         this.$set(this.dialogFormData, 'moduleEnvironmentIdList', resp.data.map(item => item.moduleEnvironmentId))
       })
     },
@@ -263,7 +293,7 @@ export default {
         }
 
         if (!row.isAll) {
-          this.get('/doc/share/listShareDocIds', { id: row.id }, resp => {
+          this.get('/doc/share/listShareDocIds', {id: row.id}, resp => {
             const contentList = resp.data
             // 所有的文档id
             const idList = contentList.map(row => row.docId)
@@ -378,7 +408,7 @@ export default {
     viewDoc(row) {
       this.dialogViewVisible = true
       this.$nextTick(() => {
-        this.get('/doc/share/listShareDocIds', { id: row.id }, resp => {
+        this.get('/doc/share/listShareDocIds', {id: row.id}, resp => {
           const contentList = resp.data
           const idList = contentList.map(row => row.docId)
           this.reloadDocTreeView(treeData => {
diff --git a/server/server-dao/src/main/java/cn/torna/dao/entity/ShareConfig.java b/server/server-dao/src/main/java/cn/torna/dao/entity/ShareConfig.java
index 05fca139..e0e27e94 100644
--- a/server/server-dao/src/main/java/cn/torna/dao/entity/ShareConfig.java
+++ b/server/server-dao/src/main/java/cn/torna/dao/entity/ShareConfig.java
@@ -5,6 +5,7 @@ import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 
@@ -27,6 +28,9 @@ public class ShareConfig {
     /** 密码, 数据库字段：password */
     private String password;
 
+    /**  过期时间 null:永久有效 数据库字段：expiration_time */
+    private LocalDate expirationTime;
+
     /** 状态，1：有效，0：无效, 数据库字段：status */
     private Byte status;
 
diff --git a/server/server-service/src/main/java/cn/torna/service/ShareConfigService.java b/server/server-service/src/main/java/cn/torna/service/ShareConfigService.java
index d091e49b..d480232d 100644
--- a/server/server-service/src/main/java/cn/torna/service/ShareConfigService.java
+++ b/server/server-service/src/main/java/cn/torna/service/ShareConfigService.java
@@ -64,6 +64,8 @@ public class ShareConfigService extends BaseService<ShareConfig, ShareConfigMapp
         } else {
             shareConfig.setPassword("");
         }
+        // 设置过期时间
+        shareConfig.setExpirationTime(shareConfigDTO.getExpirationTime());
         this.save(shareConfig);
         this.saveContent(shareConfig, shareConfigDTO);
         this.saveEnvironment(shareConfig, shareConfigDTO);
@@ -86,19 +88,21 @@ public class ShareConfigService extends BaseService<ShareConfig, ShareConfigMapp
         } else {
             shareConfig.setPassword("");
         }
+        // 设置过期时间 如果是null 则永久有效
+        shareConfig.setExpirationTime(shareConfigDTO.getExpirationTime());
         this.update(shareConfig);
         this.saveContent(shareConfig, shareConfigDTO);
         this.saveEnvironment(shareConfig, shareConfigDTO);
     }
 
     /**
-     *  保存分享环境
+     * 保存分享环境
      *
-     * @author Joker
      * @param shareConfig
      * @param shareConfigDTO
-     * @since 1.0.0
      * @return
+     * @author Joker
+     * @since 1.0.0
      */
     private void saveEnvironment(ShareConfig shareConfig, ShareConfigDTO shareConfigDTO) {
         // 新增,更新,公开到非公共都先删除
@@ -218,6 +222,7 @@ public class ShareConfigService extends BaseService<ShareConfig, ShareConfigMapp
 
     /**
      * 查询分享配置的文档信息
+     *
      * @param docId
      * @param shareConfigId
      * @return
@@ -244,6 +249,8 @@ public class ShareConfigService extends BaseService<ShareConfig, ShareConfigMapp
         return docDetail;
     }
 
-
-
+    @Override
+    public int update(ShareConfig entity) {
+        return super.getMapper().update(entity);
+    }
 }
\ No newline at end of file
diff --git a/server/server-service/src/main/java/cn/torna/service/UpgradeService.java b/server/server-service/src/main/java/cn/torna/service/UpgradeService.java
index 529cfca3..f034c304 100644
--- a/server/server-service/src/main/java/cn/torna/service/UpgradeService.java
+++ b/server/server-service/src/main/java/cn/torna/service/UpgradeService.java
@@ -127,8 +127,21 @@ public class UpgradeService {
         v1_24_0(oldVersion);
         v1_25_0(oldVersion);
         v1_26_0(oldVersion);
+        v1_26_1(oldVersion);
     }
 
+    private void v1_26_1(int oldVersion) {
+        if (oldVersion < 12610) {
+            log.info("Upgrade version to 1.26.1");
+            // 添加表字段 分享配置表新增字段 `过期时间`
+            addColumn("share_config", "expiration_time",
+                    "ALTER TABLE `share_config` ADD COLUMN `expiration_time` date COMMENT '过期时间。null:永久有效' AFTER `password`;");
+
+            log.info("Upgrade 1.26.1 finished.");
+        }
+    }
+
+
     private void v1_26_0(int oldVersion) {
         if (oldVersion < 12600) {
             log.info("Upgrade version to 1.26.0");
diff --git a/server/server-service/src/main/java/cn/torna/service/dto/ShareConfigDTO.java b/server/server-service/src/main/java/cn/torna/service/dto/ShareConfigDTO.java
index 15b7552b..05fbd314 100644
--- a/server/server-service/src/main/java/cn/torna/service/dto/ShareConfigDTO.java
+++ b/server/server-service/src/main/java/cn/torna/service/dto/ShareConfigDTO.java
@@ -4,6 +4,7 @@ import cn.torna.common.support.IdCodec;
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -23,6 +24,9 @@ public class ShareConfigDTO {
     /** 是否显示调试 */
     private Byte isShowDebug;
 
+    /**  过期时间 如果是永久有效,传递null */
+    private LocalDate expirationTime;
+
     /**
      * 调试环境是否全选， 1-全选， 0-不选
      */
diff --git a/server/server-web/src/main/java/cn/torna/web/controller/doc/vo/ShareConfigVO.java b/server/server-web/src/main/java/cn/torna/web/controller/doc/vo/ShareConfigVO.java
index e7e38775..8dbf1112 100644
--- a/server/server-web/src/main/java/cn/torna/web/controller/doc/vo/ShareConfigVO.java
+++ b/server/server-web/src/main/java/cn/torna/web/controller/doc/vo/ShareConfigVO.java
@@ -4,6 +4,7 @@ import cn.torna.common.support.IdCodec;
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -24,6 +25,9 @@ public class ShareConfigVO {
     /** 状态，1：有效，0：无效, 数据库字段：status */
     private Byte status;
 
+    /**  过期时间 如果是null 显示永久有效 */
+    private LocalDate expirationTime;
+
     /** module.id, 数据库字段：module_id */
     @JSONField(serializeUsing = IdCodec.class, deserializeUsing = IdCodec.class)
     private Long moduleId;
diff --git a/server/server-web/src/main/java/cn/torna/web/controller/share/ShareController.java b/server/server-web/src/main/java/cn/torna/web/controller/share/ShareController.java
index 62451dc1..0dbd8a77 100644
--- a/server/server-web/src/main/java/cn/torna/web/controller/share/ShareController.java
+++ b/server/server-web/src/main/java/cn/torna/web/controller/share/ShareController.java
@@ -21,13 +21,10 @@ import com.gitee.fastmybatis.core.query.Query;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.DigestUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -61,6 +58,10 @@ public class ShareController {
         if (shareConfig.getStatus() == StatusEnum.DISABLED.getStatus()) {
             throw new BizException("链接已失效");
         }
+        // 链接已过期
+        if (null != shareConfig.getExpirationTime() && shareConfig.getExpirationTime().isBefore(LocalDate.now())) {
+            throw new BizException("链接已过期");
+        }
     }
 
     @PostMapping("/checkPassword")
@@ -102,7 +103,7 @@ public class ShareController {
         for (DocInfo docInfo : docInfos) {
             boolean isFolder = Booleans.isTrue(docInfo.getIsFolder());
             String treeId = isFolder ? DocViewService.buildId(base, docInfo.getId()) : IdUtil.encode(docInfo.getId());
-            String parentId =  DocViewService.buildParentId(base, docInfo.getParentId());
+            String parentId = DocViewService.buildParentId(base, docInfo.getParentId());
             byte type = isFolder ? DocViewService.TYPE_FOLDER : DocViewService.TYPE_DOC;
             TreeDTO docInfoVO = new TreeDTO(treeId, docInfo.getName(), parentId, type);
             docInfoVO.setHttpMethod(docInfo.getHttpMethod());
@@ -138,7 +139,7 @@ public class ShareController {
                 List<DocInfo> childIdList = docInfoService.list(query);
                 idList.addAll(childIdList.stream().map(DocInfo::getId).collect(Collectors.toList()));
                 // 递归获取子文件夹下的文件内容
-                addChildFoldersAndFiles(idList, childIdList.stream().filter(doc->doc.getIsFolder().equals(Booleans.TRUE)).map(DocInfo::getId).collect(Collectors.toList()));
+                addChildFoldersAndFiles(idList, childIdList.stream().filter(doc -> doc.getIsFolder().equals(Booleans.TRUE)).map(DocInfo::getId).collect(Collectors.toList()));
             }
         }
         return idList;
-- 
Gitee