From 1b9b9f7e3a70a04bff5c81f49ee353171e5ab5b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 11 Mar 2022 13:58:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=8A=A5=E9=94=99=E6=9C=AA=E6=8A=9B=E5=87=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E6=98=BE=E7=A4=BA=E5=A3=B0=E6=98=8E?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=82=E5=B8=B8=20=E4=BB=A5=E4=BE=BFdubbo?=
 =?UTF-8?q?=E6=8A=9B=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/resource/api/RemoteFileService.java    | 3 ++-
 .../src/main/java/com/ruoyi/resource/domain/SysOss.java        | 3 +--
 .../java/com/ruoyi/resource/dubbo/RemoteFileServiceImpl.java   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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();