Merge remote-tracking branch 'origin/develop' into develop

ruoyi-admin/pom.xml

@@ -70,6 +70,13 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <!-- mybatis-plus -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.3.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysSecretProjectController.java

@@ -1,10 +1,9 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.system.domain.dto.SysSecretProjectDTO;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.web.utils.ClipboardUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,7 +19,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.SysSecretProject;
 import com.ruoyi.system.service.ISysSecretProjectService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
 /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClipboardUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.utils;
 
 import java.awt.*;
 import java.awt.datatransfer.*;

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysSecretProject.java

@@ -22,8 +22,8 @@ public class SysSecretProject extends BaseEntity
     @Excel(name = "项目id")
     private Long projectId;
 
-    /** jwt码 */
-    @Excel(name = "jwt码")
+    /** 标识码 */
+    @Excel(name = "标识码")
     private String secretKey;
 
     public void setId(Long id) 

ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysSecretProjectDTO.java

@@ -30,7 +30,7 @@ public class SysSecretProjectDTO extends BaseEntity {
     private String projectName;
 
     /**
-     * jwt码
+     * 标识码
      */
     private String secretKey;
 

ruoyi-ui/src/views/authority/secret/index.vue

@@ -11,10 +11,10 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="jwt码" prop="secretKey">
+      <el-form-item label="标识码" prop="secretKey">
         <el-input
           v-model="queryParams.secretKey"
-          placeholder="请输入jwt码"
+          placeholder="请输入标识码"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -75,7 +75,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="序号" align="center" type="index"/>
       <el-table-column label="项目名称" align="center" prop="projectName"/>
-      <el-table-column label="jwt码" align="center" prop="secretKey"/>
+      <el-table-column label="标识码" align="center" prop="secretKey"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -83,7 +83,6 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            :disabled = "scope.row.secretKey"
           >修改
           </el-button>
           <el-button
@@ -98,7 +97,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            :disabled = "scope.row.secretKey"
           >删除
           </el-button>
         </template>
@@ -126,8 +124,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="jwt码" prop="secretKey">
-          <el-input v-model="form.secretKey" placeholder="请输入jwt码"/>
+        <el-form-item label="标识码" prop="secretKey">
+          <el-input v-model="form.secretKey" placeholder="请输入标识码"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -217,6 +215,7 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
+      this.getProjectList();
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -269,12 +268,14 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.getProjectList();
             });
           } else {
             addSecret(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.getProjectList();
             });
           }
         }
@@ -287,6 +288,7 @@ export default {
         return delSecret(ids);
       }).then(() => {
         this.getList();
+        this.getProjectList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {
       });

sql/authority.sql

@@ -85,11 +85,11 @@ CREATE TABLE `gen_table_column`  (
 -- Records of gen_table_column
 -- ----------------------------
 INSERT INTO `gen_table_column` VALUES (1, 1, 'id', '用户ID', 'bigint(20)', 'Long', 'id', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2023-11-20 16:58:24', '', NULL);
-INSERT INTO `gen_table_column` VALUES (2, 1, 'project_code', '项目编号', 'varchar(50)', 'String', 'projectCode', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 2, 'admin', '2023-11-20 16:58:24', '', NULL);
+INSERT INTO `gen_table_column` VALUES (2, 1, 'project_code', '项目编号', 'varchar(50)', 'String', 'projectCode', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 2, 'admin', '2023-11-20 16:58:24', '', NULL);
 INSERT INTO `gen_table_column` VALUES (3, 1, 'project_name', '项目名称', 'varchar(50)', 'String', 'projectName', '0', '0', NULL, '1', '1', '1', '1', 'LIKE', 'input', '', 3, 'admin', '2023-11-20 16:58:24', '', NULL);
 INSERT INTO `gen_table_column` VALUES (4, 2, 'id', '用户ID', 'bigint(20)', 'Long', 'id', '1', '1', NULL, '1', NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2023-11-21 12:45:21', '', NULL);
 INSERT INTO `gen_table_column` VALUES (5, 2, 'project_id', '项目id', 'bigint(20)', 'Long', 'projectId', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 2, 'admin', '2023-11-21 12:45:21', '', NULL);
-INSERT INTO `gen_table_column` VALUES (6, 2, 'secret_key', 'jwt码', 'varchar(255)', 'String', 'secretKey', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 3, 'admin', '2023-11-21 12:45:21', '', NULL);
+INSERT INTO `gen_table_column` VALUES (6, 2, 'secret_key', '标识码', 'varchar(255)', 'String', 'secretKey', '0', '0', NULL, '1', '1', '1', '1', 'EQ', 'input', '', 3, 'admin', '2023-11-21 12:45:21', '', NULL);
 
 -- ----------------------------
 -- Table structure for qrtz_blob_triggers
@@ -975,7 +975,7 @@ DROP TABLE IF EXISTS `sys_secret_project`;
 CREATE TABLE `sys_secret_project`  (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
   `project_id` bigint(20) NULL DEFAULT NULL COMMENT '项目id',
-  `secret_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'jwt码',
+  `secret_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '标识码',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = DYNAMIC;