Merge pull request #403 from YangSen-qn/develop

support doh & server config

Author: xwen-winnie

CHANGELOG.md

@@ -1,4 +1,10 @@
 #Changelog
+## 8.4.0(2021-10-15)
+## 优化
+- Dns 预解析支持 Doh
+- 优化 Dns 劫持处理
+- 优化 Dns 预取结果分组
+
 ## 8.3.2(2021-09-3)
 ## 优化
 - 处理 PHAssert 偶现上传失败问题

Podfile

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

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '8.3.2'
+  s.version      = '8.4.0'
   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/**/*.{h,m}"
   s.requires_arc = true
   s.libraries = 'z'
-  s.dependency 'HappyDNS', '~> 0.3.17'
+  s.dependency 'HappyDNS', '~> 1.0.0'
   s.license = { :type => "MIT", :text => <<-LICENSE
 The MIT License (MIT)
 

QiniuDemo/Podfile

@@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 target "QiniuDemo" do
   platform :ios, "10.0"
 
-#  pod 'Qiniu', '~> 8.1.1'
+#  pod 'Qiniu', '~> 8.3.2'
   pod 'Qiniu',:path => '../'
 end
 

QiniuDemo/QiniuDemo.xcodeproj/project.pbxproj

@@ -12,8 +12,7 @@
 		31304CA325628E97001034D2 /* image.png in Resources */ = {isa = PBXBuildFile; fileRef = 31304CA025628E97001034D2 /* image.png */; };
 		31304CA425628E97001034D2 /* UploadResource_49M.zip in Resources */ = {isa = PBXBuildFile; fileRef = 31304CA125628E97001034D2 /* UploadResource_49M.zip */; };
 		31304CA525628E97001034D2 /* image.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 31304CA225628E97001034D2 /* image.jpg */; };
-		3152B913268C4EC3004705AA /* UploadResource_1.44G.zip in Resources */ = {isa = PBXBuildFile; fileRef = 3152B912268C4EC3004705AA /* UploadResource_1.44G.zip */; };
-		318191AB2531516F00D18536 /* UploadResource.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 318191AA2531516F00D18536 /* UploadResource.dmg */; };
+		318D377527192578004AA91F /* UploadResource_9M.zip in Resources */ = {isa = PBXBuildFile; fileRef = 318D377427192577004AA91F /* UploadResource_9M.zip */; };
 		31B188E426C365F0006046CC /* UploadResource_6M.zip in Resources */ = {isa = PBXBuildFile; fileRef = 31B188E326C365F0006046CC /* UploadResource_6M.zip */; };
 		93D230241C86D7F700434F6D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D230231C86D7F700434F6D /* main.m */; };
 		93D230271C86D7F700434F6D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D230261C86D7F700434F6D /* AppDelegate.m */; };
@@ -48,10 +47,9 @@
 		31304CA025628E97001034D2 /* image.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = image.png; sourceTree = "<group>"; };
 		31304CA125628E97001034D2 /* UploadResource_49M.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = UploadResource_49M.zip; sourceTree = "<group>"; };
 		31304CA225628E97001034D2 /* image.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = image.jpg; sourceTree = "<group>"; };
-		3152B912268C4EC3004705AA /* UploadResource_1.44G.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = UploadResource_1.44G.zip; sourceTree = "<group>"; };
-		318191AA2531516F00D18536 /* UploadResource.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = UploadResource.dmg; sourceTree = "<group>"; };
 		318191AF25315F3500D18536 /* Configure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Configure.h; sourceTree = "<group>"; };
 		3189882026469145003CCA68 /* QiniuDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = QiniuDemo.entitlements; sourceTree = "<group>"; };
+		318D377427192577004AA91F /* UploadResource_9M.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = UploadResource_9M.zip; sourceTree = "<group>"; };
 		31B188E326C365F0006046CC /* UploadResource_6M.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = UploadResource_6M.zip; sourceTree = "<group>"; };
 		6B9BC5A8D93F988C1240E05F /* libPods-QiniuDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-QiniuDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		93D2301F1C86D7F700434F6D /* QiniuDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QiniuDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -105,13 +103,12 @@
 		318191A92531516F00D18536 /* DemoTestResource */ = {
 			isa = PBXGroup;
 			children = (
+				318D377427192577004AA91F /* UploadResource_9M.zip */,
 				31B188E326C365F0006046CC /* UploadResource_6M.zip */,
-				3152B912268C4EC3004705AA /* UploadResource_1.44G.zip */,
 				31304CA225628E97001034D2 /* image.jpg */,
 				31304CA025628E97001034D2 /* image.png */,
 				31304CA125628E97001034D2 /* UploadResource_49M.zip */,
 				318191AF25315F3500D18536 /* Configure.h */,
-				318191AA2531516F00D18536 /* UploadResource.dmg */,
 			);
 			path = DemoTestResource;
 			sourceTree = "<group>";
@@ -308,10 +305,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				318D377527192578004AA91F /* UploadResource_9M.zip in Resources */,
 				93D230321C86D7F700434F6D /* LaunchScreen.storyboard in Resources */,
-				318191AB2531516F00D18536 /* UploadResource.dmg in Resources */,
 				93D2302F1C86D7F700434F6D /* Assets.xcassets in Resources */,
-				3152B913268C4EC3004705AA /* UploadResource_1.44G.zip in Resources */,
 				93D2302D1C86D7F700434F6D /* Main.storyboard in Resources */,
 				31304CA525628E97001034D2 /* image.jpg in Resources */,
 				31B188E426C365F0006046CC /* UploadResource_6M.zip in Resources */,

QiniuDemo/QiniuDemo/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ICJ-el-kyi">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ICJ-el-kyi">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment version="2048" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -35,8 +35,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f8h-Tl-cef">
-                                <rect key="frame" x="70" y="582" width="274" height="50"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f8h-Tl-cef">
+                                <rect key="frame" x="41.5" y="582" width="331" height="50"/>
                                 <color key="backgroundColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="kgT-aZ-IJU"/>
@@ -50,7 +50,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Psn-X6-kmD">
-                                <rect key="frame" x="70" y="662" width="274" height="50"/>
+                                <rect key="frame" x="41.5" y="662" width="331" height="50"/>
                                 <color key="backgroundColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="pu0-Bk-3Gw"/>
@@ -64,29 +64,29 @@
                                 </connections>
                             </button>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="PUC-cw-bND">
-                                <rect key="frame" x="20" y="200" width="374" height="249.5"/>
+                                <rect key="frame" x="20" y="202" width="374" height="249.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="PUC-cw-bND" secondAttribute="height" multiplier="3:2" id="C8p-6F-bXA"/>
                                 </constraints>
                             </imageView>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="F9t-wS-hHW">
-                                <rect key="frame" x="20" y="168" width="374" height="2"/>
+                                <rect key="frame" x="20" y="168" width="374" height="4"/>
                             </progressView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="f8h-Tl-cef" firstAttribute="leading" secondItem="UJS-dn-gjX" secondAttribute="leadingMargin" constant="50" id="93T-X6-QAQ"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="Psn-X6-kmD" secondAttribute="trailing" constant="50" id="MQh-ht-UJM"/>
+                            <constraint firstItem="Psn-X6-kmD" firstAttribute="centerX" secondItem="UJS-dn-gjX" secondAttribute="centerX" id="OgR-VO-cGg"/>
+                            <constraint firstItem="Psn-X6-kmD" firstAttribute="width" secondItem="f8h-Tl-cef" secondAttribute="width" id="PPD-zp-rom"/>
                             <constraint firstItem="F9t-wS-hHW" firstAttribute="trailing" secondItem="PUC-cw-bND" secondAttribute="trailing" id="Pma-gi-Cbz"/>
                             <constraint firstItem="PUC-cw-bND" firstAttribute="leading" secondItem="UJS-dn-gjX" secondAttribute="leadingMargin" id="VV2-Av-yVE"/>
                             <constraint firstItem="EaF-tv-BfV" firstAttribute="top" secondItem="Psn-X6-kmD" secondAttribute="bottom" constant="150" id="WZ7-eI-2en"/>
+                            <constraint firstItem="f8h-Tl-cef" firstAttribute="width" secondItem="UJS-dn-gjX" secondAttribute="width" multiplier="0.8" id="Yv6-dt-1KD"/>
                             <constraint firstItem="PUC-cw-bND" firstAttribute="top" secondItem="F9t-wS-hHW" secondAttribute="bottom" constant="30" id="adz-zG-8Ce"/>
                             <constraint firstItem="F9t-wS-hHW" firstAttribute="top" secondItem="TZn-al-ylh" secondAttribute="bottom" constant="80" id="f1f-t0-LdB"/>
                             <constraint firstItem="F9t-wS-hHW" firstAttribute="leading" secondItem="PUC-cw-bND" secondAttribute="leading" id="jiN-B0-534"/>
                             <constraint firstAttribute="trailingMargin" secondItem="PUC-cw-bND" secondAttribute="trailing" id="k8E-N3-8Zw"/>
-                            <constraint firstItem="Psn-X6-kmD" firstAttribute="leading" secondItem="UJS-dn-gjX" secondAttribute="leadingMargin" constant="50" id="ot8-YA-bd8"/>
+                            <constraint firstItem="f8h-Tl-cef" firstAttribute="centerX" secondItem="UJS-dn-gjX" secondAttribute="centerX" id="pzZ-Ph-Td6"/>
                             <constraint firstItem="Psn-X6-kmD" firstAttribute="top" secondItem="f8h-Tl-cef" secondAttribute="bottom" constant="30" id="sEq-Qn-Fuf"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="f8h-Tl-cef" secondAttribute="trailing" constant="50" id="uUk-RB-biH"/>
                         </constraints>
                     </view>
                     <tabBarItem key="tabBarItem" title="图片上传" id="NUn-lf-ojx"/>