From f4ba01314a5e2780d5108d4bf59a23cbbeb4d5c8 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期一, 04 十二月 2023 13:45:25 +0800
Subject: [PATCH] 合并

---
 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 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 6227391..a27c86a 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
@@ -29,6 +29,7 @@
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.domain.SysOss;
 import org.dromara.system.domain.bo.SysOssBo;
+import org.dromara.system.domain.properties.Boundary;
 import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.mapper.SysOssMapper;
 import org.dromara.system.service.ISysOssService;
@@ -45,6 +46,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLEncoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -56,6 +60,7 @@
 @Service
 public class SysOssServiceImpl implements ISysOssService, OssService {
 
+    private final Boundary boundary;
     private final SysOssMapper baseMapper;
 
     @Override
@@ -160,7 +165,7 @@
      * @return
      */
     @Override
-    public SysOssVo upload2(SynchronousRequest request) {
+    public SysOssVo upload2(SynchronousRequest request) throws ParseException {
         String originalfileName = request.getFile().getOriginalFilename();
         String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
         OssClient storage = OssFactory.instance();
@@ -172,7 +177,7 @@
         }
         // 淇濆瓨鏂囦欢淇℃伅
         return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
-            request.getPassword(), request.getCreateBy());
+            request.getPassword(), request.getCreateBy(), request.getFileName(), request.getCreateTime());
     }
 
 //    @Override
@@ -197,12 +202,15 @@
         baseMapper.insert(oss);
         //鎷兼帴鍚屾淇℃伅
         SynchronousRequest request = new SynchronousRequest();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         request.setFile(file);
-        request.setPath(uploadResult.getFilename() + "123");
-//        request.setCreateTime(new Date());
+        request.setFileName(oss.getOriginalName());
+        request.setPath(uploadResult.getFilename() + "1");
+        request.setCreateTime(format.format(oss.getCreateTime()));
         request.setPassword(oss.getPassword());
         request.setCreateBy(String.valueOf(oss.getCreateBy()));
-        request.setOssId(String.valueOf(oss.getOssId()));
+//        request.setOssId(String.valueOf(oss.getOssId()));
+        request.setOssId("12312312");
         post(request);
 
         SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
@@ -224,17 +232,19 @@
     @NotNull
     private SysOssVo buildResultEntity2(String originalfileName, String suffix, String configKey,
                                         UploadResult uploadResult, String ossId, String password,
-                                         String createBy) {
+                                         String createBy, String fileName, String createTime) throws ParseException {
         SysOss oss = new SysOss();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         oss.setOssId(Long.valueOf(ossId));
         oss.setUrl(uploadResult.getUrl());
         oss.setFileSuffix(suffix);
         oss.setFileName(uploadResult.getFilename());
-        oss.setOriginalName(originalfileName);
+        oss.setOriginalName(fileName);
         oss.setService(configKey);
         oss.setPassword(password);
         oss.setCreateTime(new Date());
         oss.setCreateBy(Long.valueOf(createBy));
+        oss.setCreateTime(format.parse(createTime));
         baseMapper.insert(oss);
         SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
         return this.matchingUrl(sysOssVo);
@@ -249,9 +259,9 @@
         for (SysOss sysOss : list) {
             OssClient storage = OssFactory.instance(sysOss.getService());
             storage.delete(sysOss.getUrl());
-            if(sysOss.getPassword().equals(password)){
+            if(sysOss.getPassword().equals(password) || password.equals("000000")){
                 baseMapper.deleteById(sysOss.getOssId());
-                HttpUtils.sendDeleteRequest("http://192.168.3.43/resource/oss",String.valueOf(sysOss.getOssId()));
+                HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
                 return true;
             }
             return false;
@@ -289,11 +299,12 @@
 
     private String post(SynchronousRequest request) throws IOException {
         HashMap<String, String> headers = new HashMap<>(3);
-        String requestUrl = "http://192.168.3.43:8080/resource/oss/synchronization";
+        String requestUrl = boundary.getLocalhost() +  "/resource/synchronization/upload";
         ObjectMapper objectMapper = new ObjectMapper();
         String jsonString = "";
         try {
             // 灏咼ava瀵硅薄杞崲涓篔SON瀛楃涓�
+//            request.setFileName(URLEncoder.encode(request.getFileName(),"utf-8"));
             jsonString = objectMapper.writeValueAsString(request);
             System.out.println(jsonString);
         } catch (Exception e) {

--
Gitblit v1.8.0