From fe058b0cabc58ea274ae4b43707cbc252c4ddd80 Mon Sep 17 00:00:00 2001
From: wuchao <sdhzw@163.com>
Date: Wed, 26 Mar 2025 17:28:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=88=86=E4=BA=AB=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=86=E7=A0=81&?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E9=A1=B5=E5=A2=9E=E5=8A=A0=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 78254d5f2fa77228ef1c796afe1798d827199b66)
---
 front/src/layout_share/index.vue              |  54 +++++-
 front/src/utils/i18n/languages/en-us.js       |   3 +
 front/src/utils/i18n/languages/zh-cn.js       |   3 +
 front/src/views/project/ShareConfig/index.vue | 165 ++++++++++++++++--
 mysql-clean.sql                               |   1 +
 mysql.sql                                     |   1 +
 mysql_compat.sql                              |   1 +
 .../java/cn/torna/dao/entity/ShareConfig.java |   2 +
 .../cn/torna/service/ShareConfigService.java  |  18 +-
 .../java/cn/torna/service/UpgradeService.java |  12 +-
 .../cn/torna/service/dto/ShareConfigDTO.java  |   6 +
 .../web/controller/doc/vo/ShareConfigVO.java  |   3 +
 12 files changed, 231 insertions(+), 38 deletions(-)

diff --git a/front/src/layout_share/index.vue b/front/src/layout_share/index.vue
index 8ad3560a..a54d5972 100644
--- a/front/src/layout_share/index.vue
+++ b/front/src/layout_share/index.vue
@@ -20,14 +20,29 @@
         auto-complete="on"
         @submit.native.prevent
       >
+        <div class="share-name" >{{ shareConfig.shareName }}</div>
         <el-form-item prop="password">
           <el-input
             v-model="encryptFormData.password"
-            type="password"
+            :type="isPasswordVisible ? 'text' : 'password'"
             :placeholder="$t('visitPassword')"
-            prefix-icon="el-icon-lock"
+            class="password-style"
           >
-            <el-button slot="append" class="btn-send" native-type="submit" @click="onCheckPassword">{{ $t('btnOk') }}</el-button>
+            <template #append>
+              <el-button
+                @click="togglePasswordVisibility"
+                class="lock-icon-button"
+              >
+                <i :class="isPasswordVisible ? 'el-icon-unlock' : 'el-icon-lock'"></i>
+              </el-button>
+              <el-button
+                class="btn-send"
+                native-type="submit"
+                @click="onCheckPassword"
+              >
+                {{ $t('btnOk') }}
+              </el-button>
+            </template>
           </el-input>
         </el-form-item>
       </el-form>
@@ -55,16 +70,18 @@ export default {
     return {
       shareConfig: {
         id: '',
-        type: 0
+        type: 0,
+        shareName: ''
       },
       encryptFormData: {
         password: ''
       },
       encryptFormRules: {
         password: [
-          { required: true, message: $t('notEmpty'), trigger: 'blur' }
+          { required: true, message: $t('passwordNotEmpty'), trigger: 'blur' }
         ]
-      }
+      },
+      isPasswordVisible: false
     }
   },
   computed: {
@@ -151,6 +168,9 @@ export default {
     },
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBarView', { withoutAnimation: false })
+    },
+    togglePasswordVisibility() {
+      this.isPasswordVisible = !this.isPasswordVisible;
     }
   }
 }
@@ -165,6 +185,9 @@ export default {
     position: relative;
     height: 100%;
     width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     &.mobile.openSidebar{
       position: fixed;
       top: 0;
@@ -192,6 +215,23 @@ export default {
     width: 100%;
   }
   .encrypt-form {
-    margin-top: 200px;
+    margin-top: 0;
+    width: 600px;
+    padding: 40px;
+    box-sizing: border-box;
+  }
+
+  .share-name {
+    text-align: center;
+    margin-bottom: 25px;
+    font-weight: bold;
+    font-size: 20px;
+    min-height: 25px;
+  }
+
+  .btn-send {
+    height: 40px;
+    line-height: 40px;
+    padding: 0 10px;
   }
 </style>
diff --git a/front/src/utils/i18n/languages/en-us.js b/front/src/utils/i18n/languages/en-us.js
index 271c5324..7fd29e5b 100644
--- a/front/src/utils/i18n/languages/en-us.js
+++ b/front/src/utils/i18n/languages/en-us.js
@@ -477,6 +477,9 @@ export default {
   'valid': 'valid',
   'invalid': 'invalid',
   'bindingApiDoc': 'Binding interface document',
+  'randomPassword': ' Random Password',
+  'passwordNotEmpty': 'Password not empty',
+  'shareName': 'Share Name',
   // ---- common end ----
   // ---- 组件特有的，key表示组件名称(文件夹名称) ----
   RichTextEditor: {
diff --git a/front/src/utils/i18n/languages/zh-cn.js b/front/src/utils/i18n/languages/zh-cn.js
index 069eb783..95fdd39e 100644
--- a/front/src/utils/i18n/languages/zh-cn.js
+++ b/front/src/utils/i18n/languages/zh-cn.js
@@ -478,6 +478,9 @@ export default {
   'valid': '有效',
   'invalid': '无效',
   'bindingApiDoc': '绑定接口文档',
+  'randomPassword': ' 随机密码',
+  'passwordNotEmpty': '密码不能为空',
+  'shareName': '分享名称',
   // ---- common end ----
   // ---- 组件特有的，key表示组件名称(文件夹名称) ----
   RichTextEditor: {
diff --git a/front/src/views/project/ShareConfig/index.vue b/front/src/views/project/ShareConfig/index.vue
index 761a9565..8b636d4b 100644
--- a/front/src/views/project/ShareConfig/index.vue
+++ b/front/src/views/project/ShareConfig/index.vue
@@ -8,23 +8,40 @@
       border
       highlight-current-row
     >
-      <el-table-column :label="$t('shareUrl')" show-overflow-tooltip>
+      <el-table-column :label="$t('shareName')" prop="shareName" width="200"/>
+      <el-table-column :label="$t('shareUrl')"  show-overflow-tooltip  >
         <template slot-scope="scope">
-          <el-link type="primary" :href="buildUrl(scope.row)" target="_blank">{{ buildUrl(scope.row) }}</el-link>
-          <span v-if="scope.row.type === getEnums().SHARE_TYPE.ENCRYPT">
-            &nbsp;&nbsp;{{ $t('pwdShow') }}：{{ scope.row.password }}
-          </span>
-          <span v-if="scope.row.remark.length > 0" class="info-tip">
-            {{ $t('remarkShow') }}：{{ scope.row.remark }}
-          </span>
+          <div class="share-url-wrapper">
+            <el-link type="primary" :href="buildUrl(scope.row)" target="_blank">{{ buildUrl(scope.row) }}</el-link>
+            <el-button
+              type="text"
+              class="copy-btn"
+              @click="copyUrl(buildUrl(scope.row))"
+            >
+              <i class="el-icon-document-copy"></i>
+            </el-button>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('shareDoc')" width="100">
+      <el-table-column :label="$t('pwdShow')" prop="password" width="120">
         <template slot-scope="scope">
-          <span v-if="scope.row.isAll">{{ $t('allDocs') }}</span>
-          <el-button v-else type="text" @click="viewDoc(scope.row)">{{ $t('look') }}</el-button>
+          <div class="password-wrapper">
+            <span>{{ scope.row.password }}</span>
+            <el-button
+              type="text"
+              class="copy-btn"
+              @click="copyPassword(scope.row.password)"
+            >
+              <i class="el-icon-document-copy"></i>
+            </el-button>
+          </div>
         </template>
-      </el-table-column>
+      </el-table-column>      <el-table-column :label="$t('shareDoc')" width="100">
+      <template slot-scope="scope">
+        <span v-if="scope.row.isAll">{{ $t('allDocs') }}</span>
+        <el-button v-else type="text" @click="viewDoc(scope.row)">{{ $t('look') }}</el-button>
+      </template>
+    </el-table-column>
       <el-table-column :label="$t('shareStyle')" width="100">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.type === getEnums().SHARE_TYPE.PUBLIC">{{ $t('public') }}</el-tag>
@@ -58,6 +75,7 @@
           <span :title="scope.row.gmtCreate">{{ scope.row.gmtCreate.split(' ')[0] }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('remark')" prop="remark" width="150"/>
       <el-table-column
         :label="$t('operation')"
         width="200"
@@ -110,8 +128,8 @@
         label-width="120px"
         size="mini"
       >
-        <el-form-item :label="$t('remark')">
-          <el-input v-model="dialogFormData.remark" :placeholder="$t('optional')" show-word-limit maxlength="50"/>
+        <el-form-item :label="$t('shareName')">
+          <el-input v-model="dialogFormData.shareName" :placeholder="$t('optional')" show-word-limit maxlength="50"/>
         </el-form-item>
         <el-form-item :label="$t('shareStyle')">
           <el-radio-group v-model="dialogFormData.type">
@@ -119,6 +137,12 @@
             <el-radio :label="2">{{ $t('encryption') }}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item v-if="dialogFormData.type === 2" :label="$t('pwdShow')" prop="password">
+          <el-input v-model="dialogFormData.password" :type="passwordType" maxlength="32">
+            <el-button slot="append" @click="generateRandomPassword">{{ $t('randomPassword') }}</el-button>
+            <i slot="suffix" :class="['el-input__icon', passwordType === 'password' ? 'el-icon-lock' : 'el-icon-unlock']" style="cursor: pointer" @click="togglePasswordVisibility"></i>
+          </el-input>
+        </el-form-item>
         <el-form-item :label="$t('expirationTime')">
           <template slot="label">
             <span>{{ $t('expirationTime') }}</span>
@@ -159,6 +183,9 @@
         <el-form-item v-show="dialogFormData.isAll === 0">
           <doc-tree ref="docTreeRef"/>
         </el-form-item>
+        <el-form-item :label="$t('remark')">
+          <el-input v-model="dialogFormData.remark" :placeholder="$t('optional')" show-word-limit maxlength="50"/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">{{ $t('dlgCancel') }}</el-button>
@@ -204,11 +231,25 @@ export default {
         isAll: 0,
         remark: '',
         isShowDebug: 1,
-        moduleEnvironmentIdList: []
+        moduleEnvironmentIdList: [] ,
+        password: '',
+        shareName: '',
       },
       autoAppend: 1,
       moduleEnvironmentList: [],
-      dialogFormRules: {},
+      passwordType: 'password',
+      dialogFormRules: {
+        password: [
+          { required: true, message: this.$t('passwordNotEmpty'), trigger: 'blur', validator: (rule, value, callback) => {
+              console.log(value)
+              if (this.dialogFormData.type === 2 && !value) {
+                callback(new Error(this.$t('passwordNotEmpty')))
+              } else {
+                callback()
+              }
+            }}
+        ]
+      },
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() < Date.now() - 8.64e7; // Disable dates before today
@@ -231,6 +272,25 @@ export default {
     }
   },
   methods: {
+    togglePasswordVisibility() {
+      this.passwordType = this.passwordType === 'password' ? 'text' : 'password';
+    },
+    generateRandomPassword() {
+      const chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz0123456789';
+      let password = '';
+      for (let i = 0; i < 8; i++) {
+        password += chars.charAt(Math.floor(Math.random() * chars.length));
+      }
+      this.dialogFormData.password = password;
+      this.$nextTick(() => {
+        this.$refs.dialogForm.validateField('password');
+      });
+      this.$message({
+        message: this.$t('pwdShow') + ': ' + password,
+        type: 'success',
+        duration: 3000
+      });
+    },
     reload(moduleId) {
       if (moduleId) {
         this.moduleId = moduleId
@@ -257,6 +317,7 @@ export default {
         moduleId: '',
         isAll: 0,
         remark: '',
+        password: '',
         moduleEnvironmentList: [],
         moduleEnvironmentIdList: []
       }
@@ -379,6 +440,10 @@ export default {
       data.content = content
       data.isAllSelectedDebug = this.checkAll
       const uri = this.dialogFormData.id ? '/doc/share/update' : '/doc/share/add'
+      if (this.dialogFormData.type === 2 && !this.dialogFormData.password) {
+        this.tipError(this.$t('passwordNotEmpty'))
+        return
+      }
       if (this.checkAll) {
         this.dialogFormData.moduleEnvironmentIdList = []
       }
@@ -426,7 +491,75 @@ export default {
           })
         })
       })
+    },
+    copyUrl(url) {
+      navigator.clipboard.writeText(url).then(() => {
+        this.$message({
+          message: this.$t('copySuccess'),
+          type: 'success',
+          duration: 2000
+        });
+      }).catch(() => {
+        this.$message({
+          message: this.$t('copyFailed'),
+          type: 'error'
+        });
+      });
+    },
+    copyPassword(password) {
+      navigator.clipboard.writeText(password).then(() => {
+        this.$message({
+          message: this.$t('copySuccess'),
+          type: 'success',
+          duration: 2000
+        });
+      }).catch(() => {
+        this.$message({
+          message: this.$t('copyFailed'),
+          type: 'error'
+        });
+      });
     }
   }
 }
 </script>
+
+<style scoped>
+.share-url-wrapper {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  position: relative;
+}
+
+.copy-btn {
+  padding: 2px 5px;
+  opacity: 0;
+  transition: opacity 0.3s;
+  position: absolute;
+  right: 0;
+}
+
+.share-url-wrapper:hover .copy-btn {
+  opacity: 1;
+}
+
+.password-wrapper {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  position: relative;
+}
+
+.copy-btn {
+  padding: 2px 5px;
+  opacity: 0;
+  transition: opacity 0.3s;
+  position: absolute;
+  right: 0;
+}
+
+.password-wrapper:hover .copy-btn {
+  opacity: 1;
+}
+</style>
diff --git a/mysql-clean.sql b/mysql-clean.sql
index f69c29f6..1e3dc4f5 100644
--- a/mysql-clean.sql
+++ b/mysql-clean.sql
@@ -574,6 +574,7 @@ CREATE TABLE `share_config` (
                                 `is_all_selected_debug` tinyint(4) NOT NULL DEFAULT '1' COMMENT '调试环境是否全选， 1-全选， 0-不选',
                                 `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP,
                                 `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                                `share_name` varchar(128) NOT NULL DEFAULT '' COMMENT '分享名称',
                                 PRIMARY KEY (`id`) USING BTREE,
                                 KEY `idx_moduleid` (`module_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='分享配置表';
diff --git a/mysql.sql b/mysql.sql
index 09eb29a9..43e60ef3 100644
--- a/mysql.sql
+++ b/mysql.sql
@@ -573,6 +573,7 @@ CREATE TABLE `share_config` (
                                 `is_all_selected_debug` tinyint(4) NOT NULL DEFAULT '1' COMMENT '调试环境是否全选， 1-全选， 0-不选',
                                 `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP,
                                 `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                                `share_name` varchar(128) NOT NULL DEFAULT '' COMMENT '分享名称',
                                 PRIMARY KEY (`id`) USING BTREE,
                                 KEY `idx_moduleid` (`module_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='分享配置表';
diff --git a/mysql_compat.sql b/mysql_compat.sql
index 95567ad7..6fade98e 100644
--- a/mysql_compat.sql
+++ b/mysql_compat.sql
@@ -496,6 +496,7 @@ CREATE TABLE `share_config` (
                                 `is_all_selected_debug` tinyint(4) NOT NULL DEFAULT '1' COMMENT '调试环境是否全选， 1-全选， 0-不选',
                                 `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP,
                                 `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ,
+								`share_name` varchar(128) NOT NULL DEFAULT '' COMMENT '分享名称',
                                 PRIMARY KEY (`id`) USING BTREE,
                                 KEY `idx_moduleid` (`module_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='分享配置表';
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 e0e27e94..e452308e 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
@@ -64,5 +64,7 @@ public class ShareConfig {
     /**  数据库字段：gmt_modified */
     private LocalDateTime gmtModified;
 
+    /**  分享名称：share_name */
+    private String shareName;
 
 }
\ No newline at end of file
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 84a1d43e..50dd2088 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
@@ -58,12 +58,8 @@ public class ShareConfigService extends BaseLambdaService<ShareConfig, ShareConf
         shareConfig.setCreatorName(user.getNickname());
         shareConfig.setStatus(StatusEnum.ENABLE.getStatus());
         shareConfig.setIsShowDebug(shareConfigDTO.getIsShowDebug());
-        if (shareConfigDTO.getType() == ShareConfigTypeEnum.ENCRYPT.getType()) {
-            String pwd = PasswordUtil.getRandomSimplePassword(4);
-            shareConfig.setPassword(pwd);
-        } else {
-            shareConfig.setPassword("");
-        }
+        shareConfig.setPassword(shareConfigDTO.getPassword());
+        shareConfig.setShareName(shareConfigDTO.getShareName());
         // 设置过期时间
         shareConfig.setExpirationTime(shareConfigDTO.getExpirationTime());
         this.save(shareConfig);
@@ -80,14 +76,8 @@ public class ShareConfigService extends BaseLambdaService<ShareConfig, ShareConf
         shareConfig.setRemark(shareConfigDTO.getRemark());
         shareConfig.setIsShowDebug(shareConfigDTO.getIsShowDebug());
         shareConfig.setIsAllSelectedDebug(shareConfigDTO.getIsAllSelectedDebug());
-        if (shareConfigDTO.getType() == ShareConfigTypeEnum.ENCRYPT.getType()) {
-            if (StringUtils.isEmpty(shareConfig.getPassword())) {
-                String pwd = PasswordUtil.getRandomSimplePassword(4);
-                shareConfig.setPassword(pwd);
-            }
-        } else {
-            shareConfig.setPassword("");
-        }
+        shareConfig.setPassword(shareConfigDTO.getPassword());
+        shareConfig.setShareName(shareConfigDTO.getShareName());
         // 设置过期时间 如果是null 则永久有效
         shareConfig.setExpirationTime(shareConfigDTO.getExpirationTime());
         this.update(shareConfig);
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 10c887be..23cca146 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
@@ -46,7 +46,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class UpgradeService {
 
-    private static final int VERSION = 13100;
+    private static final int VERSION = 13103;
 
     private static final String TORNA_VERSION_KEY = "torna.version";
 
@@ -191,6 +191,16 @@ public class UpgradeService {
         v1_29_2(oldVersion);
         v1_30_1(oldVersion);
         v1_31_0(oldVersion);
+        v1_31_3(oldVersion);
+    }
+
+    private void v1_31_3(int oldVersion) {
+        int version = 13103;
+        if (oldVersion < version) {
+            log.info("Upgrade version to {}", version);
+            addColumn("share_config", "share_name",
+                    "ALTER TABLE `share_config` ADD COLUMN `share_name` varchar(128) NOT NULL DEFAULT '' COMMENT '分享名称';");
+        }
     }
 
     private void v1_31_0(int oldVersion) {
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 05fbd314..5d5efb13 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
@@ -32,6 +32,12 @@ public class ShareConfigDTO {
      */
     private Byte isAllSelectedDebug;
 
+    /**  分享密码 */
+    private String password;
+
+    /**  分享名称 */
+    private String shareName;
+
     /**
      * 模块环境id
      */
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 8dbf1112..4f015ec7 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
@@ -49,4 +49,7 @@ public class ShareConfigVO {
     private String creatorName;
 
     private LocalDateTime gmtCreate;
+
+    /** 分享名称 */
+    private String shareName;
 }
-- 
Gitee