Commit 19f2d179 authored by 汪洋's avatar 汪洋

升级podspec source

parent 0f9d1145
...@@ -13,7 +13,7 @@ Pod::Spec.new do |s| ...@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
s.homepage = "http://git.gengmei.cc/gengmeiios/GMNetService" s.homepage = "http://git.gengmei.cc/gengmeiios/GMNetService"
s.license = 'MIT' s.license = 'MIT'
s.author = { "wangyang" => "wangyang@wanmeizhensuo.com" } s.author = { "wangyang" => "wangyang@wanmeizhensuo.com" }
s.source = { :git => "http://git.gengmei.cc/gengmeiios/GMNetService.git", :tag => s.version.to_s } s.source = { :git => "git@git.gengmei.cc:gengmeiios/GMNetService.git", :tag => s.version.to_s }
s.ios.deployment_target = '8.0' s.ios.deployment_target = '8.0'
s.source_files = 'GMNetService/Classes/**/*' s.source_files = 'GMNetService/Classes/**/*'
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
* @since 0.2.3 * @since 0.2.3
*/ */
@property (nonatomic, strong) GMHTTPSessionManager *networking; @property (nonatomic, strong) GMHTTPSessionManager *networking;
/*** @brief 稍安全HTTPS下载器*/
@property (nonatomic, strong) WMNetSecurityWorking *netSecurityworking;
/*** @brief 普通HTTP HOST*/ /*** @brief 普通HTTP HOST*/
@property (nonatomic, strong) NSString *apiHost; @property (nonatomic, strong) NSString *apiHost;
/*** @brief 安全HTTPS HOST*/ /*** @brief 安全HTTPS HOST*/
......
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
return instance; return instance;
} }
#pragma mark - Method Decrepeted
- (void)sendRequestWithURLString:(NSString *)URLString - (void)sendRequestWithURLString:(NSString *)URLString
parameters:(id)parameters parameters:(id)parameters
method:(HttpMethod)method method:(HttpMethod)method
...@@ -34,6 +32,15 @@ ...@@ -34,6 +32,15 @@
} }
- (void)sendSecurityRequestWithURLString:(NSString *)URLString
parameters:(id)parameters
method:(HttpMethod)method
success:(HttpSuccessBlock)success
failed:(HttpFailedBlock)failed{
[self sendRequestWithURLString:URLString parameters:parameters method:method success:success failed:failed isSecurity:YES];
}
- (void)sendUploadTaskRequestWithData:(NSData *)data - (void)sendUploadTaskRequestWithData:(NSData *)data
fileName:(NSString *)fileName fileName:(NSString *)fileName
name:(NSString*)name name:(NSString*)name
...@@ -45,6 +52,18 @@ ...@@ -45,6 +52,18 @@
[self sendUploadTaskRequestWithData:data fileName:fileName name:name url:url mineType:mineType parameters:parameters success:success failed:failed isSecurity:NO]; [self sendUploadTaskRequestWithData:data fileName:fileName name:name url:url mineType:mineType parameters:parameters success:success failed:failed isSecurity:NO];
} }
- (void)sendSecurityUploadTaskRequestWithData:(NSData *)data
fileName:(NSString *)fileName
name:(NSString*)name
url:(NSString*)url
mineType:(NSString *)mineType
parameters:(NSDictionary *)parameters
success:(HttpSuccessBlock)success
failed:(HttpFailedBlock)failed{
[self sendUploadTaskRequestWithData:data fileName:fileName name:name url:url mineType:mineType parameters:parameters success:success failed:failed isSecurity:YES];
}
#pragma mark - pravite method #pragma mark - pravite method
- (void)sendRequestWithURLString:(NSString *)URLString - (void)sendRequestWithURLString:(NSString *)URLString
parameters:(id)parameters parameters:(id)parameters
...@@ -54,7 +73,12 @@ ...@@ -54,7 +73,12 @@
isSecurity:(BOOL)isSecurity{ isSecurity:(BOOL)isSecurity{
NSString * resultURLString = [URLString stringByAppendingString:_urlCommonParameters]; NSString * resultURLString = [URLString stringByAppendingString:_urlCommonParameters];
[self startRequestWithNetworking: _networking URLString:resultURLString parameters:parameters method:method success:success failed:failed]; //isSecurity为YES表示HTTTPS
if (isSecurity) {
[self startRequestWithNetworking: _netSecurityworking URLString:resultURLString parameters:parameters method:method success:success failed:failed];
}else{
[self startRequestWithNetworking: _networking URLString:resultURLString parameters:parameters method:method success:success failed:failed];
}
} }
- (void)startRequestWithNetworking:(AFHTTPSessionManager*)networking - (void)startRequestWithNetworking:(AFHTTPSessionManager*)networking
...@@ -193,4 +217,9 @@ ...@@ -193,4 +217,9 @@
_apiHost = apiHost; _apiHost = apiHost;
_networking = [GMHTTPSessionManager shareInstanceWithApiHost:_apiHost]; _networking = [GMHTTPSessionManager shareInstanceWithApiHost:_apiHost];
} }
- (void)setApiSecurityHost:(NSString *)apiSecurityHost{
_apiSecurityHost = apiSecurityHost;
_netSecurityworking = [WMNetSecurityWorking sharedInstanceWithApiHost:_apiSecurityHost];
}
@end @end
...@@ -3,52 +3,52 @@ ...@@ -3,52 +3,52 @@
<testsuite name="fastlane.lanes"> <testsuite name="fastlane.lanes">
<testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.000405"> <testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.000383">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.000176"> <testcase classname="fastlane.lanes" name="1: default_platform" time="0.000197">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="2: ensure_git_branch" time="0.004507"> <testcase classname="fastlane.lanes" name="2: ensure_git_branch" time="0.005059">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="3: pod_install" time="1.744286"> <testcase classname="fastlane.lanes" name="3: pod_install" time="2.020256">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="4: pod_lib_lint" time="9.069446"> <testcase classname="fastlane.lanes" name="4: pod_lib_lint" time="6.332673">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="5: version_bump_podspec" time="0.001044"> <testcase classname="fastlane.lanes" name="5: version_bump_podspec" time="0.001103">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="6: git_commit_all" time="0.026161"> <testcase classname="fastlane.lanes" name="6: git_commit_all" time="0.02825">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="7: add_git_tag" time="0.007667"> <testcase classname="fastlane.lanes" name="7: add_git_tag" time="0.008695">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="8: push_to_git_remote" time="0.850463"> <testcase classname="fastlane.lanes" name="8: push_to_git_remote" time="1.821525">
</testcase> </testcase>
<testcase classname="fastlane.lanes" name="9: pod_push" time="10.072721"> <testcase classname="fastlane.lanes" name="9: pod_push" time="39.318145">
</testcase> </testcase>
......
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