Merge pull request #412 from YangSen-qn/develop

change dependent: HappyDns  version

Author: Mei-Zhao

CHANGELOG.md

@@ -1,4 +1,7 @@
 #Changelog
+## 8.4.4 (2022-06-02)
+- HappyDns 依赖升至 [v1.0.2](https://github.com/qiniu/happy-dns-android/releases/tag/v1.0.2)
+
 ## 8.4.3 (2022-05-18)
 - 优化表单上传：当出现内存问题抛出错误
 - 优化分片 v1 上传：强化验证上传块数据验证

Podfile

@@ -1,7 +1,7 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
 def shared_dependencies
-  pod 'HappyDNS', '~> 1.0.0'
+  pod 'HappyDNS', '~> 1.0.2'
  # pod 'HappyDNS', :path => '../HappyDns_iOS'
 end
 

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '8.4.3'
+  s.version      = '8.4.4'
   s.summary      = 'Qiniu Resource Storage SDK for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/objc-sdk'
   s.social_media_url = 'http://weibo.com/qiniutek'
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.source_files = 'QiniuSDK/BigData/**/*.{h,m}','QiniuSDK/Collect/**/*.{h,m}','QiniuSDK/Common/**/*.{h,m}','QiniuSDK/Http/**/*.{h,m}','QiniuSDK/Recorder/**/*.{h,m}','QiniuSDK/Storage/**/*.{h,m}','QiniuSDK/Transaction/**/*.{h,m}','QiniuSDK/Utils/**/*.{h,m}','QiniuSDK/QiniuSDK.h'
   s.requires_arc = true
   s.libraries = 'z'
-  s.dependency 'HappyDNS', '~> 1.0.0'
+  s.dependency 'HappyDNS', '~> 1.0.2'
   s.license = { :type => "MIT", :text => <<-LICENSE
 The MIT License (MIT)
 

QiniuSDK/Http/Dns/QNDnsPrefetch.m

@@ -731,10 +731,10 @@ - (QNDnsCacheFile *)diskCache {
 }
 
 - (QNInternalDns *)customDns {
-    if (_systemDns == nil && kQNGlobalConfiguration.dns) {
-        _systemDns = [QNInternalDns dnsWithDns:kQNGlobalConfiguration.dns];
+    if (_customDns == nil && kQNGlobalConfiguration.dns) {
+        _customDns = [QNInternalDns dnsWithDns:kQNGlobalConfiguration.dns];
     }
-    return _systemDns;
+    return _customDns;
 }
 
 - (QNInternalDns *)systemDns {

README.md

@@ -14,7 +14,7 @@
 通过 CocoaPods
 
 ```ruby
-pod "Qiniu", "~> 8.4.3" 
+pod "Qiniu", "~> 8.4.4" 
 ```
 
 通过 Swift Package Manager (Xcode 11+)
@@ -26,7 +26,7 @@ File -> Swift Packages -> Add Package Dependency，输入库链接，选择相
 库对接:
 let package = Package(
     dependencies: [
-        .package(url: "https://github.com/qiniu/objc-sdk", from: "8.4.3")
+        .package(url: "https://github.com/qiniu/objc-sdk", from: "8.4.4")
     ],
     // ...
 )