jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

!77 update 对象存储配置 重构到数据库 动态配置

Browse Source 
* 增加对象存储配置sql
* 修改对象存储配置
* Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
* 增加对象存储配置
* 增加对象存储配置
This commit is contained in:
孤舟烟雨
2021-08-13 02:03:46 +00:00
committed by 疯狂的狮子Li
parent 2b0c4acfa1
commit c9f7314cd0
11 changed files with 1309 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java Normal file
View File

@ -0,0 +1,111 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
/**
* 云存储配置对象 sys_oss_config
*
* @author ruoyi
* @date 2021-08-11
*/
@Data
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_oss_config")
public class SysOssConfig implements Serializable {
private static final long serialVersionUID=1L;
/**
* 主建
*/
@TableId(value = "oss_config_id")
private Integer ossConfigId;
/**
* 配置key
*/
private String configKey;
/**
* accessKey
*/
private String accessKey;
/**
* 秘钥
*/
private String secretKey;
/**
* 桶名称
*/
private String bucketName;
/**
* 前缀
*/
private String prefix;
/**
* 访问站点
*/
private String endpoint;
/**
* 是否htpps（0否 1是）
*/
private String isHttps;
/**
* 域
*/
private String region;
/**
* 状态(0正常 1停用)
*/
private String status;
/**
* 扩展字段
*/
private String ext1;
/**
* 创建者
*/
@TableField(fill = FieldFill.INSERT)
private String createBy;
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
* 更新者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**
* 更新时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/**
* 备注
*/
private String remark;
}

126
ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java Normal file
View File

@ -0,0 +1,126 @@
package com.ruoyi.system.domain.bo;
import com.baomidou.mybatisplus.annotation.TableId;
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;
/**
* 云存储配置业务对象 sys_oss_config
*
* @author ruoyi
* @date 2021-08-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("云存储配置业务对象")
public class SysOssConfigBo extends BaseEntity {
/**
* 主建
*/
@ApiModelProperty("主建")
private Integer ossConfigId;
/**
* 配置key
*/
@ApiModelProperty(value = "configKey", required = true)
@NotBlank(message = "configKey不能为空", groups = { AddGroup.class, EditGroup.class })
@Size(min = 2, max = 100, message = "configKey长度必须介于2和20 之间")
private String configKey;
/**
* accessKey
*/
@ApiModelProperty(value = "accessKey")
@NotBlank(message = "accessKey不能为空", groups = { AddGroup.class, EditGroup.class })
@Size(min = 2, max = 100, message = "accessKey长度必须介于2和100 之间")
private String accessKey;
/**
* 秘钥
*/
@ApiModelProperty(value = "secretKey")
@NotBlank(message = "secretKey不能为空", groups = { AddGroup.class, EditGroup.class })
@Size(min = 2, max = 100, message = "secretKey长度必须介于2和100 之间")
private String secretKey;
/**
* 桶名称
*/
@ApiModelProperty(value = "bucketName")
@NotBlank(message = "bucketName不能为空", groups = { AddGroup.class, EditGroup.class })
@Size(min = 2, max = 100, message = "bucketName长度必须介于2和100之间")
private String bucketName;
/**
* 前缀
*/
@ApiModelProperty(value = "前缀")
private String prefix;
/**
* 访问站点
*/
@ApiModelProperty(value = "endpoint")
@NotBlank(message = "endpoint不能为空", groups = { AddGroup.class, EditGroup.class })
@Size(min = 2, max = 100, message = "endpoint长度必须介于2和100之间")
private String endpoint;
/**
* 是否htpps（0否 1是）
*/
@ApiModelProperty(value = "是否htpps（0否 1是）")
private String isHttps;
/**
* 域
*/
@ApiModelProperty(value = "region")
private String region;
/**
* 扩展字段
*/
@ApiModelProperty(value = "扩展字段")
private String ext1;
/**
* 分页大小
*/
@ApiModelProperty("分页大小")
private Integer pageSize;
/**
* 当前页数
*/
@ApiModelProperty("当前页数")
private Integer pageNum;
/**
* 排序列
*/
@ApiModelProperty("排序列")
private String orderByColumn;
/**
* 排序的方向desc或者asc
*/
@ApiModelProperty(value = "排序的方向", example = "asc,desc")
private String isAsc;
/**
* 状态(0正常 1停用)
*/
@ApiModelProperty("状态(0正常 1停用)")
private String status;
}

94
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java Normal file
View File

@ -0,0 +1,94 @@
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
*/
@Data
@ApiModel("云存储配置视图对象")
@ExcelIgnoreUnannotated
public class SysOssConfigVo {
private static final long serialVersionUID = 1L;
/**
* 主建
*/
@ApiModelProperty("主建")
private Integer ossConfigId;
/**
* 配置key
*/
@ApiModelProperty("配置key")
private String configKey;
/**
* accessKey
*/
@ApiModelProperty("accessKey")
private String accessKey;
/**
* 秘钥
*/
@ApiModelProperty("secretKey")
private String secretKey;
/**
* 桶名称
*/
@ApiModelProperty("桶名称")
private String bucketName;
/**
* 前缀
*/
@ApiModelProperty("前缀")
private String prefix;
/**
* 访问站点
*/
@ApiModelProperty("访问站点")
private String endpoint;
/**
* 是否htpps（0否 1是）
*/
@ApiModelProperty("是否htpps（0否 1是）")
private String isHttps;
/**
* 域
*/
@ApiModelProperty("域")
private String region;
/**
* 状态(0正常 1停用)
*/
@ApiModelProperty("状态(0正常 1停用)")
private String status;
/**
* 扩展字段
*/
@ApiModelProperty("扩展字段")
private String ext1;
}

16
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java Normal file
View File

@ -0,0 +1,16 @@
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;
/**
* 云存储配置Mapper接口
*
* @author ruoyi
* @date 2021-08-11
*/
public interface SysOssConfigMapper extends BaseMapperPlus<SysOssConfig> {
}

66
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java Normal file
View File

@ -0,0 +1,66 @@
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 java.util.Collection;
import java.util.List;
/**
* 云存储配置Service接口
*
* @author ruoyi
* @date 2021-08-11
*/
public interface ISysOssConfigService extends IServicePlus<SysOssConfig, SysOssConfigVo> {
/**
* 查询单个
* @return
*/
SysOssConfigVo queryById(Integer ossConfigId);
/**
* 查询列表
*/
TableDataInfo<SysOssConfigVo> queryPageList(SysOssConfigBo bo);
/**
* 根据新增业务对象插入云存储配置
* @param bo 云存储配置新增业务对象
* @return
*/
Boolean insertByBo(SysOssConfigBo bo);
/**
* 根据编辑业务对象修改云存储配置
* @param bo 云存储配置编辑业务对象
* @return
*/
Boolean updateByBo(SysOssConfigBo bo);
/**
* 校验并删除数据
* @param ids 主键集合
* @param isValid 是否校验,true-删除前校验,false-不校验
* @return
*/
Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
/**
* 启用停用状态
* @param sysOssConfig
* @return
*/
int updateOssConfigStatus(SysOssConfig sysOssConfig);
/**
* 判断configkey是否唯一
* @param bo
* @return
*/
String checkConfigKeyUnique(SysOssConfigBo bo);
}

145
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java Normal file
View File

@ -0,0 +1,145 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.ruoyi.common.constant.Constants;
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.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo;
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.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.ISysOssConfigService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 云存储配置Service业务层处理
*
* @author ruoyi
* @date 2021-08-11
*/
@Service
public class SysOssConfigServiceImpl extends ServicePlusImpl<SysOssConfigMapper, SysOssConfig, SysOssConfigVo> implements ISysOssConfigService {
@Autowired
private ISysConfigService iSysConfigService;
@Autowired
private SysConfigMapper sysConfigMapper;
@Autowired
private RedisCache redisCache;
@Override
public SysOssConfigVo queryById(Integer ossConfigId){
return getVoById(ossConfigId);
}
@Override
public TableDataInfo<SysOssConfigVo> queryPageList(SysOssConfigBo bo) {
PagePlus<SysOssConfig, SysOssConfigVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
return PageUtils.buildDataInfo(result);
}
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());
return lqw;
}
@Override
public Boolean insertByBo(SysOssConfigBo bo) {
SysOssConfig add = BeanUtil.toBean(bo, SysOssConfig.class);
validEntityBeforeSave(add);
return save(add);
}
@Override
public Boolean updateByBo(SysOssConfigBo bo) {
SysOssConfig update = BeanUtil.toBean(bo, SysOssConfig.class);
validEntityBeforeSave(update);
return updateById(update);
}
/**
* 保存前的数据校验
*
* @param entity 实体类数据
*/
private void validEntityBeforeSave(SysOssConfig entity){
//TODO 做一些数据校验,如唯一约束
}
@Override
public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
return removeByIds(ids);
}
/**
* 判断configKey是否唯一
* @param bo
* @return
*/
@Override
public String checkConfigKeyUnique(SysOssConfigBo bo) {
Long ossConfigId = StringUtils.isNull(bo.getOssConfigId()) ? -1L : bo.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()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
}
/**
* 启用禁用状态
* @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);
if(ObjectUtil.isNotNull(sysConfig)){
sysConfig.setConfigValue(sysOssConfig.getConfigKey());
iSysConfigService.updateConfig(sysConfig);
}
return baseMapper.updateById(sysOssConfig);
}
/**
* 设置cache key
*
* @param configKey 参数键
* @return 缓存键key
*/
private String getCacheKey(String configKey) {
return Constants.SYS_CONFIG_KEY + configKey;
}
}

27
ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml Normal file
View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysOssConfigMapper">
<resultMap type="com.ruoyi.system.domain.SysOssConfig" id="SysOssConfigResult">
<result property="ossConfigId" column="oss_config_id"/>
<result property="configKey" column="config_key"/>
<result property="accessKey" column="access_key"/>
<result property="secretKey" column="secret_key"/>
<result property="bucketName" column="bucket_name"/>
<result property="prefix" column="prefix"/>
<result property="endpoint" column="endpoint"/>
<result property="isHttps" column="is_https"/>
<result property="region" column="region"/>
<result property="status" column="status"/>
<result property="ext1" column="ext1"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>