guomengjiao 15 годин тому
батько
коміт
a7b8a8786d

+ 4 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java

@@ -18,10 +18,10 @@ import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.domain.bo.SysOssBo;
 import com.ruoyi.system.domain.vo.SysOssVo;
-import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysOssService;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -48,7 +48,8 @@ import java.util.Map;
 public class SysOssController extends BaseController {
 
     private final ISysOssService iSysOssService;
-    private final ISysConfigService iSysConfigService;
+    @Value("${oss.filePathOssDomain}")
+    private String filePathOssDomain;
 
     /**
      * 查询OSS对象存储列表
@@ -134,7 +135,7 @@ public class SysOssController extends BaseController {
         }
         SysOss oss = iSysOssService.localUpload(file);
         Map<String, String> map = new HashMap<>(2);
-        map.put("url", oss.getUrl());
+        map.put("url", filePathOssDomain + oss.getUrl());
         map.put("fileName", oss.getFileName());
         return R.ok(map);
     }

+ 2 - 2
ruoyi-admin/src/main/resources/application.yml

@@ -350,8 +350,8 @@ aliyunsample:
 
 oss:
   # Oss域名
-  filePathOssDomain: https://peihu.songlanyun.com/
+  filePathOssDomain: http://192.168.0.70:8181
   # 线上域名
-  filePathAtlDomain: https://peihu.songlanyun.com/
+  filePathAtlDomain: http://192.168.0.70:8181
   # 富文本替换值
   richReplaceValue: 【~Rich-Replace-Value~】