OSS 全部桶的权限

galaxy/galaxy/Classes/Base/C/YHBaseViewModel.swift

@@ -55,36 +55,36 @@ class YHBaseViewModel {
     
     //换取一张
     func getPublicImageUrl(_ url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.getPublicApi
-        let param: [String: Any] = ["fileUrl": url]
-        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
-            //1. json字符串 转 对象
-            guard let _ = self else { return }
-            if json.code == 200 {
-                callBackBlock(json.data as? String, nil)
-            } else {
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(nil, error)
-            }
-        } failBlock: { err in
-            callBackBlock(nil,err)
-        }
-//        if YHNetworkStatusManager.shared.isNetWorkOK == false {
-//            DispatchQueue.main.async {
-//                YHHUD.flash(message: "网络异常")
-//                let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络异常")
-//                callBackBlock(nil, errorModel)
-//                return
-//            }
-//            return
-//        }
-//        YHOSSManager.share.getPublic(url: url, callBackBlock: { [weak self] success, error in
+//        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.getPublicApi
+//        let param: [String: Any] = ["fileUrl": url]
+//        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
+//            //1. json字符串 转 对象
 //            guard let _ = self else { return }
-//            DispatchQueue.main.async {
-//                // 在这里执行需要在主线程上完成的任务
-//                callBackBlock(success, error)
+//            if json.code == 200 {
+//                callBackBlock(json.data as? String, nil)
+//            } else {
+//                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+//                callBackBlock(nil, error)
 //            }
-//        })
+//        } failBlock: { err in
+//            callBackBlock(nil,err)
+//        }
+        if YHNetworkStatusManager.shared.isNetWorkOK == false {
+            DispatchQueue.main.async {
+                YHHUD.flash(message: "网络异常")
+                let errorModel = YHErrorModel(errorCode: 0, errorMsg: "网络异常")
+                callBackBlock(nil, errorModel)
+                return
+            }
+            return
+        }
+        YHOSSManager.share.getPublic(url: url, callBackBlock: { [weak self] success, error in
+            guard let _ = self else { return }
+            DispatchQueue.main.async {
+                // 在这里执行需要在主线程上完成的任务
+                callBackBlock(success, error)
+            }
+        })
     }
     
     //换取多张图片

galaxy/galaxy/Classes/Tools/Upload/YHOSSManager.swift

@@ -47,7 +47,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
     }
     
     func getOSSID() {
-        let param: [String: Any] = ["path": "4001001"]
+        let param: [String: Any] = ["path": "*"]
         let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.getID
         let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             //1. json字符串 转 对象
@@ -76,7 +76,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
         dateFormatter.dateFormat = "yyyyMMdd"
         let currentDateMMdd = dateFormatter.string(from: Date())
         self.fileName.append(name)
-        request.objectKey = self.model.bucketPath + "/" + currentDateMMdd + "/" + "\(name)"
+        request.objectKey = "4001001" + "/" + currentDateMMdd + "/" + "\(name)"
         request.contentDisposition = "inline"
         request.uploadProgress = { (bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) -> Void in
             printLog("bytesSent:\(bytesSent),totalBytesSent:\(totalBytesSent),totalBytesExpectedToSend:\(totalBytesExpectedToSend)")
@@ -92,7 +92,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
                 let dateFormatter = DateFormatter()
                 dateFormatter.dateFormat = "yyyyMMdd"
                 let currentDateMMdd = dateFormatter.string(from: Date())
-                let string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + self.model.bucketPath + "/" + currentDateMMdd + "/" + "\(self.fileName.first ?? "")"
+                let string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + "4001001" + "/" + currentDateMMdd + "/" + "\(self.fileName.first ?? "")"
                 self.fileName.removeFirst()
                 print("------------\(string)")
                 callBackBlock(string, YHErrorModel())
@@ -113,7 +113,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "yyyyMMdd"
         let currentDateMMdd = dateFormatter.string(from: Date())
-        request.objectKey = self.model.bucketPath + "/" + currentDateMMdd + "/" + "\(name)"
+        request.objectKey = "4001001" + "/" + currentDateMMdd + "/" + "\(name)"
         request.contentDisposition = "inline"
         request.uploadProgress = { (bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) -> Void in
             printLog("bytesSent:\(bytesSent),totalBytesSent:\(totalBytesSent),totalBytesExpectedToSend:\(totalBytesExpectedToSend)")
@@ -131,7 +131,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
                 let dateFormatter = DateFormatter()
                 dateFormatter.dateFormat = "yyyyMMdd"
                 let currentDateMMdd = dateFormatter.string(from: Date())
-                let string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + self.model.bucketPath + "/" + currentDateMMdd +  "/" + "\(self.fileName.first ?? "")"
+                let string = "https://" + self.model.bucket + "." + "oss-cn-shenzhen.aliyuncs.com/" + "4001001" + "/" + currentDateMMdd +  "/" + "\(self.fileName.first ?? "")"
                 self.fileName.removeFirst()
                 callBackBlock(string, YHErrorModel())
             }
@@ -141,7 +141,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
     
     func getPublic(url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
         let bucketName = self.model.bucket
-        var pathComponents = url.pathComponents
+        let pathComponents = url.pathComponents
         var objectKey = ""
         for i in 0..<pathComponents.count {
             if i == 0 || i == 1 {