update 修正 PR 相关问题

ruoyi-ui/src/api/system/ossConfig.js

@@ -1,57 +1,57 @@
 import request from '@/utils/request'
 
 // 查询云存储配置列表
-export function listSysOssConfig(query) {
+export function listOssConfig(query) {
   return request({
-    url: '/system/sysOssConfig/list',
+    url: '/system/oss/config/list',
     method: 'get',
     params: query
   })
 }
 
 // 查询云存储配置详细
-export function getSysOssConfig(ossConfigId) {
+export function getOssConfig(ossConfigId) {
   return request({
-    url: '/system/sysOssConfig/' + ossConfigId,
+    url: '/system/oss/config/' + ossConfigId,
     method: 'get'
   })
 }
 
 // 新增云存储配置
-export function addSysOssConfig(data) {
+export function addOssConfig(data) {
   return request({
-    url: '/system/sysOssConfig',
+    url: '/system/oss/config',
     method: 'post',
     data: data
   })
 }
 
 // 修改云存储配置
-export function updateSysOssConfig(data) {
+export function updateOssConfig(data) {
   return request({
-    url: '/system/sysOssConfig',
+    url: '/system/oss/config',
     method: 'put',
     data: data
   })
 }
 
 // 删除云存储配置
-export function delSysOssConfig(ossConfigId) {
+export function delOssConfig(ossConfigId) {
   return request({
-    url: '/system/sysOssConfig/' + ossConfigId,
+    url: '/system/oss/config/' + ossConfigId,
     method: 'delete'
   })
 }
 
 // 用户状态修改
-export function changeOssConfigStatus(ossConfigId, status,configKey) {
+export function changeOssConfigStatus(ossConfigId, status, configKey) {
   const data = {
     ossConfigId,
     status,
     configKey
   }
   return request({
-    url: '/system/sysOssConfig/changeStatus',
+    url: '/system/oss/config/changeStatus',
     method: 'put',
     data: data
   })

ruoyi-ui/src/router/index.js

@@ -124,6 +124,19 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/system/oss-config',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'index',
+        component: (resolve) => require(['@/views/system/oss/config'], resolve),
+        name: 'OssConfig',
+        meta: { title: '配置管理', activeMenu: '/system/oss'}
+      }
+    ]
+  },
   {
     path: '/monitor/job-log',
     component: Layout,

ruoyi-ui/src/views/system/oss/config.vue

@@ -1,41 +1,38 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-width="100px"
-    >
-      <el-form-item label="configKey" prop="configKey">
-        <el-input
-          v-model="queryParams.configKey"
-          placeholder="请输入configKey"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="配置key" prop="configKey">
+        <el-select v-model="queryParams.configKey" placeholder="请选择配置key" clearable size="small">
+          <el-option
+            v-for="configKey in configKeyOptions"
+            :key="configKey.configKey"
+            :label="configKey.label"
+            :value="configKey.configKey"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="bucketName" prop="bucketName">
+      <el-form-item label="桶名称" prop="bucketName">
         <el-input
           v-model="queryParams.bucketName"
-          placeholder="请输入bucketName"
+          placeholder="请输入桶名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -47,9 +44,8 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:sysOssConfig:add']"
-          >新增</el-button
-        >
+          v-hasPermi="['system:oss:add']"
+        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -59,9 +55,19 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:sysOssConfig:edit']"
-          >修改</el-button
-        >
+          v-hasPermi="['system:oss:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:oss:remove']"
+        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -71,41 +77,20 @@
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['system:sysOssConfig:export']"
-          >导出</el-button
-        >
+          v-hasPermi="['system:ossConfig:export']"
+        >导出</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="sysOssConfigList">
-      <el-table-column
-        label="主建"
-        align="center"
-        prop="ossConfigId"
-        v-if="false"
-      />
-      <el-table-column label="configKey" align="center" prop="configKey" />
-      <el-table-column label="accessKey" align="center" prop="accessKey" />
-      <el-table-column label="seretKey" align="center" prop="secretKey" />
-      <el-table-column label="bucketName" align="center" prop="bucketName" />
-      <el-table-column
-        label="endpoint"
-        width="200"
-        align="center"
-        prop="endpoint"
-      />
+    <el-table v-loading="loading" :data="ossConfigList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主建" align="center" prop="ossConfigId" v-if="false"/>
+      <el-table-column label="配置key" align="center" prop="configKey" />
+      <el-table-column label="访问站点" align="center" prop="endpoint" width="200" />
+      <el-table-column label="桶名称" align="center" prop="bucketName" />
       <el-table-column label="前缀" align="center" prop="prefix" />
-      <el-table-column
-        label="是否htpps"
-        align="center"
-        prop="isHttps"
-        :formatter="isHttpsFormat"
-      />
-      <el-table-column label="region" align="center" prop="region" />
+      <el-table-column label="域" align="center" prop="region" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <el-switch
@@ -116,28 +101,22 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:sysOssConfig:edit']"
-            >修改</el-button
-          >
+            v-hasPermi="['system:oss:edit']"
+          >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:sysOssConfig:remove']"
-            >删除</el-button
-          >
+            v-hasPermi="['system:oss:remove']"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -153,90 +132,58 @@
     <!-- 添加或修改云存储配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="configKey" prop="configKey">
-          <el-row>
-            <el-col :span="12">
-              <el-select v-model="form.configKey" placeholder="请选择">
-                <el-option
-                  v-for="item in configKeyOptions"
-                  :key="item.configKey"
-                  :label="item.label"
-                  :value="item.configKey"
-                >
-                  <span style="float: left">{{ item.configKey }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{
-                    item.label
-                  }}</span>
-                </el-option>
-              </el-select>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="bucketName" prop="bucketName">
-                <el-input
-                  v-model="form.bucketName"
-                  placeholder="请输入bucketName"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
+        <el-form-item label="配置key" prop="configKey">
+          <el-select v-model="form.configKey" placeholder="请选择配置key">
+            <el-option
+              v-for="configKey in configKeyOptions"
+              :key="configKey.configKey"
+              :label="configKey.label"
+              :value="configKey.configKey"
+            />
+          </el-select>
         </el-form-item>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="accessKey" prop="accessKey">
-              <el-input
-                v-model="form.accessKey"
-                placeholder="请输入accessKey"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="secretKey" prop="secretKey">
-              <el-input
-                v-model="form.secretKey"
-                placeholder="请输入secretKey"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="endpoint" prop="endpoint">
-          <el-input v-model="form.endpoint" placeholder="请输入endpoint" />
+        <el-form-item label="访问站点" prop="endpoint">
+          <el-input v-model="form.endpoint" placeholder="请输入访问站点" />
+        </el-form-item>
+        <el-form-item label="accessKey" prop="accessKey">
+          <el-input v-model="form.accessKey" placeholder="请输入accessKey" />
+        </el-form-item>
+        <el-form-item label="secretKey" prop="secretKey">
+          <el-input v-model="form.secretKey" placeholder="请输入秘钥" />
+        </el-form-item>
+        <el-form-item label="桶名称" prop="bucketName">
+          <el-input v-model="form.bucketName" placeholder="请输入桶名称" />
         </el-form-item>
         <el-form-item label="前缀" prop="prefix">
           <el-input v-model="form.prefix" placeholder="请输入前缀" />
         </el-form-item>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio label="0">启用</el-radio>
-                <el-radio label="1">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否htpps">
-              <el-radio-group v-model="form.isHttps">
-                <el-radio label="0">否</el-radio>
-                <el-radio label="1">是</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="region" prop="region">
-          <el-input v-model="form.region" placeholder="请输入region" />
+        <el-form-item label="是否HTTPS">
+          <el-radio-group v-model="form.isHttps">
+            <el-radio
+              v-for="dict in isHttpsOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="域" prop="region">
+          <el-input v-model="form.region" placeholder="请输入域" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input
-            v-model="form.remark"
-            type="textarea"
-            placeholder="请输入内容"
-          />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm"
-          >确 定</el-button
-        >
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -244,18 +191,18 @@
 </template>
 
 <script>
+
 import {
-  listSysOssConfig,
-  getSysOssConfig,
-  delSysOssConfig,
-  addSysOssConfig,
-  updateSysOssConfig,
-  changeOssConfigStatus,
-} from "@/api/system/sysOssConfig";
-import { downLoadExcel } from "@/utils/download";
+  listOssConfig,
+  getOssConfig,
+  delOssConfig,
+  addOssConfig,
+  updateOssConfig,
+  changeOssConfigStatus
+} from "@/api/system/ossConfig";
 
 export default {
-  name: "SysOssConfig",
+  name: "OssConfig",
   data() {
     return {
       // 按钮loading
@@ -275,25 +222,30 @@ export default {
       // 总条数
       total: 0,
       // 云存储配置表格数据
-      sysOssConfigList: [],
-      //configKeyOptions
+      ossConfigList: [],
+      // configKeyOptions
       configKeyOptions: [],
       configKeyDatas: [
-        { configKey: "monio", label: "minio" },
-        { configKey: "qcloud", label: "腾讯云" },
-        { configKey: "aliyun", label: "阿里云" },
+        { configKey: "minio", label: "Minio" },
         { configKey: "qiniu", label: "七牛云" },
+        { configKey: "aliyun", label: "阿里云" },
+        { configKey: "qcloud", label: "腾讯云" },
       ],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否https字典
+      isHttpsOptions: [],
+      // 状态(0正常 1停用)字典
+      statusOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         configKey: undefined,
         bucketName: undefined,
+        status: undefined,
       },
       // 表单参数
       form: {},
@@ -343,22 +295,24 @@ export default {
   },
   created() {
     this.getList();
+    this.getDicts("sys_yes_no").then(response => {
+      this.isHttpsOptions = response.data;
+    });
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
     this.configKeyOptions = this.configKeyDatas;
   },
   methods: {
     /** 查询云存储配置列表 */
     getList() {
       this.loading = true;
-      listSysOssConfig(this.queryParams).then((response) => {
-        this.sysOssConfigList = response.rows;
+      listOssConfig(this.queryParams).then((response) => {
+        this.ossConfigList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    // 是否htpps字典翻译
-    isHttpsFormat(row, column) {
-      return row.isHttps == "0" ? "否" : "是";
-    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -374,7 +328,7 @@ export default {
         bucketName: undefined,
         prefix: undefined,
         endpoint: undefined,
-        isHttps: "0",
+        isHttps: "N",
         region: undefined,
         status: "1",
         remark: undefined,
@@ -402,7 +356,7 @@ export default {
       this.loading = true;
       this.reset();
       const ossConfigId = row.ossConfigId || this.ids;
-      getSysOssConfig(ossConfigId).then((response) => {
+      getOssConfig(ossConfigId).then((response) => {
         this.loading = false;
         this.form = response.data;
         this.open = true;
@@ -411,29 +365,25 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.ossConfigId != null) {
-            updateSysOssConfig(this.form)
-              .then((response) => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              })
-              .finally(() => {
-                this.buttonLoading = false;
-              });
+            updateOssConfig(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
           } else {
-            addSysOssConfig(this.form)
-              .then((response) => {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              })
-              .finally(() => {
-                this.buttonLoading = false;
-              });
+            addOssConfig(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
           }
         }
       });
@@ -441,54 +391,36 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ossConfigIds = row.ossConfigId || this.ids;
-      this.$confirm(
-        '是否确认删除configKey为"' + row.configKey + '"的数据项?',
-        "警告",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
-        .then(() => {
-          return delSysOssConfig(ossConfigIds);
-        })
-        .then(() => {
-          this.loading = false;
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      downLoadExcel("/system/sysOssConfig/export", this.queryParams);
+      this.$confirm('是否确认删除云存储配置编号为"' + ossConfigIds + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.loading = true;
+        return delOssConfig(ossConfigIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {});
     },
     // 云存储配置状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
       this.$confirm(
-        '确认要"' + text + '""' + row.configKey + '"配置吗?',
-        "警告",
-        {
+        '确认要"' + text + '""' + row.configKey + '"配置吗?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-        }
-      )
-        .then(function () {
-          return changeOssConfigStatus(
-            row.ossConfigId,
-            row.status,
-            row.configKey
-          );
-        })
-        .then(() => {
-          this.msgSuccess(text + "成功");
-        })
-        .catch(function () {
-          row.status = row.status === "0" ? "1" : "0";
-        });
+      }).then(function () {
+        return changeOssConfigStatus(row.ossConfigId, row.status, row.configKey);
+      }).then(() => {
+        this.getList()
+        this.msgSuccess(text + "成功");
+      }).catch(function () {
+        row.status = row.status === "0" ? "1" : "0";
+      }).finally(() => {
+      });
     },
   },
 };

ruoyi-ui/src/views/system/oss/index.vue

@@ -96,7 +96,16 @@
           v-hasPermi="['system:oss:remove']"
         >删除</el-button>
       </el-col>
-
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-s-operation"
+          size="mini"
+          @click="handleOssConfig"
+          v-hasPermi="['system:oss:list']"
+        >配置管理</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -282,6 +291,10 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    /** 任务日志列表查询 */
+    handleOssConfig() {
+      this.$router.push({ path: '/system/oss-config/index'})
+    },
     /** 文件按钮操作 */
     handleFile() {
       this.reset();