Commit 18ead5b6 authored by 艾娇平's avatar 艾娇平

1、删除文件WMSecureNetService(已不再使用)

2、WMNetService
删除方法(已废弃)
- (void)sendSecurityRequestWithURLString:(NSString *)URLString
- (void)sendSecurityUploadTaskRequestWithData:(NSData *)data
更改方法
- (void)startRequestWithNetworking:(AFHTTPSessionManager*)networking
内容URLString 将与apiHost后拼接后再发起请求

3、GMHTTPSessionManager 中初始化不再传递baseUrl
parent df3cb1f0
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
static GMHTTPSessionManager *instance = nil; static GMHTTPSessionManager *instance = nil;
dispatch_once(&onceToken, ^{ dispatch_once(&onceToken, ^{
NSURL *baseURL = [NSURL URLWithString:apiHost]; NSURL *baseURL = [NSURL URLWithString:apiHost];
instance = [[[self class] alloc] initWithBaseURL:baseURL]; instance = [[[self class] alloc] init];
instance.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript", @"text/html", nil]; instance.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript", @"text/html", nil];
}); });
return instance; return instance;
......
...@@ -61,15 +61,6 @@ ...@@ -61,15 +61,6 @@
method:(HttpMethod)method method:(HttpMethod)method
success:(HttpSuccessBlock)success success:(HttpSuccessBlock)success
failed:(HttpFailedBlock)failed; failed:(HttpFailedBlock)failed;
/**
* @brief HTTPS安全请求,将API_HOST中的http://换成https://
*/
- (void)sendSecurityRequestWithURLString:(NSString *)URLString
parameters:(id)parameters
method:(HttpMethod)method
success:(HttpSuccessBlock)success
failed:(HttpFailedBlock)failed;
/** /**
* @author licong, 15-11-19 12:11:55 * @author licong, 15-11-19 12:11:55
...@@ -93,17 +84,5 @@ ...@@ -93,17 +84,5 @@
success:(HttpSuccessBlock)success success:(HttpSuccessBlock)success
failed:(HttpFailedBlock)failed; failed:(HttpFailedBlock)failed;
/**
* @brief HTTPS安全上传请求,API_HOST是https://开头
*/
- (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;
@end @end
...@@ -27,19 +27,11 @@ ...@@ -27,19 +27,11 @@
parameters:(id)parameters parameters:(id)parameters
method:(HttpMethod)method method:(HttpMethod)method
success:(HttpSuccessBlock)success success:(HttpSuccessBlock)success
failed:(HttpFailedBlock)failed{ failed:(HttpFailedBlock)failed {
[self sendRequestWithURLString:URLString parameters:parameters method:method success:success failed:failed isSecurity:NO];
[self startRequestWithNetworking: _networking URLString:URLString parameters:parameters method:method success:success failed:failed];
} }
- (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
...@@ -48,39 +40,12 @@ ...@@ -48,39 +40,12 @@
mineType:(NSString *)mineType mineType:(NSString *)mineType
parameters:(NSDictionary *)parameters parameters:(NSDictionary *)parameters
success:(HttpSuccessBlock)success success:(HttpSuccessBlock)success
failed:(HttpFailedBlock)failed{ failed:(HttpFailedBlock)failed {
[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];
- (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
parameters:(id)parameters
method:(HttpMethod)method
success:(HttpSuccessBlock)success
failed:(HttpFailedBlock)failed
isSecurity:(BOOL)isSecurity{
NSString * resultURLString = [URLString stringByAppendingString:_urlCommonParameters];
//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
URLString:(NSString *)URLString URLString:(NSString *)URLString
parameters:(id)parameters parameters:(id)parameters
...@@ -91,6 +56,9 @@ ...@@ -91,6 +56,9 @@
if (self.beforeAction) { if (self.beforeAction) {
_beforeAction(); _beforeAction();
} }
URLString = [NSString stringWithFormat:@"%@%@",self.apiHost,URLString];
if (method == HttpMethodGet) { if (method == HttpMethodGet) {
[networking GET:URLString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) { [networking GET:URLString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[self successWithTask:task responseObject:responseObject success:success]; [self successWithTask:task responseObject:responseObject success:success];
......
//
// WMSecureNetService.h
// Pods
//
// Created by wangyang on 16/5/26.
//
//
#import "WMNetService.h"
@interface WMSecureNetService : WMNetService
+ (instancetype)shareInstance;
@end
//
// WMSecureNetService.m
// Pods
//
// Created by wangyang on 16/5/26.
//
//
#import "WMSecureNetService.h"
@implementation WMSecureNetService
@end
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