update 修正 PR 相关问题
This commit is contained in:
疯狂的狮子li
parent
c9f7314cd0
commit
824635df7f
|
|
@ -1,19 +1,13 @@
|
|||
package com.ruoyi.web.controller.system;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.annotation.RepeatSubmit;
|
||||
import com.ruoyi.common.constant.Constants;
|
||||
import com.ruoyi.common.constant.UserConstants;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.core.validate.AddGroup;
|
||||
import com.ruoyi.common.core.validate.EditGroup;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.system.domain.SysOssConfig;
|
||||
import com.ruoyi.system.domain.bo.SysOssConfigBo;
|
||||
import com.ruoyi.system.domain.vo.SysOssConfigVo;
|
||||
import com.ruoyi.system.service.ISysOssConfigService;
|
||||
|
|
@ -28,19 +22,19 @@ import org.springframework.web.bind.annotation.*;
|
|||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 云存储配置Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2021-08-11
|
||||
* @author Lion Li
|
||||
* @author 孤舟烟雨
|
||||
* @date 2021-08-13
|
||||
*/
|
||||
@Validated
|
||||
@Api(value = "云存储配置控制器", tags = {"云存储配置管理"})
|
||||
@RequiredArgsConstructor(onConstructor_ = @Autowired)
|
||||
@RestController
|
||||
@RequestMapping("/system/sysOssConfig")
|
||||
@RequestMapping("/system/oss/config")
|
||||
public class SysOssConfigController extends BaseController {
|
||||
|
||||
private final ISysOssConfigService iSysOssConfigService;
|
||||
|
|
@ -49,7 +43,7 @@ public class SysOssConfigController extends BaseController {
|
|||
* 查询云存储配置列表
|
||||
*/
|
||||
@ApiOperation("查询云存储配置列表")
|
||||
@PreAuthorize("@ss.hasPermi('system:sysOssConfig:list')")
|
||||
@PreAuthorize("@ss.hasPermi('system:oss:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<SysOssConfigVo> list(@Validated SysOssConfigBo bo) {
|
||||
return iSysOssConfigService.queryPageList(bo);
|
||||
|
|
@ -59,7 +53,7 @@ public class SysOssConfigController extends BaseController {
|
|||
* 获取云存储配置详细信息
|
||||
*/
|
||||
@ApiOperation("获取云存储配置详细信息")
|
||||
@PreAuthorize("@ss.hasPermi('system:sysOssConfig:query')")
|
||||
@PreAuthorize("@ss.hasPermi('system:oss:query')")
|
||||
@GetMapping("/{ossConfigId}")
|
||||
public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("ossConfigId") Integer ossConfigId) {
|
||||
|
|
@ -70,15 +64,11 @@ public class SysOssConfigController extends BaseController {
|
|||
* 新增云存储配置
|
||||
*/
|
||||
@ApiOperation("新增云存储配置")
|
||||
@PreAuthorize("@ss.hasPermi('system:sysOssConfig:add')")
|
||||
@PreAuthorize("@ss.hasPermi('system:oss:add')")
|
||||
@Log(title = "云存储配置", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
|
||||
if (StringUtils.isNotEmpty(bo.getConfigKey())
|
||||
&& UserConstants.NOT_UNIQUE.equals(iSysOssConfigService.checkConfigKeyUnique(bo))) {
|
||||
return AjaxResult.error("新增云配置'" + bo.getConfigKey() + "'失败，configKey已存在");
|
||||
}
|
||||
return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
|
||||
}
|
||||
|
||||
|
|
@ -86,15 +76,11 @@ public class SysOssConfigController extends BaseController {
|
|||
* 修改云存储配置
|
||||
*/
|
||||
@ApiOperation("修改云存储配置")
|
||||
@PreAuthorize("@ss.hasPermi('system:sysOssConfig:edit')")
|
||||
@PreAuthorize("@ss.hasPermi('system:oss:edit')")
|
||||
@Log(title = "云存储配置", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
|
||||
if (StringUtils.isNotEmpty(bo.getConfigKey())
|
||||
&& UserConstants.NOT_UNIQUE.equals(iSysOssConfigService.checkConfigKeyUnique(bo))) {
|
||||
return AjaxResult.error("修改云配置'" + bo.getConfigKey() + "'失败，configKey已存在");
|
||||
}
|
||||
return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
|
||||
}
|
||||
|
||||
|
|
@ -102,25 +88,21 @@ public class SysOssConfigController extends BaseController {
|
|||
* 删除云存储配置
|
||||
*/
|
||||
@ApiOperation("删除云存储配置")
|
||||
@PreAuthorize("@ss.hasPermi('system:sysOssConfig:remove')")
|
||||
@PreAuthorize("@ss.hasPermi('system:oss:remove')")
|
||||
@Log(title = "云存储配置", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ossConfigIds}")
|
||||
public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Integer[] ossConfigIds) {
|
||||
List<SysOssConfig> list = iSysOssConfigService.list();
|
||||
if(ObjectUtil.isNotNull(list)&&list.size()==1){
|
||||
return AjaxResult.error("必须保留一条云配置文件");
|
||||
}
|
||||
return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* 状态修改
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:sysOssConfig:edit')")
|
||||
@PreAuthorize("@ss.hasPermi('system:oss:edit')")
|
||||
@Log(title = "云存储状态修改", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeStatus")
|
||||
public AjaxResult changeStatus(@RequestBody SysOssConfig sysOssConfig) {
|
||||
return toAjax(iSysOssConfigService.updateOssConfigStatus(sysOssConfig));
|
||||
public AjaxResult changeStatus(@RequestBody SysOssConfigBo bo) {
|
||||
return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ public class SysOssConfig implements Serializable {
|
|||
private String endpoint;
|
||||
|
||||
/**
|
||||
* 是否htpps（0否 1是）
|
||||
* 是否https（0否 1是）
|
||||
*/
|
||||
private String isHttps;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
package com.ruoyi.system.domain.bo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import com.ruoyi.common.core.validate.AddGroup;
|
||||
import com.ruoyi.common.core.validate.EditGroup;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Size;
|
||||
|
||||
/**
|
||||
* 云存储配置业务对象 sys_oss_config
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2021-08-11
|
||||
* @author Lion Li
|
||||
* @author 孤舟烟雨
|
||||
* @date 2021-08-13
|
||||
*/
|
||||
|
||||
@Data
|
||||
|
|
@ -28,8 +28,10 @@ public class SysOssConfigBo extends BaseEntity {
|
|||
/**
|
||||
* 主建
|
||||
*/
|
||||
@ApiModelProperty("主建")
|
||||
private Integer ossConfigId;
|
||||
@ApiModelProperty(value = "主建", required = true)
|
||||
@NotNull(message = "主建不能为空", groups = { EditGroup.class })
|
||||
private Long ossConfigId;
|
||||
|
||||
/**
|
||||
* 配置key
|
||||
*/
|
||||
|
|
@ -41,7 +43,7 @@ public class SysOssConfigBo extends BaseEntity {
|
|||
/**
|
||||
* accessKey
|
||||
*/
|
||||
@ApiModelProperty(value = "accessKey")
|
||||
@ApiModelProperty(value = "accessKey", required = true)
|
||||
@NotBlank(message = "accessKey不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
@Size(min = 2, max = 100, message = "accessKey长度必须介于2和100 之间")
|
||||
private String accessKey;
|
||||
|
|
@ -49,7 +51,7 @@ public class SysOssConfigBo extends BaseEntity {
|
|||
/**
|
||||
* 秘钥
|
||||
*/
|
||||
@ApiModelProperty(value = "secretKey")
|
||||
@ApiModelProperty(value = "secretKey", required = true)
|
||||
@NotBlank(message = "secretKey不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
@Size(min = 2, max = 100, message = "secretKey长度必须介于2和100 之间")
|
||||
private String secretKey;
|
||||
|
|
@ -57,7 +59,7 @@ public class SysOssConfigBo extends BaseEntity {
|
|||
/**
|
||||
* 桶名称
|
||||
*/
|
||||
@ApiModelProperty(value = "bucketName")
|
||||
@ApiModelProperty(value = "bucketName", required = true)
|
||||
@NotBlank(message = "bucketName不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
@Size(min = 2, max = 100, message = "bucketName长度必须介于2和100之间")
|
||||
private String bucketName;
|
||||
|
|
@ -71,17 +73,23 @@ public class SysOssConfigBo extends BaseEntity {
|
|||
/**
|
||||
* 访问站点
|
||||
*/
|
||||
@ApiModelProperty(value = "endpoint")
|
||||
@ApiModelProperty(value = "endpoint", required = true)
|
||||
@NotBlank(message = "endpoint不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
@Size(min = 2, max = 100, message = "endpoint长度必须介于2和100之间")
|
||||
private String endpoint;
|
||||
|
||||
/**
|
||||
* 是否htpps（0否 1是）
|
||||
* 是否https（Y=是,N=否）
|
||||
*/
|
||||
@ApiModelProperty(value = "是否htpps（0否 1是）")
|
||||
@ApiModelProperty("是否https（Y=是,N=否）")
|
||||
private String isHttps;
|
||||
|
||||
/**
|
||||
* 状态（0=正常,1=停用）
|
||||
*/
|
||||
@ApiModelProperty("状态（0=正常,1=停用）")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 域
|
||||
*/
|
||||
|
|
@ -118,9 +126,5 @@ public class SysOssConfigBo extends BaseEntity {
|
|||
*/
|
||||
@ApiModelProperty(value = "排序的方向", example = "asc,desc")
|
||||
private String isAsc;
|
||||
/**
|
||||
* 状态(0正常 1停用)
|
||||
*/
|
||||
@ApiModelProperty("状态(0正常 1停用)")
|
||||
private String status;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,18 @@
|
|||
package com.ruoyi.system.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.ruoyi.common.annotation.ExcelDictFormat;
|
||||
import com.ruoyi.common.convert.ExcelDictConvert;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 云存储配置视图对象 sys_oss_config
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2021-08-11
|
||||
* @author Lion Li
|
||||
* @author 孤舟烟雨
|
||||
* @date 2021-08-13
|
||||
*/
|
||||
@Data
|
||||
@ApiModel("云存储配置视图对象")
|
||||
|
|
@ -28,7 +25,7 @@ public class SysOssConfigVo {
|
|||
* 主建
|
||||
*/
|
||||
@ApiModelProperty("主建")
|
||||
private Integer ossConfigId;
|
||||
private Long ossConfigId;
|
||||
|
||||
/**
|
||||
* 配置key
|
||||
|
|
@ -67,9 +64,9 @@ public class SysOssConfigVo {
|
|||
private String endpoint;
|
||||
|
||||
/**
|
||||
* 是否htpps（0否 1是）
|
||||
* 是否https（Y=是,N=否）
|
||||
*/
|
||||
@ApiModelProperty("是否htpps（0否 1是）")
|
||||
@ApiModelProperty("是否https（Y=是,N=否）")
|
||||
private String isHttps;
|
||||
|
||||
/**
|
||||
|
|
@ -79,9 +76,9 @@ public class SysOssConfigVo {
|
|||
private String region;
|
||||
|
||||
/**
|
||||
* 状态(0正常 1停用)
|
||||
* 状态（0=正常,1=停用）
|
||||
*/
|
||||
@ApiModelProperty("状态(0正常 1停用)")
|
||||
@ApiModelProperty("状态（0=正常,1=停用）")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
|
|
@ -90,5 +87,10 @@ public class SysOssConfigVo {
|
|||
@ApiModelProperty("扩展字段")
|
||||
private String ext1;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
package com.ruoyi.system.mapper;
|
||||
|
||||
import com.ruoyi.system.domain.SysOssConfig;
|
||||
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
|
||||
import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
|
||||
import org.apache.ibatis.annotations.CacheNamespace;
|
||||
import com.ruoyi.system.domain.SysOssConfig;
|
||||
|
||||
/**
|
||||
* 云存储配置Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2021-08-11
|
||||
* @author Lion Li
|
||||
* @author 孤舟烟雨
|
||||
* @date 2021-08-13
|
||||
*/
|
||||
public interface SysOssConfigMapper extends BaseMapperPlus<SysOssConfig> {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
package com.ruoyi.system.service;
|
||||
|
||||
import com.ruoyi.system.domain.SysOssConfig;
|
||||
import com.ruoyi.system.domain.vo.SysOssConfigVo;
|
||||
import com.ruoyi.system.domain.bo.SysOssConfigBo;
|
||||
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.system.domain.SysOssConfig;
|
||||
import com.ruoyi.system.domain.bo.SysOssConfigBo;
|
||||
import com.ruoyi.system.domain.vo.SysOssConfigVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 云存储配置Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2021-08-11
|
||||
* @author Lion Li
|
||||
* @author 孤舟烟雨
|
||||
* @date 2021-08-13
|
||||
*/
|
||||
public interface ISysOssConfigService extends IServicePlus<SysOssConfig, SysOssConfigVo> {
|
||||
|
||||
/**
|
||||
* 查询单个
|
||||
* @return
|
||||
*/
|
||||
SysOssConfigVo queryById(Integer ossConfigId);
|
||||
|
||||
|
|
@ -52,15 +52,7 @@ public interface ISysOssConfigService extends IServicePlus<SysOssConfig, SysOssC
|
|||
|
||||
/**
|
||||
* 启用停用状态
|
||||
* @param sysOssConfig
|
||||
* @return
|
||||
*/
|
||||
int updateOssConfigStatus(SysOssConfig sysOssConfig);
|
||||
int updateOssConfigStatus(SysOssConfigBo bo);
|
||||
|
||||
/**
|
||||
* 判断configkey是否唯一
|
||||
* @param bo
|
||||
* @return
|
||||
*/
|
||||
String checkConfigKeyUnique(SysOssConfigBo bo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,52 +1,45 @@
|
|||
package com.ruoyi.system.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.ruoyi.common.constant.Constants;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.ruoyi.common.constant.UserConstants;
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.common.core.redis.RedisCache;
|
||||
import com.ruoyi.common.exception.CustomException;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
|
||||
import com.ruoyi.common.core.page.PagePlus;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.exception.CustomException;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.oss.constant.CloudConstant;
|
||||
import com.ruoyi.system.domain.SysConfig;
|
||||
import com.ruoyi.system.mapper.SysConfigMapper;
|
||||
import com.ruoyi.system.service.ISysConfigService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.ruoyi.system.domain.SysOssConfig;
|
||||
import com.ruoyi.system.domain.bo.SysOssConfigBo;
|
||||
import com.ruoyi.system.domain.vo.SysOssConfigVo;
|
||||
import com.ruoyi.system.domain.SysOssConfig;
|
||||
import com.ruoyi.system.mapper.SysOssConfigMapper;
|
||||
import com.ruoyi.system.service.ISysConfigService;
|
||||
import com.ruoyi.system.service.ISysOssConfigService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 云存储配置Service业务层处理
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2021-08-11
|
||||
* @author Lion Li
|
||||
* @author 孤舟烟雨
|
||||
* @date 2021-08-13
|
||||
*/
|
||||
@RequiredArgsConstructor(onConstructor_ = @Autowired)
|
||||
@Service
|
||||
public class SysOssConfigServiceImpl extends ServicePlusImpl<SysOssConfigMapper, SysOssConfig, SysOssConfigVo> implements ISysOssConfigService {
|
||||
|
||||
@Autowired
|
||||
private ISysConfigService iSysConfigService;
|
||||
@Autowired
|
||||
private SysConfigMapper sysConfigMapper;
|
||||
@Autowired
|
||||
private RedisCache redisCache;
|
||||
private final ISysConfigService iSysConfigService;
|
||||
|
||||
@Override
|
||||
public SysOssConfigVo queryById(Integer ossConfigId){
|
||||
|
|
@ -61,10 +54,10 @@ public class SysOssConfigServiceImpl extends ServicePlusImpl<SysOssConfigMapper,
|
|||
|
||||
|
||||
private LambdaQueryWrapper<SysOssConfig> buildQueryWrapper(SysOssConfigBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<SysOssConfig> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getConfigKey()), SysOssConfig::getConfigKey, bo.getConfigKey());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getBucketName()), SysOssConfig::getBucketName, bo.getBucketName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysOssConfig::getStatus, bo.getStatus());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
|
|
@ -84,30 +77,33 @@ public class SysOssConfigServiceImpl extends ServicePlusImpl<SysOssConfigMapper,
|
|||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*
|
||||
* @param entity 实体类数据
|
||||
*/
|
||||
private void validEntityBeforeSave(SysOssConfig entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
if (StringUtils.isNotEmpty(entity.getConfigKey())
|
||||
&& UserConstants.NOT_UNIQUE.equals(checkConfigKeyUnique(entity))) {
|
||||
throw new CustomException("操作配置'" + entity.getConfigKey() + "'失败, 配置key已存在!");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
|
||||
if(isValid) {
|
||||
if (CollUtil.containsAll(ids, CollUtil.newArrayList(1, 2, 3, 4))) {
|
||||
throw new CustomException("系统内置, 不可删除!");
|
||||
}
|
||||
}
|
||||
return removeByIds(ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断configKey是否唯一
|
||||
* @param bo
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public String checkConfigKeyUnique(SysOssConfigBo bo) {
|
||||
Long ossConfigId = StringUtils.isNull(bo.getOssConfigId()) ? -1L : bo.getOssConfigId();
|
||||
private String checkConfigKeyUnique(SysOssConfig sysOssConfig) {
|
||||
long ossConfigId = StringUtils.isNull(sysOssConfig.getOssConfigId()) ? -1L : sysOssConfig.getOssConfigId();
|
||||
SysOssConfig info = getOne(new LambdaQueryWrapper<SysOssConfig>()
|
||||
.select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey)
|
||||
.eq(SysOssConfig::getConfigKey, bo.getConfigKey()).last("limit 1"));
|
||||
if (StringUtils.isNotNull(info) && info.getOssConfigId().longValue() != ossConfigId.longValue()) {
|
||||
.eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey()));
|
||||
if (StringUtils.isNotNull(info) && info.getOssConfigId() != ossConfigId) {
|
||||
return UserConstants.NOT_UNIQUE;
|
||||
}
|
||||
return UserConstants.UNIQUE;
|
||||
|
|
@ -115,31 +111,22 @@ public class SysOssConfigServiceImpl extends ServicePlusImpl<SysOssConfigMapper,
|
|||
|
||||
/**
|
||||
* 启用禁用状态
|
||||
* @param sysOssConfig
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public int updateOssConfigStatus(SysOssConfig sysOssConfig) {
|
||||
LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(SysConfig::getConfigKey, CloudConstant.CLOUD_STORAGE_CONFIG_KEY);
|
||||
SysConfig sysConfig = sysConfigMapper.selectOne(queryWrapper);
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int updateOssConfigStatus(SysOssConfigBo bo) {
|
||||
SysConfig sysConfig = iSysConfigService.getOne(new LambdaQueryWrapper<SysConfig>()
|
||||
.eq(SysConfig::getConfigKey, CloudConstant.CLOUD_STORAGE_CONFIG_KEY));
|
||||
if(ObjectUtil.isNotNull(sysConfig)){
|
||||
sysConfig.setConfigValue(sysOssConfig.getConfigKey());
|
||||
sysConfig.setConfigValue(bo.getConfigKey());
|
||||
iSysConfigService.updateConfig(sysConfig);
|
||||
} else {
|
||||
throw new CustomException("缺少'云存储配置KEY'参数!");
|
||||
}
|
||||
SysOssConfig sysOssConfig = BeanUtil.toBean(bo, SysOssConfig.class);
|
||||
baseMapper.update(null, new LambdaUpdateWrapper<SysOssConfig>()
|
||||
.set(SysOssConfig::getStatus, "1"));
|
||||
return baseMapper.updateById(sysOssConfig);
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置cache key
|
||||
*
|
||||
* @param configKey 参数键
|
||||
* @return 缓存键key
|
||||
*/
|
||||
private String getCacheKey(String configKey) {
|
||||
return Constants.SYS_CONFIG_KEY + configKey;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,44 +1,44 @@
|
|||
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'
|
||||
})
|
||||
}
|
||||
|
|
@ -51,7 +51,7 @@ export function changeOssConfigStatus(ossConfigId, status,configKey) {
|
|||
configKey
|
||||
}
|
||||
return request({
|
||||
url: '/system/sysOssConfig/changeStatus',
|
||||
url: '/system/oss/config/changeStatus',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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-form-item label="配置key" prop="configKey">
|
||||
<el-select v-model="form.configKey" placeholder="请选择配置key">
|
||||
<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>
|
||||
v-for="configKey in configKeyOptions"
|
||||
:key="configKey.configKey"
|
||||
:label="configKey.label"
|
||||
:value="configKey.configKey"
|
||||
/>
|
||||
</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="访问站点" prop="endpoint">
|
||||
<el-input v-model="form.endpoint" placeholder="请输入访问站点" />
|
||||
</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-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-input v-model="form.secretKey" placeholder="请输入秘钥" />
|
||||
</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="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="是否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 label="0">启用</el-radio>
|
||||
<el-radio label="1">禁用</el-radio>
|
||||
<el-radio
|
||||
v-for="dict in statusOptions"
|
||||
:key="dict.dictValue"
|
||||
:label="dict.dictValue"
|
||||
>{{dict.dictLabel}}</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>
|
||||
<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: [],
|
||||
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,27 +365,23 @@ 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) => {
|
||||
updateOssConfig(this.form).then(response => {
|
||||
this.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
})
|
||||
.finally(() => {
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
} else {
|
||||
addSysOssConfig(this.form)
|
||||
.then((response) => {
|
||||
addOssConfig(this.form).then(response => {
|
||||
this.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
})
|
||||
.finally(() => {
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
}
|
||||
|
|
@ -441,53 +391,35 @@ export default {
|
|||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const ossConfigIds = row.ossConfigId || this.ids;
|
||||
this.$confirm(
|
||||
'是否确认删除configKey为"' + row.configKey + '"的数据项?',
|
||||
"警告",
|
||||
{
|
||||
this.$confirm('是否确认删除云存储配置编号为"' + ossConfigIds + '"的数据项?', "警告", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning",
|
||||
}
|
||||
)
|
||||
.then(() => {
|
||||
return delSysOssConfig(ossConfigIds);
|
||||
})
|
||||
.then(() => {
|
||||
type: "warning"
|
||||
}).then(() => {
|
||||
this.loading = true;
|
||||
return delOssConfig(ossConfigIds);
|
||||
}).then(() => {
|
||||
this.loading = false;
|
||||
this.getList();
|
||||
this.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
downLoadExcel("/system/sysOssConfig/export", this.queryParams);
|
||||
}).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(() => {
|
||||
}).then(function () {
|
||||
return changeOssConfigStatus(row.ossConfigId, row.status, row.configKey);
|
||||
}).then(() => {
|
||||
this.getList()
|
||||
this.msgSuccess(text + "成功");
|
||||
})
|
||||
.catch(function () {
|
||||
}).catch(function () {
|
||||
row.status = row.status === "0" ? "1" : "0";
|
||||
}).finally(() => {
|
||||
});
|
||||
},
|
||||
},
|
||||
|
|
@ -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();
|
||||
|
|
|
|||
31
sql/oss.sql
31
sql/oss.sql
|
|
@ -16,6 +16,30 @@ create table sys_oss (
|
|||
primary key (oss_id)
|
||||
) engine=innodb comment ='OSS云存储表';
|
||||
|
||||
-- ----------------------------
|
||||
-- OSS云存储动态配置表
|
||||
-- ----------------------------
|
||||
drop table if exists sys_oss_config;
|
||||
create table sys_oss_config (
|
||||
oss_config_id bigint(20) not null auto_increment comment '主建',
|
||||
config_key varchar(255) not null default '' comment '配置key',
|
||||
access_key varchar(255) default '' comment 'accessKey',
|
||||
secret_key varchar(255) default '' comment '秘钥',
|
||||
bucket_name varchar(255) default '' comment '桶名称',
|
||||
prefix varchar(255) default '' comment '前缀',
|
||||
endpoint varchar(255) default '' comment '访问站点',
|
||||
is_https char(1) default 'N' comment '是否https（Y=是,N=否）',
|
||||
region varchar(255) default '' comment '域',
|
||||
status char(1) default '1' comment '状态（0=正常,1=停用）',
|
||||
ext1 varchar(255) default '' comment '扩展字段',
|
||||
create_by varchar(64) default '' comment '创建者',
|
||||
create_time datetime default null comment '创建时间',
|
||||
update_by varchar(64) default '' comment '更新者',
|
||||
update_time datetime default null comment '更新时间',
|
||||
remark varchar(500) default null comment '备注',
|
||||
primary key (oss_config_id)
|
||||
) engine=innodb comment='云存储配置表';
|
||||
|
||||
insert into sys_config values(10, 'OSS云存储服务商', 'sys.oss.cloudStorageService', 'minio', 'Y', 'admin', sysdate(), '', null, 'OSS云存储服务商(qiniu:七牛云, aliyun:阿里云, qcloud:腾讯云, minio: Minio)');
|
||||
insert into sys_config values(11, 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 'admin', sysdate(), '', null, 'true:开启, false:关闭');
|
||||
|
||||
|
|
@ -25,3 +49,10 @@ insert into sys_menu values('1600', '文件查询', '118', '1', '#', '', 1, 0, '
|
|||
insert into sys_menu values('1601', '文件上传', '118', '2', '#', '', 1, 0, 'F', '0', '0', 'system:oss:upload', '#', 'admin', sysdate(), '', null, '');
|
||||
insert into sys_menu values('1602', '文件下载', '118', '3', '#', '', 1, 0, 'F', '0', '0', 'system:oss:download', '#', 'admin', sysdate(), '', null, '');
|
||||
insert into sys_menu values('1603', '文件删除', '118', '4', '#', '', 1, 0, 'F', '0', '0', 'system:oss:remove', '#', 'admin', sysdate(), '', null, '');
|
||||
insert into sys_menu values('1604', '配置添加', '118', '5', '#', '', 1, 0, 'F', '0', '0', 'system:oss:add', '#', 'admin', sysdate(), '', null, '');
|
||||
insert into sys_menu values('1605', '配置编辑', '118', '6', '#', '', 1, 0, 'F', '0', '0', 'system:oss:edit', '#', 'admin', sysdate(), '', null, '');
|
||||
|
||||
insert into sys_oss_config values (1, 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', 'http://localhost:9000', 'N', '', '0', '', 'admin', sysdate(), 'admin', sysdate(), NULL);
|
||||
insert into sys_oss_config values (2, 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'http://XXX.XXXX.com', 'N', 'z0', '1', '', 'admin', sysdate(), 'admin', sysdate(), NULL);
|
||||
insert into sys_oss_config values (3, 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'http://oss-cn-beijing.aliyuncs.com', 'N', '', '1', '', 'admin', sysdate(), 'admin', sysdate(), NULL);
|
||||
insert into sys_oss_config values (4, 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'http://cos.ap-beijing.myqcloud.com', 'N', 'ap-beijing', '1', '', 'admin', sysdate(), 'admin', sysdate(), NULL);
|
||||
|
|
|
|||
|
|
@ -1,45 +0,0 @@
|
|||
/*
|
||||
Navicat MySQL Data Transfer
|
||||
|
||||
Source Server : mysql57
|
||||
Source Server Version : 50735
|
||||
Source Host : localhost:3306
|
||||
Source Database : ry-vue
|
||||
|
||||
Target Server Type : MYSQL
|
||||
Target Server Version : 50735
|
||||
File Encoding : 65001
|
||||
|
||||
Date: 2021-08-12 09:01:33
|
||||
*/
|
||||
|
||||
SET FOREIGN_KEY_CHECKS=0;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for sys_oss_config
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `sys_oss_config`;
|
||||
CREATE TABLE `sys_oss_config` (
|
||||
`oss_config_id` int(5) NOT NULL AUTO_INCREMENT COMMENT '主建',
|
||||
`config_key` varchar(255) NOT NULL DEFAULT '' COMMENT '配置key',
|
||||
`access_key` varchar(255) DEFAULT '' COMMENT 'access_key',
|
||||
`secret_key` varchar(255) DEFAULT '' COMMENT '秘钥',
|
||||
`bucket_name` varchar(255) DEFAULT '' COMMENT '桶名称',
|
||||
`prefix` varchar(255) DEFAULT '' COMMENT '前缀',
|
||||
`endpoint` varchar(255) DEFAULT '' COMMENT '访问站点',
|
||||
`is_https` char(1) DEFAULT '0' COMMENT '是否htpps（0否 1是）',
|
||||
`region` varchar(255) DEFAULT '' COMMENT '域',
|
||||
`status` char(1) DEFAULT '0' COMMENT '状态(0正常 1停用)',
|
||||
`ext1` varchar(255) DEFAULT '' COMMENT '扩展字段',
|
||||
`create_by` varchar(64) DEFAULT '' COMMENT '创建者',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT '' COMMENT '更新者',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
|
||||
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
|
||||
PRIMARY KEY (`oss_config_id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='云存储配置表';
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of sys_oss_config
|
||||
-- ----------------------------
|
||||
INSERT INTO `sys_oss_config` VALUES ('1', 'minio3', 'ruoyi', 'ruoyi123', 'ruoyi', '', 'http://localhost:9000', '0', '', '0', '', 'admin', '2021-08-11 21:29:37', 'admin', '2021-08-11 22:52:41', null);
|
||||
Loading…
Reference in New Issue