fix:修改参数校验

garenwang · garenwang · commit 6e532f54b167 · 2023-08-10T14:47:29.000+08:00
diff --git a/Podfile.lock b/Podfile.lock
@@ -6,9 +6,9 @@ PODS:
     - QCloudCOSXML/Default (= 6.2.6)
   - QCloudCOSXML/Default (6.2.6):
     - QCloudCore (= 6.2.6)
-  - QCloudQuic (6.2.6):
-    - QCloudQuic/Default (= 6.2.6)
-  - QCloudQuic/Default (6.2.6)
+  - QCloudQuic (6.2.7):
+    - QCloudQuic/Default (= 6.2.7)
+  - QCloudQuic/Default (6.2.7)
 
 DEPENDENCIES:
   - QCloudCore (from `.`)
@@ -26,7 +26,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   QCloudCore: b99da67cb77dfbe5ce585bc1fea0911eaf2ddb82
   QCloudCOSXML: 1704d7acb332103ac2559ddd5cc50c80c1738f6a
-  QCloudQuic: b76e2c2641a6e94464762fb3b5a32c882bd09eb7
+  QCloudQuic: 55367f6cd5f13ead49c38339f43079358da9910a
 
 PODFILE CHECKSUM: 87053f234f38ae6a394978f26bcb119015f9918e
 
diff --git a/QCloudCOSXML/Classes/CI/request/QCloudBatchimageRecognitionRequest.m b/QCloudCOSXML/Classes/CI/request/QCloudBatchimageRecognitionRequest.m
@@ -180,7 +180,9 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
         [freeze setObject:@(self.politicsScore).stringValue forKey:@"PoliticsScore"];
     }
     
-    [conf addEntriesFromDictionary:@{@"Freeze":freeze}];
+    if(freeze.allKeys.count > 0){
+        [conf addEntriesFromDictionary:@{@"Freeze":freeze}];
+    }
     
     NSDictionary * params =@{
         @"Input":inputs,
diff --git a/QCloudCOSXML/Classes/CI/request/QCloudPostAudioRecognitionRequest.m b/QCloudCOSXML/Classes/CI/request/QCloudPostAudioRecognitionRequest.m
@@ -121,10 +121,16 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
     }
     
     NSMutableDictionary * conf = @{
-        @"Callback":self.callback?:@"",
-        @"BizType":self.bizType?:@"",
     }.mutableCopy;
     
+    if(self.callback){
+        [conf setObject:self.callback forKey:@"Callback"];
+    }
+    
+    if(self.bizType){
+        [conf setObject:self.bizType forKey:@"BizType"];
+    }
+    
     [conf addEntriesFromDictionary:@{@"CallbackVersion":@"Detail"}];
     
     if(self.callbackType){
@@ -148,7 +154,10 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
         [freeze setObject:@(self.politicsScore).stringValue forKey:@"PoliticsScore"];
     }
     
-    [conf addEntriesFromDictionary:@{@"Freeze":freeze}];
+    if(freeze.allKeys.count > 0){
+        [conf addEntriesFromDictionary:@{@"Freeze":freeze}];
+    }
+    
     
     NSDictionary * params =@{
         @"Input":input.copy,
diff --git a/QCloudCOSXML/Classes/CI/request/QCloudPostDocRecognitionRequest.m b/QCloudCOSXML/Classes/CI/request/QCloudPostDocRecognitionRequest.m
@@ -123,12 +123,18 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
     }
     
     NSMutableDictionary * conf = @{
-        @"Callback":self.callback?:@"",
-        @"BizType":self.bizType?:@"",
         @"CallbackVersion":@"Detail",
         @"CallbackType":@(self.callbackType).stringValue
     }.mutableCopy;
     
+    if(self.callback){
+        [conf setObject:self.callback forKey:@"Callback"];
+    }
+    
+    if(self.bizType){
+        [conf setObject:self.bizType forKey:@"BizType"];
+    }
+    
     NSMutableDictionary * freeze = [NSMutableDictionary new];
     if(self.pornScore > -1){
         [freeze setObject:@(self.pornScore).stringValue forKey:@"PornScore"];
@@ -146,7 +152,9 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
         [freeze setObject:@(self.politicsScore).stringValue forKey:@"PoliticsScore"];
     }
     
-    [conf addEntriesFromDictionary:@{@"Freeze":freeze}];
+    if(freeze.allKeys.count > 0){
+        [conf addEntriesFromDictionary:@{@"Freeze":freeze}];
+    }
     
     NSDictionary * params =@{
         @"Input":input,
diff --git a/QCloudCOSXML/Classes/CI/request/QCloudPostTextRecognitionRequest.m b/QCloudCOSXML/Classes/CI/request/QCloudPostTextRecognitionRequest.m
@@ -153,12 +153,24 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
     }
     
     NSMutableDictionary * conf = @{
-        @"Callback":self.callback?:@"",
-        @"BizType":self.bizType?:@"",
     }.mutableCopy;
 
+    
+    if(freeze.allKeys.count > 0){
+        [conf setObject:freeze forKey:@"Freeze"];
+    }
+    
+    if(self.callback){
+        [conf setObject:self.callback forKey:@"Callback"];
+    }
+    
+    if(self.bizType){
+        [conf setObject:self.bizType forKey:@"BizType"];
+    }
+    
+    
     [conf setObject:@"Detail" forKey:@"CallbackVersion"];
-    [conf setObject:freeze forKey:@"Freeze"];
+    
     [conf setObject:@(self.callbackType).stringValue forKey:@"CallbackType"];
     
     NSDictionary * params =@{
diff --git a/QCloudCOSXML/Classes/CI/request/QCloudPostVideoRecognitionRequest.m b/QCloudCOSXML/Classes/CI/request/QCloudPostVideoRecognitionRequest.m
@@ -172,21 +172,33 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
         [freeze setObject:@(self.politicsScore).stringValue forKey:@"PoliticsScore"];
     }
     
+    NSMutableDictionary * config = @{
+        @"Snapshot":@{
+                @"Mode":QCloudVideoRecognitionModeTransferToString(self.mode),
+                @"TimeInterval":@(self.timeInterval),
+                @"Count":@(self.count)
+        },
+        @"CallbackVersion":@"Detail",
+        @"DetectContent":self.detectContent ?@"1":@"0",
+        @"CallbackType":@(self.callbackType).stringValue,
+        
+    }.mutableCopy;
+    
+    if(freeze.allKeys.count > 0){
+        [config setObject:freeze forKey:@"Freeze"];
+    }
+    
+    if(self.callback){
+        [config setObject:self.callback forKey:@"Callback"];
+    }
+    
+    if(self.bizType){
+        [config setObject:self.bizType forKey:@"BizType"];
+    }
+    
     NSDictionary * params =@{
         @"Input":input,
-        @"Conf":@{
-                @"Snapshot":@{
-                        @"Mode":QCloudVideoRecognitionModeTransferToString(self.mode),
-                        @"TimeInterval":@(self.timeInterval),
-                        @"Count":@(self.count)
-                },
-                @"Callback":self.callback?:@"",
-                @"BizType":self.bizType?:@"",
-                @"CallbackVersion":@"Detail",
-                @"DetectContent":self.detectContent ?@"1":@"0",
-                @"CallbackType":@(self.callbackType).stringValue,
-                @"Freeze":freeze
-        }
+        @"Conf":config
     };
     
     [self.requestData setParameter:params withKey:@"Request"];
diff --git a/QCloudCOSXML/Classes/Transfer/request/QCloudGetObjectRequest.m b/QCloudCOSXML/Classes/Transfer/request/QCloudGetObjectRequest.m
@@ -126,6 +126,8 @@ - (BOOL)buildRequestData:(NSError *__autoreleasing *)error {
         [self.requestData setValue:@(self.trafficLimit).stringValue forHTTPHeaderField:@"x-cos-traffic-limit"];
     }
   
+    [self.customHeaders setObject:@"no-cache" forKey:@"Cache-Control"];
+    
     NSURL *__serverURL = [self.runOnService.configuration.endpoint serverURLWithBucket:self.bucket
                                                                                  appID:self.runOnService.configuration.appID
                                                                             regionName:self.regionName];
diff --git a/QCloudCOSXMLDemo.xcworkspace/xcuserdata/garenwang.xcuserdatad/UserInterfaceState.xcuserstate b/QCloudCOSXMLDemo.xcworkspace/xcuserdata/garenwang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/QCloudCOSXMLDemo.xcworkspace/xcuserdata/garenwang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/QCloudCOSXMLDemo.xcworkspace/xcuserdata/garenwang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -7,33 +7,17 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "BCF3D2A1-32A1-40EA-9471-0E01F7205DB9"
+            uuid = "997680CB-C74A-4020-90BE-04D0BF2391BC"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "QCloudCore/Classes/Base/QCLOUDRestNet/DNSCache/QCloudHttpDNS.m"
+            filePath = "QCloudCore/Classes/Base/QCLOUDObjectModel/QCloudClassInfo.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "226"
-            endingLineNumber = "226"
-            landmarkName = "getIPListFromToHost(mHost, mPort)"
-            landmarkType = "9">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "2AA966A4-2E82-4BCB-A5E0-2D45F490F8DD"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "QCloudCore/Classes/Base/QCLOUDRestNet/DNSCache/QCloudHttpDNS.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "253"
-            endingLineNumber = "253"
-            landmarkName = "getIPListFromToHost(mHost, mPort)"
-            landmarkType = "9">
+            startingLineNumber = "263"
+            endingLineNumber = "263"
+            landmarkName = "-initWithProperty:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,9 @@ - (BOOL)buildRequestData:(NSError __autoreleasing )error {`
`180`	`180`	`[freeze setObject:@(self.politicsScore).stringValue forKey:@"PoliticsScore"];`
`181`	`181`	`}`
`182`	`182`
`183`		`- [conf addEntriesFromDictionary:@{@"Freeze":freeze}];`
	`183`	`+ if(freeze.allKeys.count > 0){`
	`184`	`+ [conf addEntriesFromDictionary:@{@"Freeze":freeze}];`
	`185`	`+ }`
`184`	`186`
`185`	`187`	`NSDictionary * params =@{`
`186`	`188`	`@"Input":inputs,`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,8 @@ - (BOOL)buildRequestData:(NSError __autoreleasing )error {`
`126`	`126`	`[self.requestData setValue:@(self.trafficLimit).stringValue forHTTPHeaderField:@"x-cos-traffic-limit"];`
`127`	`127`	`}`
`128`	`128`
	`129`	`+ [self.customHeaders setObject:@"no-cache" forKey:@"Cache-Control"];`
	`130`	`+`
`129`	`131`	`NSURL *__serverURL = [self.runOnService.configuration.endpoint serverURLWithBucket:self.bucket`
`130`	`132`	`appID:self.runOnService.configuration.appID`
`131`	`133`	`regionName:self.regionName];`