Skip to content

G
GMNetService
Commit dffcccc7 authored by 汪洋's avatar 汪洋
Browse files
Options

Merge branch 'ajp/dev-GMNetService' into 'master' 

Ajp/dev gm net service

See merge request !4
parents df3cb1f0 40cac132
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 99 deletions
GMNetService/Classes/GMHTTPSessionManager.m
View file @ dffcccc7
...@@ -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;
......
GMNetService/Classes/WMNetService.h
View file @ dffcccc7
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
@property (nonatomic, strong) WMNetSecurityWorking *netSecurityworking; @property (nonatomic, strong) WMNetSecurityWorking *netSecurityworking;
/*** @brief 普通HTTP HOST*/ /*** @brief 普通HTTP HOST*/
@property (nonatomic, strong) NSString *apiHost; @property (nonatomic, strong) NSString *apiHost;
/*** @brief 安全HTTPS HOST*/
@property (nonatomic, strong) NSString *apiSecurityHost;
@property (nonatomic, strong) NSString *webHost; @property (nonatomic, strong) NSString *webHost;
@property (nonatomic, strong) NSString *loginExpiredName; @property (nonatomic, strong) NSString *loginExpiredName;
...@@ -61,15 +59,6 @@ ...@@ -61,15 +59,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 +82,5 @@ ...@@ -93,17 +82,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
GMNetService/Classes/WMNetService.m
View file @ dffcccc7
...@@ -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,36 +56,39 @@ ...@@ -91,36 +56,39 @@
if (self.beforeAction) { if (self.beforeAction) {
_beforeAction(); _beforeAction();
} }
NSString *fullUrlString = [NSString stringWithFormat:@"%@%@%@", self.apiHost, URLString, self.urlCommonParameters];
if (method == HttpMethodGet) { if (method == HttpMethodGet) {
[networking GET:URLString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) { [networking GET:fullUrlString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[self successWithTask:task responseObject:responseObject success:success]; [self successWithTask:task responseObject:responseObject success:success];
} failure:^(NSURLSessionDataTask *task, NSError *error) { } failure:^(NSURLSessionDataTask *task, NSError *error) {
[self failureWithTask:task error:error failed:failed]; [self failureWithTask:task error:error failed:failed];
}]; }];
}else if (method == HttpMethodPost){ }else if (method == HttpMethodPost){
[networking POST:URLString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) { [networking POST:fullUrlString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[self successWithTask:task responseObject:responseObject success:success]; [self successWithTask:task responseObject:responseObject success:success];
} failure:^(NSURLSessionDataTask *task, NSError *error) { } failure:^(NSURLSessionDataTask *task, NSError *error) {
[self failureWithTask:task error:error failed:failed]; [self failureWithTask:task error:error failed:failed];
}]; }];
}else if (method == HttpMethodDelete){ }else if (method == HttpMethodDelete){
[networking DELETE:URLString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) { [networking DELETE:fullUrlString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[self successWithTask:task responseObject:responseObject success:success]; [self successWithTask:task responseObject:responseObject success:success];
} failure:^(NSURLSessionDataTask *task, NSError *error) { } failure:^(NSURLSessionDataTask *task, NSError *error) {
[self failureWithTask:task error:error failed:failed]; [self failureWithTask:task error:error failed:failed];
}]; }];
}else if (method == HttpMethodPatch){ }else if (method == HttpMethodPatch){
[networking PATCH:URLString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) { [networking PATCH:fullUrlString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[self successWithTask:task responseObject:responseObject success:success]; [self successWithTask:task responseObject:responseObject success:success];
} failure:^(NSURLSessionDataTask *task, NSError *error) { } failure:^(NSURLSessionDataTask *task, NSError *error) {
[self failureWithTask:task error:error failed:failed]; [self failureWithTask:task error:error failed:failed];
}]; }];
}else if (method == HttpMethodPut){ }else if (method == HttpMethodPut){
[networking PUT:URLString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) { [networking PUT:fullUrlString parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[self successWithTask:task responseObject:responseObject success:success]; [self successWithTask:task responseObject:responseObject success:success];
} failure:^(NSURLSessionDataTask *task, NSError *error) { } failure:^(NSURLSessionDataTask *task, NSError *error) {
[self failureWithTask:task error:error failed:failed]; [self failureWithTask:task error:error failed:failed];
...@@ -226,8 +194,4 @@ ...@@ -226,8 +194,4 @@
_networking = [GMHTTPSessionManager shareInstanceWithApiHost:_apiHost]; _networking = [GMHTTPSessionManager shareInstanceWithApiHost:_apiHost];
} }
- (void)setApiSecurityHost:(NSString *)apiSecurityHost{
_apiSecurityHost = apiSecurityHost;
_netSecurityworking = [GMHTTPSessionManager shareInstanceWithApiHost:_apiSecurityHost];
}
@end @end
GMNetService/Classes/WMSecureNetService.h deleted 100644 → 0
View file @ df3cb1f0
//
// WMSecureNetService.h
// Pods
//
// Created by wangyang on 16/5/26.
//
//
#import "WMNetService.h"
@interface WMSecureNetService : WMNetService
+ (instancetype)shareInstance;
@end
GMNetService/Classes/WMSecureNetService.m deleted 100644 → 0
View file @ df3cb1f0
//
// 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