From ca0da1dd06e738d3de1f6e439cd251cfefb795fe Mon Sep 17 00:00:00 2001
From: tiansh <tiansh@hsfund.com>
Date: Tue, 23 Jan 2024 17:44:21 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=96=B0=E5=A2=9Ewebdav=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD,=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E9=9A=90=E6=82=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/hellohao/service/impl/WebDAVImageupload.java | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/main/java/cn/hellohao/service/impl/WebDAVImageupload.java b/src/main/java/cn/hellohao/service/impl/WebDAVImageupload.java
index 4e62172..333c21a 100644
--- a/src/main/java/cn/hellohao/service/impl/WebDAVImageupload.java
+++ b/src/main/java/cn/hellohao/service/impl/WebDAVImageupload.java
@@ -67,9 +67,7 @@ public class WebDAVImageupload {
                 String ShortUIDName = entry.getKey().get("name");
                 file = entry.getValue();
                 Msg fileMiME = TypeDict.FileMiME(file);
-                //webdav不能自动创建目录，上传件先创建目录
                 createDirectories(httpClient, key.getEndpoint(),  "/" + username);
-                //上传文件
                 System.out.println("WebDAV地址："+key.getEndpoint() + "/" + username + "/" + ShortUIDName + "." + prefix);
                 HttpPut httpPut = new HttpPut(key.getEndpoint() + "/" + username + "/" + ShortUIDName + "." + prefix);
                 FileEntity fileEntity = new FileEntity(file, ContentType.DEFAULT_BINARY);
@@ -77,10 +75,7 @@ public class WebDAVImageupload {
                 HttpResponse response = httpClient.execute(httpPut);
                 final int statusCode = response.getStatusLine().getStatusCode();
                 logger.info("WebDav上传响应代码："+statusCode);
-//                System.out.println(response.getStatusLine().getStatusCode());//正常成功201  已经存在204（有可能204还代表其他意思）
-//                System.out.println("File upload response for " + file.getName() + ": " + response.getStatusLine());
                 EntityUtils.consume(response.getEntity());
-//                System.out.println(EntityUtils.toString(response.getEntity(),"UTF-8"));
                 if(statusCode >= 200 && statusCode < 300){
                     returnImage.setCode("200");
                 }else{
@@ -183,19 +178,11 @@ public class WebDAVImageupload {
             String fileUrl = keys.getEndpoint()+"/"+images.getImgname();
             HttpGet httpGet = new HttpGet(fileUrl);
             HttpResponse response = httpClient.execute(httpGet);
-//            if (sardine.exists(keys.getEndpoint() + images.getImgname())) {
-//                InputStream inputStream = sardine.get(keys.getEndpoint() + images.getImgname());
                 HttpHeaders headers = new HttpHeaders();
                 headers.add("Content-Type", "image/jpeg");
-//                headers.add("Content-disposition", "attachment; filename=wallhaven-5g6yr3.jpg");
                 return ResponseEntity.ok()
                         .headers(headers)
-                        //.header("Content-disposition", "attachment; filename=Nextcloud.png")
-//                        .header("Content-Type", "image/jpg")
                         .body(new InputStreamResource(response.getEntity().getContent()));
-//            } else {
-//                return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
-//            }
         } catch (IOException e) {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
         }