浏览代码

update OssConsoleClient

reghao 1 年之前
父节点
当前提交
ed837567cf

+ 13 - 0
oss-sdk/src/main/java/cn/reghao/oss/sdk/OssConsoleClient.java

@@ -387,6 +387,19 @@ public class OssConsoleClient {
     // ****************************************************************************************************************
     // 对象访问接口
     // ****************************************************************************************************************
+    public UploadFileRet putObject(File file, int channelCode) throws Exception {
+        ServerInfo serverInfo = getUploadStore(channelCode);
+        if (serverInfo == null) {
+            throw new Exception("获取 server_info 失败");
+        }
+        String ossUrl = serverInfo.getOssUrl();
+        String token = serverInfo.getToken();
+
+        OssStoreClient ossStoreClient = new OssStoreClient(ossUrl);
+        UploadFileRet uploadFileRet = ossStoreClient.putObject(file, channelCode, token);
+        return uploadFileRet;
+    }
+
     public UploadFileRet postObject(File file, int channelCode) throws Exception {
         ServerInfo serverInfo = getUploadStore(channelCode);
         if (serverInfo == null) {

+ 2 - 2
oss-sdk/src/main/java/cn/reghao/oss/sdk/OssStoreClient.java

@@ -37,14 +37,14 @@ public class OssStoreClient {
         this.endpoint = endpoint;
     }
 
-    public UploadFileRet putObject(File file, int channelCode, int userId) throws Exception {
+    public UploadFileRet putObject(File file, int channelCode, String token) throws Exception {
         String sha256sum = DigestUtil.sha256sum(file.getAbsolutePath());
         String api = String.format("%s/", endpoint);
         HttpRequest.Builder builder = HttpRequest.newBuilder(new URI(api))
                 .version(HttpClient.Version.HTTP_1_1)
                 .header("x-content-sha256sum", sha256sum)
                 .header("x-channel-id", channelCode+"")
-                .header("x-user-id", userId+"");
+                .header("authorization", "Bearer " + token);
 
         HttpRequest httpRequest = builder.PUT(HttpRequest.BodyPublishers.ofFile(Path.of(file.getAbsolutePath()))).build();
         HttpResponse<String> httpResponse = httpClient.send(httpRequest, HttpResponse.BodyHandlers.ofString());

+ 3 - 2
oss-sdk/src/test/java/OssConsoleClientTest.java

@@ -21,8 +21,9 @@ public class OssConsoleClientTest {
         String filePath = "";
         File file = new File(filePath);
         int channelCode = 114;
-        UploadFileRet uploadFileRet = ossConsoleClient.postObject(file, channelCode);
-        UploadFileRet uploadFileRet1 = ossConsoleClient.postObjectByMultiparts(file, channelCode);
+        UploadFileRet uploadFileRet = ossConsoleClient.putObject(file, channelCode);
+        /*UploadFileRet uploadFileRet1 = ossConsoleClient.postObject(file, channelCode);
+        UploadFileRet uploadFileRet2 = ossConsoleClient.postObjectByMultiparts(file, channelCode);*/
 
         String objectName = "video/playback/28d0fd95e224499c9f2cf1d98b4551a5.flv";
         String localPath  = ossConsoleClient.getObject(objectName);