Commit dd27986c authored by pete谢兆麟's avatar pete谢兆麟

oss优化

parent a9d5a4ec
...@@ -71,6 +71,8 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -71,6 +71,8 @@ class YHOSSManager: NSObject, URLSessionDelegate {
callBackBlock(nil, YHErrorModel()) callBackBlock(nil, YHErrorModel())
return return
} }
DispatchQueue.global().async {
request.uploadingData = imageData request.uploadingData = imageData
request.bucketName = self.model.bucket request.bucketName = self.model.bucket
let timestamp = Date().timeIntervalSince1970 let timestamp = Date().timeIntervalSince1970
...@@ -104,6 +106,7 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -104,6 +106,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
return return
}).waitUntilFinished() }).waitUntilFinished()
} }
}
func putFile(file: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) { func putFile(file: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
let request = OSSPutObjectRequest() let request = OSSPutObjectRequest()
...@@ -150,6 +153,8 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -150,6 +153,8 @@ class YHOSSManager: NSObject, URLSessionDelegate {
} }
func getPublic(url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) { func getPublic(url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
DispatchQueue.global().async {
let bucketName = self.getBucket(url) let bucketName = self.getBucket(url)
let pathComponents = url.pathComponents let pathComponents = url.pathComponents
var objectKey = "" var objectKey = ""
...@@ -162,7 +167,7 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -162,7 +167,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
objectKey = objectKey + pathComponents[i] + "/" objectKey = objectKey + pathComponents[i] + "/"
} }
} }
let task = mClient.presignConstrainURL(withBucketName: bucketName, withObjectKey: objectKey, withExpirationInterval: 60 * 5) let task = self.mClient.presignConstrainURL(withBucketName: bucketName, withObjectKey: objectKey, withExpirationInterval: 60 * 5)
task.continue({ (t) -> Any? in task.continue({ (t) -> Any? in
let result = t let result = t
if (result.error != nil) { if (result.error != nil) {
...@@ -176,6 +181,7 @@ class YHOSSManager: NSObject, URLSessionDelegate { ...@@ -176,6 +181,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
return return
}).waitUntilFinished() }).waitUntilFinished()
} }
}
func getBucket(_ url: String) -> String { func getBucket(_ url: String) -> String {
if url.contains("test-bucket-v1-pub.oss-cn-shenzhen.aliyuncs.com") { if url.contains("test-bucket-v1-pub.oss-cn-shenzhen.aliyuncs.com") {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment