Merge branch 'release/v0.18.2'

gee1k · Apr 3, 2020 · f49aae9 · f49aae9
2 parents ead3999 + 3dffe67
commit f49aae9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/uPic.xcodeproj/project.pbxproj b/uPic.xcodeproj/project.pbxproj
@@ -1227,7 +1227,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20200402;
+				CURRENT_PROJECT_VERSION = 20200403;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1257,7 +1257,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20200402;
+				CURRENT_PROJECT_VERSION = 20200403;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";

diff --git a/uPic/Models/Custom/CustomUploader.swift b/uPic/Models/Custom/CustomUploader.swift
@@ -140,17 +140,20 @@ class CustomUploader: BaseUploader {
                 }.responseJSON(completionHandler: { response -> Void in
                 switch response.result {
                 case .success(let value):
-                    debugPrint(value)
                     let json = JSON(value)
-                    var retUrl = CustomHostUtil.parseResultUrl(json, config.resultPath ?? "")
-                    if retUrl.isEmpty {
+                    var retUrlPath = CustomHostUtil.parseResultUrl(json, config.resultPath ?? "")
+                    if retUrlPath.isEmpty {
                         super.faild(errorMsg: "Did not get the file URL".localized)
                         return
                     }
                     if !domain.isEmpty {
-                        retUrl = "\(domain)/\(retUrl)"
+                        if retUrlPath.hasPrefix("/") {
+                            retUrlPath = "\(domain)\(retUrlPath)"
+                        } else {
+                            retUrlPath = "\(domain)/\(retUrlPath)"
+                        }
                     }
-                    super.completed(url: "\(retUrl)\(suffix)", retData, fileUrl, nil)
+                    super.completed(url: "\(retUrlPath)\(suffix)", retData, fileUrl, nil)
                 case .failure(let error):
                     super.faild(errorMsg: error.localizedDescription)
                 }

diff --git a/uPic/Models/HostConfig.swift b/uPic/Models/HostConfig.swift
@@ -158,19 +158,6 @@ class HostConfig: NSObject, Codable {
                 self.setValue(saveKeyPath, forKey: "saveKeyPath")
             }
         }
-
-        if self.containsKey(key: "domain") {
-            var domain = self.value(forKey: "domain") as! String
-            if domain.hasSuffix("/") {
-                domain.removeLast()
-                self.setValue(domain, forKey: "domain")
-            }
-
-            if (!domain.isEmpty && !domain.hasPrefix("http://") && !domain.hasPrefix("https://")) {
-                domain = "http://\(domain)"
-                self.setValue(domain, forKey: "domain")
-            }
-        }
     }
 
 }