Browse Source

关闭授权,项目地址

lchao 1 year ago
parent
commit
4026976295

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

@@ -139,10 +139,8 @@ public class SysSecretProjectController extends BaseController {
         sysSecretProjectDTO.setStatus(2L);
         sysSecretProjectDTO.setIsSwitch(1L);
         // TODO: 2023/11/25 清空redis中的授权key
-        if (sysSecretProjectDTO.getProjectName().equals("项目")) {
-            RestUtil.get("http://localhost:10004/authority/clearKey");
-        }
-        return toAjax(sysSecretProjectService.updateSysSecretProject(sysSecretProjectDTO));
+            RestUtil.get(sysSecretProjectService.selectSysSecretProjectAddress(sysSecretProjectDTO));
+            return toAjax(sysSecretProjectService.updateSysSecretProject(sysSecretProjectDTO));
     }
 
     /**

+ 2 - 2
ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/authority?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.10.15:63306/authority?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: root
+                password: sooka1a2b3c4d%...
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 15 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysProject.java

@@ -34,6 +34,12 @@ public class SysProject extends BaseEntity {
     @Excel(name = "项目名称")
     private String projectName;
 
+    /**
+     * 项目地址
+     */
+    @Excel(name = "项目地址")
+    private String projectAddress;
+
 
     public void setId(Long id) {
         this.id = id;
@@ -65,6 +71,15 @@ public class SysProject extends BaseEntity {
                 .append("id", getId())
                 .append("projectCode", getProjectCode())
                 .append("projectName", getProjectName())
+                .append("projectAddress", getProjectAddress())
                 .toString();
     }
+
+    public String getProjectAddress() {
+        return projectAddress;
+    }
+
+    public void setProjectAddress(String projectAddress) {
+        this.projectAddress = projectAddress;
+    }
 }

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSecretProjectMapper.java

@@ -45,6 +45,8 @@ public interface SysSecretProjectMapper {
      */
     public int updateSysSecretProject(SysSecretProjectDTO sysSecretProjectDTO);
 
+    public String selectSysSecretProjectAddress(SysSecretProjectDTO sysSecretProjectDTO);
+
     /**
      * 删除【请填写功能名称】
      *

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSecretProjectService.java

@@ -44,6 +44,8 @@ public interface ISysSecretProjectService
      */
     public int updateSysSecretProject(SysSecretProjectDTO sysSecretProjectDTO);
 
+    public String  selectSysSecretProjectAddress(SysSecretProjectDTO sysSecretProjectDTO);
+
     /**
      * 批量删除【请填写功能名称】
      * 

+ 5 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSecretProjectServiceImpl.java

@@ -63,6 +63,11 @@ public class SysSecretProjectServiceImpl implements ISysSecretProjectService {
         return sysSecretProjectMapper.updateSysSecretProject(sysSecretProjectDTO);
     }
 
+    @Override
+    public String  selectSysSecretProjectAddress(SysSecretProjectDTO sysSecretProjectDTO) {
+        return sysSecretProjectMapper.selectSysSecretProjectAddress(sysSecretProjectDTO);
+    }
+
     /**
      * 批量删除【请填写功能名称】
      *

+ 6 - 1
ruoyi-system/src/main/resources/mapper/system/SysProjectMapper.xml

@@ -8,10 +8,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="projectCode"    column="project_code"    />
         <result property="projectName"    column="project_name"    />
+        <result property="projectAddress"    column="project_address"    />
     </resultMap>
 
     <sql id="selectSysProjectVo">
-        select id, project_code, project_name from sys_project
+        select id, project_code, project_name, project_address from sys_project
     </sql>
 
     <select id="selectSysProjectList" parameterType="SysProject" resultMap="SysProjectResult">
@@ -19,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="projectCode != null  and projectCode != ''"> and project_code = #{projectCode}</if>
             <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+            <if test="projectAddress != null  and projectAddress != ''"> and project_address = #{projectAddress}</if>
         </where>
     </select>
     
@@ -32,10 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="projectCode != null">project_code,</if>
             <if test="projectName != null">project_name,</if>
+            <if test="projectAddress != null">project_address,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectCode != null">#{projectCode},</if>
             <if test="projectName != null">#{projectName},</if>
+            <if test="projectAddress != null">#{projectAddress},</if>
          </trim>
     </insert>
 
@@ -44,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectCode != null">project_code = #{projectCode},</if>
             <if test="projectName != null">project_name = #{projectName},</if>
+            <if test="projectAddress != null">project_address = #{projectAddress},</if>
         </trim>
         where id = #{id}
     </update>

+ 7 - 0
ruoyi-system/src/main/resources/mapper/system/SysSecretProjectMapper.xml

@@ -97,6 +97,13 @@
         where id = #{id}
     </update>
 
+    <select id="selectSysSecretProjectAddress" resultType="String">
+        select b.project_address from sys_secret_project a
+                left join sys_project b on a.project_id = b.id
+        where a.id = #{id}
+    </select>
+
+
     <delete id="deleteSysSecretProjectById" parameterType="Long">
         delete
         from sys_secret_project

+ 8 - 2
ruoyi-ui/src/views/authority/project/index.vue

@@ -66,6 +66,7 @@
       <el-table-column label="序号" align="center" type="index"/>
       <el-table-column label="项目编号" align="center" prop="projectCode"/>
       <el-table-column label="项目名称" align="center" prop="projectName"/>
+      <el-table-column label="项目地址" align="center" prop="projectAddress"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -103,6 +104,9 @@
         <el-form-item label="项目名称" prop="projectName">
           <el-input v-model="form.projectName" placeholder="请输入项目名称"/>
         </el-form-item>
+        <el-form-item label="项目地址" prop="projectAddress">
+          <el-input v-model="form.projectAddress" placeholder="请输入项目地址"/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -142,7 +146,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         projectCode: null,
-        projectName: null
+        projectName: null,
+        projectAddress: null
       },
       // 表单参数
       form: {},
@@ -173,7 +178,8 @@ export default {
       this.form = {
         id: null,
         projectCode: null,
-        projectName: null
+        projectName: null,
+        projectAddress: null
       };
       this.resetForm("form");
     },