From af5436c6fba777f6e8cd649c3e251cb5df568439 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 25 十一月 2024 09:36:37 +0800
Subject: [PATCH] 移除actuator依赖

---
 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
index 22d6d70..1c3594e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -10,6 +10,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.Json;
+import org.apache.commons.io.IOUtils;
+import org.apache.xmlbeans.impl.common.IOUtil;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.domain.model.LoginUser;
@@ -45,9 +47,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -177,7 +177,7 @@
     }
 
     /**
-     * 鍚屾
+     * 鍚屾 瀹氭椂鎷夊彇
      * @param
      * @param
      * @return
@@ -187,9 +187,11 @@
         String originalfileName = request.getFileName();
         String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
         OssClient storage = OssFactory.instance();
+//        String type = request.getFileName().substring(14,request.getFileName().length());
+        String type = request.getFile().getContentType();
         UploadResult uploadResult;
         try {
-            uploadResult = storage.uploadSuffix2(request.getFile().getBytes(), request.getPath(), request.getFile().getContentType());
+            uploadResult = storage.uploadSuffix2(request.getFile().getBytes(), request.getPath(), type);
         } catch (IOException e) {
             throw new ServiceException(e.getMessage());
         }
@@ -199,6 +201,30 @@
         return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
             request.getPassword(), "1731588854831022081", request.getFileName(), request.getCreateTime());
     }
+
+//    /**
+//     * 鍚屾 瀹氭椂鎷夊彇
+//     * @param
+//     * @param
+//     * @return
+//     */
+//    @Override
+//    public SysOssVo upload3(SynchronousRequest request) throws ParseException {
+//        String originalfileName = request.getFileName();
+//        String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+//        OssClient storage = OssFactory.instance();
+//        UploadResult uploadResult;
+//        try {
+//            uploadResult = storage.uploadSuffix2(request.getFile().getBytes(), request.getPath(), request.getFile().getContentType());
+//        } catch (IOException e) {
+//            throw new ServiceException(e.getMessage());
+//        }
+//        // 淇濆瓨鏂囦欢淇℃伅
+//        System.out.println("canshu:" + "," + originalfileName +"," + suffix +"," + storage.getConfigKey() +"," + uploadResult + "," +request.getOssId()
+//            +"," + request.getPassword() +"," + request.getCreateBy() +"," + request.getFileName() +"," +  request.getCreateTime());
+//        return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
+//            request.getPassword(), "1731588854831022081", request.getFileName(), request.getCreateTime());
+//    }
 
 //    @Override
 //    public SysOssVo upload(File file) {
@@ -230,8 +256,8 @@
         request.setPassword(oss.getPassword());
         request.setCreateBy("1731588854831022081");
         request.setOssId(String.valueOf(oss.getOssId()));
-//        request.setOssId();
-//        post(request);
+//        request.setOssId("123890");
+        post(request);
 
         SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
         return this.matchingUrl(sysOssVo);
@@ -289,6 +315,8 @@
         return true;
     }
 
+
+
     @Override
     public R viewPasswordById(Long ossId) {
         LoginUser loginUser = LoginHelper.getLoginUser();
@@ -322,14 +350,6 @@
         String requestUrl = boundary.getVideo() +  "/resource/synchronization/upload";
         ObjectMapper objectMapper = new ObjectMapper();
         objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
-        String jsonString = "";
-        try {
-            // 灏咼ava瀵硅薄杞崲涓篔SON瀛楃涓�
-            jsonString = objectMapper.writeValueAsString(request);
-//            System.out.println(jsonString);
-        } catch (Exception e) {
-//            e.printStackTrace();
-        }
         headers.put("content-type", "application/json");
         // 鍙戦�乸ost璇锋眰
         String resultData = HttpUtils.sendPostRequest(requestUrl, request);

--
Gitblit v1.8.0