Merge branch 'master' of git.oschina.net:kollway-kollway/newcemarose

iCemarose/Class/Api/KWMAPIManager.m

@@ -791,7 +791,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) wechatPayUnifiedOrder:(NSDictionary *)parameters
                                          success:(void(^)(NSURLSessionDataTask *task,KWMCheckoutPayResult *result))success
                                          failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = [NSString stringWithFormat:@"https://%@/wechatpay/app/unified_order",Additional_API_DOMAIN];
+    NSString *apiPath = [NSString stringWithFormat:@"https://%@/wechatpay/app/unified_order",Pay_API_DOMAIN];
     return [self startSessionTask:KWMHTTPMethodPOST
                           apiPath:apiPath
                        parameters:parameters
@@ -816,7 +816,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) aliPayUnifiedOrder:(NSDictionary *)parameters
                                       success:(void(^)(NSURLSessionDataTask *task,KWMCheckoutPayResult *result))success
                                       failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = [NSString stringWithFormat:@"https://%@/alipay/app/unified_order",Additional_API_DOMAIN];
+    NSString *apiPath = [NSString stringWithFormat:@"https://%@/alipay/app/unified_order",Pay_API_DOMAIN];
     return [self startSessionTask:KWMHTTPMethodPOST
                           apiPath:apiPath
                        parameters:parameters
@@ -829,7 +829,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) wechatPayOrderQuery:(NSDictionary *)parameters
                                        success:(void(^)(NSURLSessionDataTask *task,KWMCheckoutPayResult *result))success
                                        failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = [NSString stringWithFormat:@"https://%@/wechatpay/order/query",Additional_API_DOMAIN];
+    NSString *apiPath = [NSString stringWithFormat:@"https://%@/wechatpay/order/query",Pay_API_DOMAIN];
 
     return [self startSessionTask:KWMHTTPMethodPOST
                           apiPath:apiPath
@@ -843,7 +843,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) aliPayOrderQuery:(NSDictionary *)parameters
                                     success:(void(^)(NSURLSessionDataTask *task,KWMCheckoutPayResult *result))success
                                     failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = [NSString stringWithFormat:@"https://%@/alipay/order/query",Additional_API_DOMAIN];
+    NSString *apiPath = [NSString stringWithFormat:@"https://%@/alipay/order/query",Pay_API_DOMAIN];
 
     return [self startSessionTask:KWMHTTPMethodPOST
                           apiPath:apiPath
@@ -867,7 +867,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
 - (NSURLSessionDataTask *) appOrderQuery:(NSDictionary *)parameters
                                     success:(void(^)(NSURLSessionDataTask *task,KWMCheckoutPayResult *result))success
                                     failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure{
-    NSString *apiPath = [NSString stringWithFormat:@"https://%@/app/order/query",Additional_API_DOMAIN];    
+    NSString *apiPath = [NSString stringWithFormat:@"https://%@/app/order/query",Pay_API_DOMAIN];
     return [self startSessionTask:KWMHTTPMethodPOST
                           apiPath:apiPath
                        parameters:parameters

iCemarose/Header-Prefix.h

@@ -67,6 +67,8 @@
 //额外api domain
 #define Additional_API_DOMAIN @"liang.tofnews.com"
 
+#define Pay_API_DOMAIN @"liang.tofnews.com"
+
 //Shopify对应的key（测试用）
 #define Shopify_SHOP_DOMAIN @"cemarose-test.myshopify.com"
 
@@ -79,6 +81,8 @@
 
 #define Additional_API_DOMAIN @"apps.cemarose.com"
 
+#define Pay_API_DOMAIN @"alipay.cemarose.com"
+
 //Shopify对应的key（正式）
 #define Shopify_SHOP_DOMAIN @"cemarose.myshopify.com"
 #define Shopify_API_KEY @"c2f6fae97741ea6db4cad7ae8f70fef3"