diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/com/ruoyi/resource/api/RemoteFileService.java b/ruoyi-api/ruoyi-api-resource/src/main/java/com/ruoyi/resource/api/RemoteFileService.java index 2560d8f0..1bcad8e5 100644 --- a/ruoyi-api/ruoyi-api-resource/src/main/java/com/ruoyi/resource/api/RemoteFileService.java +++ b/ruoyi-api/ruoyi-api-resource/src/main/java/com/ruoyi/resource/api/RemoteFileService.java @@ -1,5 +1,6 @@ package com.ruoyi.resource.api; +import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.resource.api.domain.SysFile; /** @@ -15,5 +16,5 @@ public interface RemoteFileService { * @param file 文件信息 * @return 结果 */ - SysFile upload(String name, String originalFilename, String contentType, byte[] file); + SysFile upload(String name, String originalFilename, String contentType, byte[] file) throws ServiceException; } diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/SysOss.java b/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/SysOss.java index 732da0da..3db270c0 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/SysOss.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/domain/SysOss.java @@ -1,6 +1,5 @@ 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; @@ -20,7 +19,7 @@ public class SysOss extends BaseEntity { /** * 对象存储主键 */ - @TableId(value = "oss_id", type = IdType.AUTO) + @TableId(value = "oss_id") private Long ossId; /** diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/dubbo/RemoteFileServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/dubbo/RemoteFileServiceImpl.java index d42fa6d7..04545040 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/dubbo/RemoteFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/dubbo/RemoteFileServiceImpl.java @@ -33,7 +33,7 @@ public class RemoteFileServiceImpl implements RemoteFileService { */ @Transactional(rollbackFor = Exception.class) @Override - public SysFile upload(String name, String originalFilename, String contentType, byte[] file) { + public SysFile upload(String name, String originalFilename, String contentType, byte[] file) throws ServiceException { try { String suffix = StringUtils.substring(originalFilename, originalFilename.lastIndexOf("."), originalFilename.length()); IOssStrategy storage = OssFactory.instance();