Commit 7be26817 authored by licong's avatar licong

最终版本

parent d3ecc584
......@@ -19,28 +19,69 @@
{
[super viewDidLoad];
[self setupNetService];
[self login];
}
- (void)setupNetService {
WMNetService *service = [WMNetService sharedInstance];
service.apiHost = @"http://backend.gmei.com";
NSString *path = @"/api/index/v3?version=7.0.0";
service.apiHost = @"http://backend.test.gmei.com";
service.urlCommonParameters = @"";
__weak __typeof(service)weakService = service;
service.beforeAction = ^ {
// NSMutableDictionary *properties = [NSMutableDictionary dictionary];
// [properties setObject:@"_gm_token" forKey:NSHTTPCookieName];
// [properties setObject:@"dadsad" forKey:NSHTTPCookieValue];
// [properties setObject:@"backend.gmei.com" forKey:NSHTTPCookieDomain];
// [properties setObject:@"backend" forKey:NSHTTPCookieOriginURL];
// [properties setObject:@"/" forKey:NSHTTPCookiePath];
// [properties setObject:@"0" forKey:NSHTTPCookieVersion];
// [properties setObject:[NSDate dateWithTimeIntervalSinceNow:60*60*60] forKey:NSHTTPCookieExpires];//设置失效时间
// [properties setObject:@"0" forKey:NSHTTPCookieDiscard];
// NSHTTPCookie *cookie = [[NSHTTPCookie alloc] initWithProperties:properties];
//
// NSMutableArray *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage].cookies mutableCopy];
// [cookies addObject:cookie];
// NSDictionary *requestHeaders = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies];
GMHTTPSessionManager * manager = weakService.networking;
manager.requestSerializer.HTTPShouldHandleCookies = YES;
[manager.requestSerializer setValue:[NSString stringWithFormat:@"%@=%@",@"_gm_token", @"dadsad"] forHTTPHeaderField:@"Cookie"];
// manager.requestSerializer.HTTPShouldHandleCookies = YES;
// service.networking
};
}
- (void)request{
// 我的需求就是能快速获取几种情况
NSString *path = @"/api/index/v3?version=7.0.0";
[[WMNetService sharedInstance] sendRequestWithURLString:path parameters:nil method:HttpMethodGet success:^(id responseObject) {
NSLog(@"message");
} failed:^(NSString *message) {
NSLog(@"message");
}];
service.beforeAction = ^ {
};
// [[WMNetService sharedInstance] sendRequestWithUrl:path parameters:nil method:HttpMethodGet success:^(NSDictionary *data, NSString *message) {
// NSLog(@"message");
// } failed:^(NSString *message) {
// NSLog(@"message");
// }];
}];
}
- (void)login {
[[WMNetService sharedInstance] sendRequestWithURLString:@"/api/accounts/login/password?version=7.0"
parameters: @{@"password": @"111111", @"phone": @"+8615711434789"}
method:HttpMethodPost
success:^(id responseObject) {
[self request];
// NSLog(@"%@", responseObject);
} failed:nil];
}
@end
......@@ -12,7 +12,7 @@
<!--View Controller-->
<scene sceneID="wQg-tq-qST">
<objects>
<viewController id="whP-gf-Uak" customClass="ViewController" customModule="GMNetService_Example" customModuleProvider="target" sceneMemberID="viewController">
<viewController id="whP-gf-Uak" customClass="GMViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="uEw-UM-LJ8"/>
<viewControllerLayoutGuide type="bottom" id="Mvr-aV-6Um"/>
......
......@@ -14,7 +14,7 @@ PODS:
- AFNetworking/Serialization (3.1.0)
- AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession
- GMNetService (0.1.4):
- GMNetService (0.1.5):
- AFNetworking (= 3.1.0)
DEPENDENCIES:
......@@ -26,8 +26,8 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
GMNetService: a16f611e9197f2c039831ab039e696e71fbab50b
GMNetService: 9e958dedeb361fca66aba41efb48233c9c359e44
PODFILE CHECKSUM: 7ff46b43a8d5593b3f8ac864bad161c3754f2311
COCOAPODS: 1.1.1
COCOAPODS: 1.2.0
{
"name": "GMNetService",
"version": "0.1.4",
"version": "0.1.5",
"summary": "A short description of GMNetService.",
"homepage": "http://git.gengmei.cc/gengmeiios/GMNetService",
"license": "MIT",
......@@ -9,13 +9,13 @@
},
"source": {
"git": "git@git.gengmei.cc:gengmeiios/GMNetService.git",
"tag": "0.1.4"
"tag": "0.1.5"
},
"platforms": {
"ios": "8.0"
},
"source_files": "GMNetService/Classes/**/*",
"public_header_files": "GMNetService/Classes/{WMNetService,WMSecureNetService,WMImageUploadOperation,GMNetConstant}.h",
"public_header_files": "GMNetService/Classes/{WMNetService,WMSecureNetService,WMImageUploadOperation,GMNetConstant,GMHTTPSessionManager}.h",
"dependencies": {
"AFNetworking": [
"3.1.0"
......
......@@ -14,7 +14,7 @@ PODS:
- AFNetworking/Serialization (3.1.0)
- AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession
- GMNetService (0.1.4):
- GMNetService (0.1.5):
- AFNetworking (= 3.1.0)
DEPENDENCIES:
......@@ -26,8 +26,8 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
GMNetService: a16f611e9197f2c039831ab039e696e71fbab50b
GMNetService: 9e958dedeb361fca66aba41efb48233c9c359e44
PODFILE CHECKSUM: 7ff46b43a8d5593b3f8ac864bad161c3754f2311
COCOAPODS: 1.1.1
COCOAPODS: 1.2.0
This diff is collapsed.
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
#ifndef TARGET_OS_IOS
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
#import "AFNetworking.h"
......
......@@ -5,5 +5,6 @@ OTHER_LDFLAGS = -framework "CoreGraphics" -framework "MobileCoreServices" -frame
PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/AFNetworking
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
#import "GMHTTPSessionManager.h"
#import "GMNetConstant.h"
#import "WMImageUploadOperation.h"
#import "WMNetService.h"
......
......@@ -5,5 +5,6 @@ HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Publi
PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.1.4</string>
<string>0.1.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -14,7 +14,7 @@
</dict>
<dict>
<key>FooterText</key>
<string>Copyright (c) 2011&#8211;2016 Alamofire Software Foundation (http://alamofire.org/)
<string>Copyright (c) 20112016 Alamofire Software Foundation (http://alamofire.org/)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
......
......@@ -59,8 +59,13 @@ code_sign_if_enabled() {
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\""
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"
local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
code_sign_cmd="$code_sign_cmd &"
fi
echo "$code_sign_cmd"
eval "$code_sign_cmd"
fi
}
......@@ -91,3 +96,6 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
install_framework "$BUILT_PRODUCTS_DIR/AFNetworking/AFNetworking.framework"
install_framework "$BUILT_PRODUCTS_DIR/GMNetService/GMNetService.framework"
fi
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
wait
fi
......@@ -18,6 +18,9 @@ case "${TARGETED_DEVICE_FAMILY}" in
2)
TARGET_DEVICE_ARGS="--target-device ipad"
;;
3)
TARGET_DEVICE_ARGS="--target-device tv"
;;
*)
TARGET_DEVICE_ARGS="--target-device mac"
;;
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
......
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/GMNetService"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/GMNetService"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
......@@ -59,8 +59,13 @@ code_sign_if_enabled() {
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\""
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"
local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
code_sign_cmd="$code_sign_cmd &"
fi
echo "$code_sign_cmd"
eval "$code_sign_cmd"
fi
}
......@@ -82,3 +87,6 @@ strip_invalid_archs() {
fi
}
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
wait
fi
......@@ -18,6 +18,9 @@ case "${TARGETED_DEVICE_FAMILY}" in
2)
TARGET_DEVICE_ARGS="--target-device ipad"
;;
3)
TARGET_DEVICE_ARGS="--target-device tv"
;;
*)
TARGET_DEVICE_ARGS="--target-device mac"
;;
......
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
......
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/GMNetService"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/AFNetworking" "$PODS_CONFIGURATION_BUILD_DIR/GMNetService"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
......@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '8.0'
s.source_files = 'GMNetService/Classes/**/*'
s.public_header_files = 'GMNetService/Classes/{WMNetService,WMSecureNetService,WMImageUploadOperation,GMNetConstant}.h'
s.public_header_files = 'GMNetService/Classes/{WMNetService,WMSecureNetService,WMImageUploadOperation,GMNetConstant,GMHTTPSessionManager}.h'
s.dependency 'AFNetworking', '3.1.0'
end
......@@ -8,11 +8,12 @@
#import <Foundation/Foundation.h>
#import "GMNetConstant.h"
#import "GMHTTPSessionManager.h"
/**
* @brief 针对业务的封装
*/
@class GMHTTPSessionManager, WMNetSecurityWorking;
@class WMNetSecurityWorking;
@interface WMNetService : NSObject
......@@ -34,8 +35,11 @@
@property (nonatomic, strong) NSString *webHost;
@property (nonatomic, strong) NSString *loginExpiredName;
@property (nonatomic, strong) NSString *urlCommonParameters;
//请求网络之前调用
//普通请求网络之前调用
@property (nonatomic, copy) void (^beforeAction) (void);
//上传操作之前调用,返回一个HttpHeader, 类型是NSDictionary
@property (nonatomic, copy) NSDictionary * (^beforeUploadAction) (void);
@property (nonatomic, copy) void (^handleResponse) (NSDictionary *response);
+ (instancetype)sharedInstance;
......
......@@ -156,12 +156,13 @@
NSMutableURLRequest *request = [[AFHTTPRequestSerializer serializer] multipartFormRequestWithMethod:@"POST" URLString:URLString parameters:parameters constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
//没有指定name的时候,name不能为空,默认填充 @"file" 即可
[formData appendPartWithFileData:data name:name fileName:fileName mimeType:mineType];
} error:nil];
request.timeoutInterval = 30;
if (self.beforeAction) {
_beforeAction();
if (self.beforeUploadAction) {
NSDictionary *httpHeader = self.beforeUploadAction();
[request setValue:[httpHeader objectForKey:@"Cookie"] forHTTPHeaderField:@"Cookie"];
}
AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
[UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
NSURLSessionUploadTask *uploadTask = [manager uploadTaskWithStreamedRequest:request progress:NULL completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
......
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