From 12a0763d3a6f549d913318f269c5baf0ce009605 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 03 七月 2023 11:17:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java             |   25 +++++++++++++++++++++++++
 phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java             |   10 ++++++++++
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java |   10 +++++++++-
 3 files changed, 44 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
index 8c82c2f..4403155 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
@@ -12,4 +12,14 @@
     /**妗跺悕绉�-鍙笉浼�*/
     private String bucketName;
 
+    private String fileName;
+
+    private String method;
+
+    public FileSignVo() {
+    }
+
+    public FileSignVo(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
index b927907..5a4670b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
@@ -53,6 +53,14 @@
      * @return 浣跨敤FileSignReturnVo杞寲
      */
     @PostMapping(value = "/cos/signUrl")
-    Response downloadFile(@RequestBody FileSignVo fileSignVo);
+    Result signUrl(@RequestBody FileSignVo fileSignVo);
+
+    /**
+     *鐢熸垚涓婁紶绛惧悕
+     * @param fileSignVo 瀵硅薄
+     * @return 浣跨敤FileSignReturnVo杞寲
+     */
+    @PostMapping(value = "/cos/policy")
+    Result policy(@RequestBody FileSignVo fileSignVo);
 
 }
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java b/phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java
new file mode 100644
index 0000000..1e05b0b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/cos/OssRecoverVO.java
@@ -0,0 +1,25 @@
+package com.hz.his.vo.cos;
+
+import lombok.Data;
+
+/**
+ * @ClassName OssRecoverVO
+ * @Description cos鐢熸垚绛惧悕杩斿洖vo
+ * @Author wrh
+ * @Date 2023/6/30 17:30
+ * @Version 1.0
+ */
+@Data
+public class OssRecoverVO {
+
+    private String accessid;
+    //绛惧悕
+    private String signature;
+    private String dir;
+    private String host;
+    //杩囨湡鏃堕棿
+    private String expire;
+
+
+
+}

--
Gitblit v1.8.0