add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/RuoYiResourceApplication.java

@@ -0,0 +1,20 @@
+package com.ruoyi.resource;
+
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/**
+ * 资源服务
+ *
+ * @author Lion Li
+ */
+@EnableDubbo
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+public class RuoYiResourceApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(RuoYiResourceApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  资源服务模块启动成功   ლ(´ڡ`ლ)ﾞ  ");
+    }
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysOssConfigController.java

@@ -0,0 +1,110 @@
+package com.ruoyi.resource.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.resource.domain.bo.SysOssConfigBo;
+import com.ruoyi.resource.domain.vo.SysOssConfigVo;
+import com.ruoyi.resource.service.ISysOssConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+
+/**
+ * 对象存储配置Controller
+ *
+ * @author Lion Li
+ * @author 孤舟烟雨
+ * @date 2021-08-13
+ */
+@Validated
+@Api(value = "对象存储配置控制器", tags = {"对象存储配置管理"})
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/oss/config")
+public class SysOssConfigController extends BaseController {
+
+    private final ISysOssConfigService iSysOssConfigService;
+
+    /**
+     * 查询对象存储配置列表
+     */
+    @ApiOperation("查询对象存储配置列表")
+    @SaCheckPermission("system:oss:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
+        return iSysOssConfigService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取对象存储配置详细信息
+     */
+    @ApiOperation("获取对象存储配置详细信息")
+    @SaCheckPermission("system:oss:query")
+    @GetMapping("/{ossConfigId}")
+    public R<SysOssConfigVo> getInfo(@ApiParam("OSS配置ID")
+                                              @NotNull(message = "主键不能为空")
+                                              @PathVariable("ossConfigId") Integer ossConfigId) {
+        return R.ok(iSysOssConfigService.queryById(ossConfigId));
+    }
+
+    /**
+     * 新增对象存储配置
+     */
+    @ApiOperation("新增对象存储配置")
+    @SaCheckPermission("system:oss:add")
+    @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
+        return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改对象存储配置
+     */
+    @ApiOperation("修改对象存储配置")
+    @SaCheckPermission("system:oss:edit")
+    @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
+        return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除对象存储配置
+     */
+    @ApiOperation("删除对象存储配置")
+    @SaCheckPermission("system:oss:remove")
+    @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ossConfigIds}")
+    public R<Void> remove(@ApiParam("OSS配置ID串")
+                                   @NotEmpty(message = "主键不能为空")
+                                   @PathVariable Long[] ossConfigIds) {
+        return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
+    }
+
+    /**
+     * 状态修改
+     */
+    @ApiOperation("状态修改")
+    @SaCheckPermission("system:oss:edit")
+    @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
+        return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
+    }
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysOssController.java

@@ -0,0 +1,119 @@
+package com.ruoyi.resource.controller;
+
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpException;
+import cn.hutool.http.HttpUtil;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.file.FileUtils;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.resource.domain.SysOss;
+import com.ruoyi.resource.domain.bo.SysOssBo;
+import com.ruoyi.resource.domain.vo.SysOssVo;
+import com.ruoyi.resource.service.ISysOssService;
+import io.swagger.annotations.*;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 文件上传 控制层
+ *
+ * @author Lion Li
+ */
+@Validated
+@Api(value = "对象存储控制器", tags = {"对象存储管理"})
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/oss")
+public class SysOssController extends BaseController {
+
+    private final ISysOssService iSysOssService;
+
+    /**
+     * 查询OSS对象存储列表
+     */
+    @ApiOperation("查询OSS对象存储列表")
+    @SaCheckPermission("system:oss:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
+        return iSysOssService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 上传OSS对象存储
+     */
+    @ApiOperation("上传OSS对象存储")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "file", value = "文件", dataTypeClass = File.class, required = true),
+    })
+    @SaCheckPermission("system:oss:upload")
+    @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
+    @PostMapping("/upload")
+    public R<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
+        if (ObjectUtil.isNull(file)) {
+            throw new ServiceException("上传文件不能为空");
+        }
+        SysOss oss = iSysOssService.upload(file);
+        Map<String, String> map = new HashMap<>(2);
+        map.put("url", oss.getUrl());
+        map.put("fileName", oss.getFileName());
+        return R.ok(map);
+    }
+
+    @ApiOperation("下载OSS对象存储")
+    @SaCheckPermission("system:oss:download")
+    @GetMapping("/download/{ossId}")
+    public void download(@ApiParam("OSS对象ID") @PathVariable Long ossId, HttpServletResponse response) throws IOException {
+        SysOss sysOss = iSysOssService.getById(ossId);
+        if (ObjectUtil.isNull(sysOss)) {
+            throw new ServiceException("文件数据不存在!");
+        }
+        response.reset();
+        FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
+        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
+        long data;
+        try {
+            data = HttpUtil.download(sysOss.getUrl(), response.getOutputStream(), false);
+        } catch (HttpException e) {
+            if (e.getMessage().contains("403")) {
+                throw new ServiceException("无读取权限, 请在对应的OSS开启'公有读'权限!");
+            } else {
+                throw new ServiceException(e.getMessage());
+            }
+        }
+        response.setContentLength(Convert.toInt(data));
+    }
+
+    /**
+     * 删除OSS对象存储
+     */
+    @ApiOperation("删除OSS对象存储")
+    @SaCheckPermission("system:oss:remove")
+    @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ossIds}")
+    public R<Void> remove(@ApiParam("OSS对象ID串")
+                                   @NotEmpty(message = "主键不能为空")
+                                   @PathVariable Long[] ossIds) {
+        return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
+    }
+
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/SysOss.java

@@ -0,0 +1,51 @@
+package com.ruoyi.resource.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * OSS对象存储对象
+ *
+ * @author Lion Li
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oss")
+public class SysOss extends BaseEntity {
+
+    /**
+     * 对象存储主键
+     */
+    @TableId(value = "oss_id", type = IdType.AUTO)
+    private Long ossId;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 原名
+     */
+    private String originalName;
+
+    /**
+     * 文件后缀名
+     */
+    private String fileSuffix;
+
+    /**
+     * URL地址
+     */
+    private String url;
+
+    /**
+     * 服务商
+     */
+    private String service;
+
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/SysOssConfig.java

@@ -0,0 +1,80 @@
+package com.ruoyi.resource.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 对象存储配置对象 sys_oss_config
+ *
+ * @author Lion Li
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oss_config")
+public class SysOssConfig extends BaseEntity {
+
+    /**
+     * 主建
+     */
+    @TableId(value = "oss_config_id")
+    private Long ossConfigId;
+
+    /**
+     * 配置key
+     */
+    private String configKey;
+
+    /**
+     * accessKey
+     */
+    private String accessKey;
+
+    /**
+     * 秘钥
+     */
+    private String secretKey;
+
+    /**
+     * 桶名称
+     */
+    private String bucketName;
+
+    /**
+     * 前缀
+     */
+    private String prefix;
+
+    /**
+     * 访问站点
+     */
+    private String endpoint;
+
+    /**
+     * 是否https（0否 1是）
+     */
+    private String isHttps;
+
+    /**
+     * 域
+     */
+    private String region;
+
+    /**
+     * 状态(0正常 1停用)
+     */
+    private String status;
+
+    /**
+     * 扩展字段
+     */
+    private String ext1;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/bo/SysOssBo.java

@@ -0,0 +1,45 @@
+package com.ruoyi.resource.domain.bo;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * OSS对象存储分页查询对象 sys_oss
+ *
+ * @author Lion Li
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("OSS对象存储分页查询对象")
+public class SysOssBo extends BaseEntity {
+
+    /**
+     * 文件名
+     */
+    @ApiModelProperty("文件名")
+    private String fileName;
+    /**
+     * 原名
+     */
+    @ApiModelProperty("原名")
+    private String originalName;
+    /**
+     * 文件后缀名
+     */
+    @ApiModelProperty("文件后缀名")
+    private String fileSuffix;
+    /**
+     * URL地址
+     */
+    @ApiModelProperty("URL地址")
+    private String url;
+    /**
+     * 服务商
+     */
+    @ApiModelProperty("服务商")
+    private String service;
+
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/bo/SysOssConfigBo.java

@@ -0,0 +1,105 @@
+package com.ruoyi.resource.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * 对象存储配置业务对象 sys_oss_config
+ *
+ * @author Lion Li
+ * @author 孤舟烟雨
+ * @date 2021-08-13
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("对象存储配置业务对象")
+public class SysOssConfigBo extends BaseEntity {
+
+    /**
+     * 主建
+     */
+    @ApiModelProperty(value = "主建", required = true)
+    @NotNull(message = "主建不能为空", groups = {EditGroup.class})
+    private Long 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", required = true)
+    @NotBlank(message = "accessKey不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "accessKey长度必须介于2和100 之间")
+    private String accessKey;
+
+    /**
+     * 秘钥
+     */
+    @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;
+
+    /**
+     * 桶名称
+     */
+    @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;
+
+    /**
+     * 前缀
+     */
+    @ApiModelProperty(value = "前缀")
+    private String prefix;
+
+    /**
+     * 访问站点
+     */
+    @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;
+
+    /**
+     * 是否https（Y=是,N=否）
+     */
+    @ApiModelProperty("是否https（Y=是,N=否）")
+    private String isHttps;
+
+    /**
+     * 状态（0=正常,1=停用）
+     */
+    @ApiModelProperty("状态（0=正常,1=停用）")
+    private String status;
+
+    /**
+     * 域
+     */
+    @ApiModelProperty(value = "region")
+    private String region;
+
+    /**
+     * 扩展字段
+     */
+    @ApiModelProperty(value = "扩展字段")
+    private String ext1;
+
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/vo/SysOssConfigVo.java

@@ -0,0 +1,93 @@
+package com.ruoyi.resource.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 对象存储配置视图对象 sys_oss_config
+ *
+ * @author Lion Li
+ * @author 孤舟烟雨
+ * @date 2021-08-13
+ */
+@Data
+@ApiModel("对象存储配置视图对象")
+public class SysOssConfigVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主建
+     */
+    @ApiModelProperty("主建")
+    private Long 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;
+
+    /**
+     * 是否https（Y=是,N=否）
+     */
+    @ApiModelProperty("是否https（Y=是,N=否）")
+    private String isHttps;
+
+    /**
+     * 域
+     */
+    @ApiModelProperty("域")
+    private String region;
+
+    /**
+     * 状态（0=正常,1=停用）
+     */
+    @ApiModelProperty("状态（0=正常,1=停用）")
+    private String status;
+
+    /**
+     * 扩展字段
+     */
+    @ApiModelProperty("扩展字段")
+    private String ext1;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/vo/SysOssVo.java

@@ -0,0 +1,69 @@
+package com.ruoyi.resource.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * OSS对象存储视图对象 sys_oss
+ *
+ * @author Lion Li
+ */
+@Data
+@ApiModel("OSS对象存储视图对象")
+public class SysOssVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 对象存储主键
+     */
+    @ApiModelProperty("对象存储主键")
+    private Long ossId;
+
+    /**
+     * 文件名
+     */
+    @ApiModelProperty("文件名")
+    private String fileName;
+
+    /**
+     * 原名
+     */
+    @ApiModelProperty("原名")
+    private String originalName;
+
+    /**
+     * 文件后缀名
+     */
+    @ApiModelProperty("文件后缀名")
+    private String fileSuffix;
+
+    /**
+     * URL地址
+     */
+    @ApiModelProperty("URL地址")
+    private String url;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    /**
+     * 上传人
+     */
+    @ApiModelProperty("上传人")
+    private String createBy;
+
+    /**
+     * 服务商
+     */
+    @ApiModelProperty("服务商")
+    private String service;
+
+
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/dubbo/RemoteFileServiceImpl.java

@@ -0,0 +1,59 @@
+package com.ruoyi.resource.dubbo;
+
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.oss.entity.UploadResult;
+import com.ruoyi.common.oss.factory.OssFactory;
+import com.ruoyi.common.oss.service.IOssStrategy;
+import com.ruoyi.resource.api.RemoteFileService;
+import com.ruoyi.resource.api.domain.SysFile;
+import com.ruoyi.resource.domain.SysOss;
+import com.ruoyi.resource.mapper.SysOssMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 文件请求处理
+ *
+ * @author Lion Li
+ */
+@Slf4j
+@Service
+@DubboService
+public class RemoteFileServiceImpl implements RemoteFileService {
+
+    @Autowired
+    private SysOssMapper sysOssMapper;
+
+    /**
+     * 文件上传请求
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public SysFile upload(String name, String originalFilename, String contentType, byte[] file) {
+        try {
+            String suffix = StringUtils.substring(originalFilename, originalFilename.lastIndexOf("."), originalFilename.length());
+            IOssStrategy storage = OssFactory.instance();
+            UploadResult uploadResult = storage.uploadSuffix(file, suffix, contentType);
+            // 保存文件信息
+            SysOss oss = new SysOss();
+            oss.setUrl(uploadResult.getUrl());
+            oss.setFileSuffix(suffix);
+            oss.setFileName(uploadResult.getFilename());
+            oss.setOriginalName(originalFilename);
+            oss.setService(storage.getServiceType().getValue());
+            sysOssMapper.insert(oss);
+            SysFile sysFile = new SysFile();
+            sysFile.setName(uploadResult.getFilename());
+            sysFile.setUrl(uploadResult.getUrl());
+            return sysFile;
+        } catch (Exception e) {
+            log.error("上传文件失败", e);
+            throw new ServiceException("上传文件失败");
+        }
+    }
+
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/mapper/SysOssConfigMapper.java

@@ -0,0 +1,17 @@
+package com.ruoyi.resource.mapper;
+
+
+import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
+import com.ruoyi.resource.domain.SysOssConfig;
+import com.ruoyi.resource.domain.vo.SysOssConfigVo;
+
+/**
+ * 对象存储配置Mapper接口
+ *
+ * @author Lion Li
+ * @author 孤舟烟雨
+ * @date 2021-08-13
+ */
+public interface SysOssConfigMapper extends BaseMapperPlus<SysOssConfigMapper, SysOssConfig, SysOssConfigVo> {
+
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/mapper/SysOssMapper.java

@@ -0,0 +1,13 @@
+package com.ruoyi.resource.mapper;
+
+import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
+import com.ruoyi.resource.domain.SysOss;
+import com.ruoyi.resource.domain.vo.SysOssVo;
+
+/**
+ * 文件上传 数据层
+ *
+ * @author Lion Li
+ */
+public interface SysOssMapper extends BaseMapperPlus<SysOssMapper, SysOss, SysOssVo> {
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/runner/ResourceApplicationRunner.java

@@ -0,0 +1,28 @@
+package com.ruoyi.resource.runner;
+
+import com.ruoyi.resource.service.ISysOssConfigService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+/**
+ * 初始化 system 模块对应业务数据
+ *
+ * @author Lion Li
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class ResourceApplicationRunner implements ApplicationRunner {
+
+    private final ISysOssConfigService ossConfigService;
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        ossConfigService.init();
+        log.info("初始化OSS配置成功");
+    }
+
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/service/ISysOssConfigService.java

@@ -0,0 +1,66 @@
+package com.ruoyi.resource.service;
+
+
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.resource.domain.bo.SysOssConfigBo;
+import com.ruoyi.resource.domain.vo.SysOssConfigVo;
+
+import java.util.Collection;
+
+/**
+ * 对象存储配置Service接口
+ *
+ * @author Lion Li
+ * @author 孤舟烟雨
+ * @date 2021-08-13
+ */
+public interface ISysOssConfigService {
+
+    /**
+     * 初始化OSS配置
+     */
+    void init();
+
+    /**
+     * 查询单个
+     */
+    SysOssConfigVo queryById(Integer ossConfigId);
+
+    /**
+     * 查询列表
+     */
+    TableDataInfo<SysOssConfigVo> queryPageList(SysOssConfigBo bo, PageQuery pageQuery);
+
+
+    /**
+     * 根据新增业务对象插入对象存储配置
+     *
+     * @param bo 对象存储配置新增业务对象
+     * @return
+     */
+    Boolean insertByBo(SysOssConfigBo bo);
+
+    /**
+     * 根据编辑业务对象修改对象存储配置
+     *
+     * @param bo 对象存储配置编辑业务对象
+     * @return
+     */
+    Boolean updateByBo(SysOssConfigBo bo);
+
+    /**
+     * 校验并删除数据
+     *
+     * @param ids     主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 启用停用状态
+     */
+    int updateOssConfigStatus(SysOssConfigBo bo);
+
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/service/ISysOssService.java

@@ -0,0 +1,27 @@
+package com.ruoyi.resource.service;
+
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.resource.domain.SysOss;
+import com.ruoyi.resource.domain.bo.SysOssBo;
+import com.ruoyi.resource.domain.vo.SysOssVo;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Collection;
+
+/**
+ * 文件上传 服务层
+ *
+ * @author Lion Li
+ */
+public interface ISysOssService {
+
+    TableDataInfo<SysOssVo> queryPageList(SysOssBo sysOss, PageQuery pageQuery);
+
+    SysOss getById(Long ossId);
+
+    SysOss upload(MultipartFile file);
+
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/service/impl/SysOssConfigServiceImpl.java

@@ -0,0 +1,194 @@
+package com.ruoyi.resource.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.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.JsonUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.common.oss.constant.OssConstant;
+import com.ruoyi.common.oss.factory.OssFactory;
+import com.ruoyi.common.redis.utils.RedisUtils;
+import com.ruoyi.resource.domain.SysOssConfig;
+import com.ruoyi.resource.domain.bo.SysOssConfigBo;
+import com.ruoyi.resource.domain.vo.SysOssConfigVo;
+import com.ruoyi.resource.mapper.SysOssConfigMapper;
+import com.ruoyi.resource.service.ISysOssConfigService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 对象存储配置Service业务层处理
+ *
+ * @author Lion Li
+ * @author 孤舟烟雨
+ * @date 2021-08-13
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class SysOssConfigServiceImpl implements ISysOssConfigService {
+
+    private final SysOssConfigMapper baseMapper;
+
+    /**
+     * 项目启动时，初始化参数到缓存，加载配置类
+     */
+    @Override
+    public void init() {
+        List<SysOssConfig> list = baseMapper.selectList();
+        // 加载OSS初始化配置
+        for (SysOssConfig config : list) {
+            String configKey = config.getConfigKey();
+            if ("0".equals(config.getStatus())) {
+                RedisUtils.setCacheObject(OssConstant.CACHE_CONFIG_KEY, configKey);
+            }
+            setConfigCache(true, config);
+        }
+        // 初始化OSS工厂
+        OssFactory.init();
+    }
+
+    @Override
+    public SysOssConfigVo queryById(Integer ossConfigId) {
+        return baseMapper.selectVoById(ossConfigId);
+    }
+
+    @Override
+    public TableDataInfo<SysOssConfigVo> queryPageList(SysOssConfigBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysOssConfig> lqw = buildQueryWrapper(bo);
+        Page<SysOssConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+
+    private LambdaQueryWrapper<SysOssConfig> buildQueryWrapper(SysOssConfigBo bo) {
+        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;
+    }
+
+    @Override
+    public Boolean insertByBo(SysOssConfigBo bo) {
+        SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class);
+        validEntityBeforeSave(config);
+        return setConfigCache(baseMapper.insert(config) > 0, config);
+    }
+
+    @Override
+    public Boolean updateByBo(SysOssConfigBo bo) {
+        SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class);
+        validEntityBeforeSave(config);
+        LambdaUpdateWrapper<SysOssConfig> luw = new LambdaUpdateWrapper<>();
+        luw.set(StringUtils.isBlank(config.getPrefix()), SysOssConfig::getPrefix, "");
+        luw.set(StringUtils.isBlank(config.getRegion()), SysOssConfig::getRegion, "");
+        luw.set(StringUtils.isBlank(config.getExt1()), SysOssConfig::getExt1, "");
+        luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId());
+        return setConfigCache(baseMapper.update(config, luw) > 0, config);
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysOssConfig entity) {
+        if (StringUtils.isNotEmpty(entity.getConfigKey())
+            && UserConstants.NOT_UNIQUE.equals(checkConfigKeyUnique(entity))) {
+            throw new ServiceException("操作配置'" + entity.getConfigKey() + "'失败, 配置key已存在!");
+        }
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            if (CollUtil.containsAny(ids, OssConstant.SYSTEM_DATA_IDS)) {
+                throw new ServiceException("系统内置, 不可删除!");
+            }
+        }
+        List<SysOssConfig> list = Lists.newArrayList();
+        for (Long configId : ids) {
+            SysOssConfig config = baseMapper.selectById(configId);
+            list.add(config);
+        }
+        boolean flag = baseMapper.deleteBatchIds(ids) > 0;
+        if (flag) {
+            list.stream().forEach(sysOssConfig -> {
+                RedisUtils.deleteObject(getCacheKey(sysOssConfig.getConfigKey()));
+            });
+        }
+        return flag;
+    }
+
+    /**
+     * 判断configKey是否唯一
+     */
+    private String checkConfigKeyUnique(SysOssConfig sysOssConfig) {
+        long ossConfigId = ObjectUtil.isNull(sysOssConfig.getOssConfigId()) ? -1L : sysOssConfig.getOssConfigId();
+        SysOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysOssConfig>()
+            .select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey)
+            .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey()));
+        if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    /**
+     * 启用禁用状态
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateOssConfigStatus(SysOssConfigBo bo) {
+        SysOssConfig sysOssConfig = BeanUtil.toBean(bo, SysOssConfig.class);
+        int row = baseMapper.update(null, new LambdaUpdateWrapper<SysOssConfig>()
+            .set(SysOssConfig::getStatus, "1"));
+        row += baseMapper.updateById(sysOssConfig);
+        if (row > 0) {
+            RedisUtils.setCacheObject(OssConstant.CACHE_CONFIG_KEY, sysOssConfig.getConfigKey());
+        }
+        return row;
+    }
+
+    /**
+     * 设置cache key
+     *
+     * @param configKey 参数键
+     * @return 缓存键key
+     */
+    private String getCacheKey(String configKey) {
+        return OssConstant.SYS_OSS_KEY + configKey;
+    }
+
+    /**
+     * 如果操作成功 则更新缓存
+     *
+     * @param flag   操作状态
+     * @param config 配置
+     * @return 返回操作状态
+     */
+    private boolean setConfigCache(boolean flag, SysOssConfig config) {
+        if (flag) {
+            RedisUtils.setCacheObject(
+                getCacheKey(config.getConfigKey()),
+                JsonUtils.toJsonString(config));
+            RedisUtils.publish(OssConstant.CACHE_CONFIG_KEY, config.getConfigKey(), msg -> {
+                log.info("发布刷新OSS配置 => " + msg);
+            });
+        }
+        return flag;
+    }
+}

ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/service/impl/SysOssServiceImpl.java

@@ -0,0 +1,99 @@
+package com.ruoyi.resource.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.common.oss.entity.UploadResult;
+import com.ruoyi.common.oss.factory.OssFactory;
+import com.ruoyi.common.oss.service.IOssStrategy;
+import com.ruoyi.resource.domain.SysOss;
+import com.ruoyi.resource.domain.bo.SysOssBo;
+import com.ruoyi.resource.domain.vo.SysOssVo;
+import com.ruoyi.resource.mapper.SysOssMapper;
+import com.ruoyi.resource.service.ISysOssService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文件上传 服务层实现
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@Service
+public class SysOssServiceImpl implements ISysOssService {
+
+    private final SysOssMapper baseMapper;
+
+    @Override
+    public TableDataInfo<SysOssVo> queryPageList(SysOssBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysOss> lqw = buildQueryWrapper(bo);
+        Page<SysOssVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    private LambdaQueryWrapper<SysOss> buildQueryWrapper(SysOssBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysOss> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getFileName()), SysOss::getFileName, bo.getFileName());
+        lqw.like(StringUtils.isNotBlank(bo.getOriginalName()), SysOss::getOriginalName, bo.getOriginalName());
+        lqw.eq(StringUtils.isNotBlank(bo.getFileSuffix()), SysOss::getFileSuffix, bo.getFileSuffix());
+        lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SysOss::getUrl, bo.getUrl());
+        lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
+            SysOss::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
+        lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), SysOss::getCreateBy, bo.getCreateBy());
+        lqw.eq(StringUtils.isNotBlank(bo.getService()), SysOss::getService, bo.getService());
+        return lqw;
+    }
+
+    @Override
+    public SysOss getById(Long ossId) {
+        return baseMapper.selectById(ossId);
+    }
+
+    @Override
+    public SysOss upload(MultipartFile file) {
+        String originalfileName = file.getOriginalFilename();
+        String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+        IOssStrategy storage = OssFactory.instance();
+        UploadResult uploadResult;
+        try {
+            uploadResult = storage.uploadSuffix(file.getBytes(), suffix, file.getContentType());
+        } catch (IOException e) {
+            throw new ServiceException(e.getMessage());
+        }
+        // 保存文件信息
+        SysOss oss = new SysOss();
+        oss.setUrl(uploadResult.getUrl());
+        oss.setFileSuffix(suffix);
+        oss.setFileName(uploadResult.getFilename());
+        oss.setOriginalName(originalfileName);
+        oss.setService(storage.getServiceType().getValue());
+        baseMapper.insert(oss);
+        return oss;
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 做一些业务上的校验,判断是否需要校验
+        }
+        List<SysOss> list = baseMapper.selectBatchIds(ids);
+        for (SysOss sysOss : list) {
+            IOssStrategy storage = OssFactory.instance(sysOss.getService());
+            storage.delete(sysOss.getUrl());
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+}

ruoyi-modules/ruoyi-resource/src/main/resources/banner.txt

@@ -0,0 +1,10 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+                        _
+                       (_)
+ _ __ _   _  ___  _   _ _ ______ _ __ ___  ___  ___  _   _ _ __ ___ ___
+| '__| | | |/ _ \| | | | |______| '__/ _ \/ __|/ _ \| | | | '__/ __/ _ \
+| |  | |_| | (_) | |_| | |      | | |  __/\__ \ (_) | |_| | | | (_|  __/
+|_|   \__,_|\___/ \__, |_|      |_|  \___||___/\___/ \__,_|_|  \___\___|
+                   __/ |
+                  |___/

ruoyi-modules/ruoyi-resource/src/main/resources/bootstrap.yml

@@ -0,0 +1,38 @@
+# Tomcat
+server:
+  port: 9300
+
+# Spring
+spring:
+  main:
+    # 此配置禁止放入 nacos 优先级不够
+    allow-circular-references: true
+  application:
+    # 应用名称
+    name: ruoyi-resource
+  profiles:
+    # 环境配置
+    active: @profiles.active@
+
+--- # nacos 配置
+spring:
+  cloud:
+    nacos:
+      # nacos 服务地址
+      server-addr: @nacos.server@
+      discovery:
+        # 注册组
+        group: @nacos.discovery.group@
+        namespace: ${spring.profiles.active}
+      config:
+        # 配置组
+        group: @nacos.config.group@
+        namespace: ${spring.profiles.active}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - data-id: application.${spring.cloud.nacos.config.file-extension}
+            refresh: true
+          - data-id: datasource.${spring.cloud.nacos.config.file-extension}
+            refresh: true

ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+	<property name="log.path" value="logs/ruoyi-resource" />
+   <!-- 日志输出格式 -->
+    <property name="console.log.pattern"
+              value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${console.log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 控制台输出 -->
+    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/console.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大 1天 -->
+            <maxHistory>1</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+        </filter>
+    </appender>
+
+    <!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+	</appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+	<logger name="com.ruoyi" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+
+	<root level="info">
+		<appender-ref ref="console" />
+	</root>
+
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+        <appender-ref ref="file_console" />
+    </root>
+</configuration>

ruoyi-modules/ruoyi-resource/src/main/resources/mapper/package-info.md

@@ -0,0 +1,3 @@
+java包使用 `.` 分割 resource 目录使用 `/` 分割
+<br>
+此文件目的 防止文件夹粘连找不到 `xml` 文件

ruoyi-modules/ruoyi-resource/src/main/resources/mapper/resource/SysOssConfigMapper.xml

@@ -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.resource.mapper.SysOssConfigMapper">
+
+    <resultMap type="com.ruoyi.resource.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>

ruoyi-modules/ruoyi-resource/src/main/resources/mapper/resource/SysOssMapper.xml

@@ -0,0 +1,18 @@
+<?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.resource.mapper.SysOssMapper">
+
+    <resultMap type="com.ruoyi.resource.domain.SysOss" id="SysOssResult">
+        <result property="ossId" column="oss_id"/>
+        <result property="fileName" column="file_name"/>
+        <result property="fileSuffix" column="file_suffix"/>
+        <result property="url" column="url"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="service" column="service"/>
+    </resultMap>
+
+
+</mapper>

ruoyi-modules/ruoyi-resource/src/main/resources/spy.properties

@@ -0,0 +1,24 @@
+# p6spy 性能分析插件配置文件
+modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
+# 自定义日志打印
+logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
+#日志输出到控制台
+appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
+# 使用日志系统记录 sql
+#appender=com.p6spy.engine.spy.appender.Slf4JLogger
+# 设置 p6spy driver 代理
+#deregisterdrivers=true
+# 取消JDBC URL前缀
+useprefix=true
+# 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.
+excludecategories=info,debug,result,commit,resultset
+# 日期格式
+dateformat=yyyy-MM-dd HH:mm:ss
+# 实际驱动可多个
+#driverlist=org.h2.Driver
+# 是否开启慢SQL记录
+outagedetection=true
+# 慢SQL记录标准 2 秒
+outagedetectioninterval=2
+# 是否过滤 Log
+filter=true