更新用户SDK,增加手机号国家码 ,修改url不带4server

张旭
1 parent 5a933918
Showing 8 changed files with 223 additions and 22 deletions
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveCheckVerificationCode.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveCheckVerificationCode.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveLogin.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveLogin.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserInfo.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserInfo.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemCenter.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemCenter.m
@@ -12,12 +12,22 @@
 @interface CNLiveCheckVerificationCode : NSObject
 /**
-  注册前校验手机验证码
+  注册前校验手机验证码(旧)
  */
 - (void)registerCheckVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(CheckVerificationCodeType)type mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 /**
- 快捷登录前校验手机验证码
+ 注册前校验手机验证码(新)
+ */
+- (void)registerCheckVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(CheckVerificationCodeType)type mobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+
+/**
+ 快捷登录前校验手机验证码(旧)
  */
 - (void)shortcutLoginCheckVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(CheckVerificationCodeType)type mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+
+/**
+ 快捷登录前校验手机验证码(新)
+ */
+- (void)shortcutLoginCheckVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(CheckVerificationCodeType)type mobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 @end
@@ -38,6 +38,24 @@ static  NSString *shortcutLoginCheckVerificationCodeFormalURL = @&quot;https://api.cn
     [self requestWithURL:[self getURL:type] parameter:parameter success:success failure:failure];
 }
+- (void)registerCheckVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(CheckVerificationCodeType)type mobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
+{
+    NSDictionary *params = @{@"appId":[CNLiveUserSystemTools verify:appId],
+                             @"mobile":[CNLiveUserSystemTools verify:mobile],
+                              @"countryCode":countryCode,
+                             @"verificationCode":[CNLiveUserSystemTools verify:verificationCode],
+                             @"clientPlat":@"i",
+                             @"platform_id":[NSBundle mainBundle].bundleIdentifier
+                             };
+    
+    NSMutableDictionary *parameter = [NSMutableDictionary dictionaryWithDictionary:params];
+    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [CNLiveUserSystemTools signvalue:parameter], [CNLiveUserSystemTools verify:appKey]];
+    NSString *signString = [[CNLiveUserSystemTools sha1:string] uppercaseString];
+    
+    [parameter setObject:signString forKey:@"sign"];
+    [self requestWithURL:[self getURL:type] parameter:parameter success:success failure:failure];
+}
+
 - (void)shortcutLoginCheckVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(CheckVerificationCodeType)type mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
 {
     NSDictionary *params = @{@"appId":[CNLiveUserSystemTools verify:appId],
@@ -55,6 +73,25 @@ static  NSString *shortcutLoginCheckVerificationCodeFormalURL = @&quot;https://api.cn
     [self requestWithURL:[self getURL:type] parameter:parameter success:success failure:failure];
 }
+- (void)shortcutLoginCheckVerificationCodeWithAppId:(NSString *)appId appKey:(NSString *)appKey type:(CheckVerificationCodeType)type mobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
+{
+    NSDictionary *params = @{@"appId":[CNLiveUserSystemTools verify:appId],
+                             @"mobile":[CNLiveUserSystemTools verify:mobile],
+                             @"countryCode":countryCode,
+                             @"verificationCode":[CNLiveUserSystemTools verify:verificationCode],
+                             @"clientPlat":@"i",
+                             @"platform_id":[NSBundle mainBundle].bundleIdentifier
+                             };
+    
+    NSMutableDictionary *parameter = [NSMutableDictionary dictionaryWithDictionary:params];
+    NSString *string = [NSString stringWithFormat:@"%@&key=%@", [CNLiveUserSystemTools signvalue:parameter], [CNLiveUserSystemTools verify:appKey]];
+    NSString *signString = [[CNLiveUserSystemTools sha1:string] uppercaseString];
+    
+    [parameter setObject:signString forKey:@"sign"];
+    [self requestWithURL:[self getURL:type] parameter:parameter success:success failure:failure];
+
+}
+
 #pragma mark - request
 - (void)requestWithURL:(NSString *)URL parameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
 {
@@ -16,11 +16,15 @@
 - (void)thirdPartyLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey thirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId nickName:(NSString *)nickName gender:(NSString *)gender location:(NSString *)location faceUrl:(NSString *)faceUrl frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 /**
- *  快捷登录
+ *  快捷登录(旧)
  */
 - (void)shortcutLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 /**
+ *  快捷登录(新)
+ */
+- (void)shortcutLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+/**
  *  登录
  */
 - (void)loginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
@@ -25,12 +25,12 @@ static  NSString *thirdLoginFormalURL = @&quot;https://api.cnlive.com/open/api2/user/
 //验证第三方账号是否注册,若注册则登录返回用户信息,若未注册则errorCode
-static  NSString *thirdCheckLoginTestURL = @"http://test.open.cnlive.com/openapi/api2/user/loginIn3rdHasMobile4server";
-static  NSString *thirdCheckLoginFormalURL = @"https://api.cnlive.com/open/api2/user/loginIn3rdHasMobile4server";
+static  NSString *thirdCheckLoginTestURL = @"http://test.open.cnlive.com/openapi/api2/user/loginIn3rdHasMobile";
+static  NSString *thirdCheckLoginFormalURL = @"https://api.cnlive.com/open/api2/user/loginIn3rdHasMobile";
 //第三方注册强制绑定手机号: 手机号+密码+验证码+三方账号
-static  NSString *thirdBindMobileLoginTestURL = @"http://test.open.cnlive.com/openapi/api2/user/loginIn3rdAndBindMobile4server";
-static  NSString *thirdBindMobileLoginFormalURL = @"https://api.cnlive.com/open/api2/user/loginIn3rdAndBindMobile4server";
+static  NSString *thirdBindMobileLoginTestURL = @"http://test.open.cnlive.com/openapi/api2/user/loginIn3rdAndBindMobile";
+static  NSString *thirdBindMobileLoginFormalURL = @"https://api.cnlive.com/open/api2/user/loginIn3rdAndBindMobile";
 @implementation CNLiveLogin
@@ -68,7 +68,7 @@ static  NSString *thirdBindMobileLoginFormalURL = @&quot;https://api.cnlive.com/open/
 }
 /**
- *  快捷登录
+ *  快捷登录(旧)
  */
 - (void)shortcutLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
 {
@@ -101,6 +101,40 @@ static  NSString *thirdBindMobileLoginFormalURL = @&quot;https://api.cnlive.com/open/
 }
 /**
+ *  快捷登录(新)
+ */
+- (void)shortcutLoginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
+{
+    [CNLiveUserSystemTools getRealTimeString:^(NSString * _Nullable realTime, NSDate * _Nullable netDate) {
+        
+        NSString *timeString = realTime;
+        
+        NSDictionary *params = @{@"appId":[CNLiveUserSystemTools verify:appId],
+                                 @"userName":[CNLiveUserSystemTools verify:userName],
+                                 @"countryCode":countryCode,
+                                 @"verificationCode":[CNLiveUserSystemTools verify:verificationCode],
+                                 @"uuid":[CNLiveUserSystemTools uidForStat:realTime],
+                                 @"frmId":[CNLiveUserSystemTools verify:frmId],
+                                 @"clientPlat":@"i",
+                                 @"platform_id":[NSBundle mainBundle].bundleIdentifier,
+                                 @"timestamp": timeString};
+        
+        NSMutableDictionary *parameter = [NSMutableDictionary dictionaryWithDictionary:params];
+        NSString *string = [NSString stringWithFormat:@"%@&key=%@", [CNLiveUserSystemTools signvalue:parameter], [CNLiveUserSystemTools verify:appKey]];
+        NSString *signString = [[CNLiveUserSystemTools sha1:string] uppercaseString];
+        
+        [parameter setObject:signString forKey:@"sign"];
+        NSString *url;
+        if ([CNLiveUserSystemTools isTestEnvironment]) {
+            url = shortcutLoginTestURL;
+        } else {
+            url = shortcutLoginFormalURL;
+        }
+        [self requestWithURL:url parameter:parameter success:success failure:failure];
+    }];
+}
+
+/**
  *  登录
  */
 - (void)loginWithAppId:(NSString *)appId appKey:(NSString *)appKey userName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *))failure
@@ -12,11 +12,16 @@
 @interface CNLiveUserInfo : NSObject
 /**
- *  更新手机号
+ *  更新手机号(旧)
  */
 - (void)updateMobileWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode token:(NSString *)token success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 /**
+ *  更新手机号(新)
+ */
+- (void)updateMobileWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid mobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode token:(NSString *)token success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+
+/**
  *  绑定第三方账号
  */
 - (void)bindingThirdPartyWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid thirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId token:(NSString *)token success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
@@ -20,8 +20,8 @@ static  NSString *queryUserInfoTestURL      = @&quot;http://test.open.cnlive.com/open
 static  NSString *queryUserInfoFormalURL      = @"https://api.cnlive.com/open/api2/user/readUserById";
 //查询多条用户信息
-static  NSString *queryMoreUserInfoTestURL  = @"http://test.open.cnlive.com/openapi/api2/user/readUsersById4server";
-static  NSString *queryMoreUserInfoFormalURL  = @"https://api.cnlive.com/open/api2/user/readUsersById4server";
+static  NSString *queryMoreUserInfoTestURL  = @"http://test.open.cnlive.com/openapi/api2/user/readUsersById";
+static  NSString *queryMoreUserInfoFormalURL  = @"https://api.cnlive.com/open/api2/user/readUsersById";
 //修改用户单项信息
 static  NSString *updateUserByIdTestURL     = @"http://test.open.cnlive.com/openapi/api2/user/updateUserById";
@@ -29,7 +29,7 @@ static  NSString *updateUserByIdFormalURL     = @&quot;https://api.cnlive.com/open/ap
 //更新用户附加信息
 static  NSString *updateOtherInfoTestURL    = @"http://test.open.cnlive.com/openapi/api2/user/updateUserExtInfo";
-static  NSString *updateOtherInfoFormalURL    = @"http://172.16.3.67/open/api2/user/updateUserExtInfo";//@"https://api.cnlive.com/open/api2/user/updateUserExtInfo";
+static  NSString *updateOtherInfoFormalURL    = @"https://api.cnlive.com/open/api2/user/updateUserExtInfo";
 //修改密码
 static  NSString *updatePwdTestURL          = @"http://test.open.cnlive.com/openapi/api2/user/updatePwdByMobile";
@@ -46,7 +46,7 @@ static  NSString *oldPwdUpdatePwdFormalURL       = @&quot;https://api.cnlive.com/open
 @implementation CNLiveUserInfo
 /**
- *  更新手机号
+ *  更新手机号(旧)
  */
 - (void)updateMobileWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode token:(NSString *)token success:(void (^)(id result))success failure:(void (^)(NSDictionary *))failure
 {
@@ -79,6 +79,40 @@ static  NSString *oldPwdUpdatePwdFormalURL       = @&quot;https://api.cnlive.com/open
 }
 /**
+ *  更新手机号(新)
+ */
+- (void)updateMobileWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid mobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode token:(NSString *)token success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
+{
+    [CNLiveUserSystemTools getRealTimeString:^(NSString * _Nullable realTime, NSDate * _Nullable netDate) {
+        
+        NSString *timeString = realTime;
+        
+        NSDictionary *params = @{@"appId":[CNLiveUserSystemTools verify:appId],
+                                 @"uid":[CNLiveUserSystemTools verify:uid],
+                                 @"mobile":[CNLiveUserSystemTools verify:mobile],
+                                 @"countryCode":countryCode,
+                                 @"verificationCode":[CNLiveUserSystemTools verify:verificationCode],
+                                 @"clientPlat":@"i",
+                                 @"token":[CNLiveUserSystemTools verify:token],
+                                 @"platform_id":[NSBundle mainBundle].bundleIdentifier,
+                                 @"timestamp": timeString};
+        
+        NSMutableDictionary *parameter = [NSMutableDictionary dictionaryWithDictionary:params];
+        NSString *string = [NSString stringWithFormat:@"%@&key=%@", [CNLiveUserSystemTools signvalue:parameter], [CNLiveUserSystemTools verify:appKey]];
+        NSString *signString = [[CNLiveUserSystemTools sha1:string] uppercaseString];
+        
+        [parameter setObject:signString forKey:@"sign"];
+        NSString *url;
+        if ([CNLiveUserSystemTools isTestEnvironment]) {
+            url = updateMobileTestURL;
+        } else {
+            url = updateMobileFormalURL;
+        }
+        [self requestWithURL:url parameter:parameter success:success failure:failure];
+    }];
+}
+
+/**
  *  绑定第三方账号
  */
 - (void)bindingThirdPartyWithAppId:(NSString *)appId appKey:(NSString *)appKey uid:(NSString *)uid thirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId token:(NSString *)token success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
@@ -65,7 +65,7 @@
 /**
- @abstract      快捷登录
+ @abstract      快捷登录(旧)
  @param         userName                手机号
  @param         verificationCode        验证码
  @param         frmId                   渠道ID（非必填）
@@ -74,6 +74,15 @@
  */
 + (void)shortcutLoginWithUserName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+/**
+ @abstract      快捷登录(新)
+ @param         userName                手机号
+ @param         countryCode             手机号国家码
+ @param         verificationCode        验证码
+ @param         frmId                   渠道ID（非必填）
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */+ (void)shortcutLoginWithUserName:(NSString *)userName countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id))success failure :(void (^)(NSDictionary *))failure;
 /**
  @abstract      登录
@@ -118,7 +127,7 @@
 /**
- @abstract      更新手机号
+ @abstract      更新手机号(旧)
  @param         uid                     用户ID
  @param         mobile                  手机号
  @param         verificationCode        验证码
@@ -127,6 +136,16 @@
  */
 + (void)updateMobileWithUid:(NSString *)uid mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure:(void (^)(NSDictionary *errorDic))failure;
+/**
+ @abstract      更新手机号(新)
+ @param         uid                     用户ID
+ @param         mobile                  手机号
+ @param         countryCode             手机号国家码
+ @param         verificationCode        验证码
+ @param         success                 成功回调
+ @param         failure                 失败回调
+ */
++(void)updateMobileWithUid:(NSString *)uid mobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure;
 /**
  @abstract      绑定第三方账号
@@ -224,18 +243,28 @@
 /**
- 注册前校验手机验证码
+ 注册前校验手机验证码(旧)
  @param mobile 手机号
  @param verificationCode 验证码
  @param success 成功回调
- @param getVersion 失败回调
+ @param failure 失败回调
  */
 + (void)registerCheckVerificationCodeWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+/**
+ 注册前校验手机验证码(新)
+ 
+ @param mobile 手机号
+ @param countryCode 手机号国家码
+ @param verificationCode 验证码
+ @param success 成功回调
+ @param failure 失败回调
+ */
++ (void)registerCheckVerificationCodeWithMobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 /**
- 快捷登录前校验手机验证码
+ 快捷登录前校验手机验证码(旧)
  @param mobile 手机号
  @param verificationCode 验证码
@@ -244,6 +273,15 @@
  */
 + (void)shortcutLoginCheckVerificationCodeWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
+/**
+ 快捷登录前校验手机验证码(新)
+ 
+ @param mobile 手机号
+ @param countryCode 手机号国家码
+ @param success 成功回调
+ @param failure 失败回调
+ */
++ (void)shortcutLoginCheckVerificationCodeWithMobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure;
 /**
  验证第三方账号是否注册,若注册则直接登录返回用户信息,若未注册返回errorCode
@@ -71,7 +71,7 @@
 }
 /**
- *  快捷登录
+ *  快捷登录(旧)
  */
 + (void)shortcutLoginWithUserName:(NSString *)userName verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id))success failure :(void (^)(NSDictionary *))failure
@@ -82,6 +82,17 @@
 }
 /**
+ *  快捷登录(新)
+ */
+
++ (void)shortcutLoginWithUserName:(NSString *)userName countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode frmId:(NSString *)frmId success:(void (^)(id))success failure :(void (^)(NSDictionary *))failure
+{
+    CNLiveLogin *shortcutLogin = [[CNLiveLogin alloc] init];
+    
+    [shortcutLogin shortcutLoginWithAppId:[CNLiveUserManager manager].appId appKey:[CNLiveUserManager manager].appKey userName:userName countryCode:countryCode verificationCode:verificationCode frmId:frmId success:success failure:failure];
+}
+
+/**
  *  登录
  */
 + (void)loginWithUserName:(NSString *)userName password:(NSString *)password frmId:(NSString *)frmId success:(void (^)(id))success failure :(void (^)(NSDictionary *))failure
@@ -122,7 +133,7 @@
 }
 /**
- *  更新手机号
+ *  更新手机号(旧)
  */
 +(void)updateMobileWithUid:(NSString *)uid mobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
 {
@@ -132,6 +143,16 @@
 }
 /**
+ *  更新手机号(新)
+ */
++(void)updateMobileWithUid:(NSString *)uid mobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
+{
+    CNLiveUserInfo *updateMobile = [[CNLiveUserInfo alloc] init];
+    
+    [updateMobile updateMobileWithAppId:[CNLiveUserManager manager].appId appKey:[CNLiveUserManager manager].appKey uid:uid mobile:mobile countryCode:countryCode verificationCode:verificationCode token:[[self class] getToken] success:success failure:failure];
+}
+
+/**
  *  绑定第三方账号
  */
 +(void)bindingThirdPartyWithUid:(NSString *)uid thirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId success:(void (^)(id))success failure:(void (^)(NSDictionary *))failure
@@ -220,7 +241,7 @@
 }
 /**
- *  注册前校验手机验证码
+ *  注册前校验手机验证码(旧)
  */
 + (void)registerCheckVerificationCodeWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
 {
@@ -229,7 +250,16 @@
 }
 /**
- *  快捷登录前校验手机验证码
+ *  注册前校验手机验证码(新)
+ */
++ (void)registerCheckVerificationCodeWithMobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
+{
+    CNLiveCheckVerificationCode *checkCode = [[CNLiveCheckVerificationCode alloc] init];
+    [checkCode registerCheckVerificationCodeWithAppId:[CNLiveUserManager manager].appId appKey:[CNLiveUserManager manager].appKey type:CheckVerificationCodeTypeRegister mobile:mobile countryCode:countryCode verificationCode:verificationCode success:success failure:failure];
+}
+
+/**
+ *  快捷登录前校验手机验证码(旧)
  */
 + (void)shortcutLoginCheckVerificationCodeWithMobile:(NSString *)mobile verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
 {
@@ -238,6 +268,15 @@
 }
 /**
+ *  快捷登录前校验手机验证码(新)
+ */
++ (void)shortcutLoginCheckVerificationCodeWithMobile:(NSString *)mobile countryCode:(NSString *)countryCode verificationCode:(NSString *)verificationCode success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure
+{
+    CNLiveCheckVerificationCode *checkCode = [[CNLiveCheckVerificationCode alloc] init];
+    [checkCode shortcutLoginCheckVerificationCodeWithAppId:[CNLiveUserManager manager].appId appKey:[CNLiveUserManager manager].appKey type:CheckVerificationCodeTypeShortcutLogin mobile:mobile countryCode:countryCode verificationCode:verificationCode success:success failure:failure];
+}
+
+/**
  *  验证第三方账号是否注册,若注册直接登录返回用户信息,若未注册返回errorCode
  */
 + (void)thirdPartyCheckLoginWithThirdPartyPlatType:(NSString *)plat thirdPartyId:(NSString *)thirdPartyId frmId:(NSString *)frmId success:(void (^)(id result))success failure :(void (^)(NSDictionary *errorDic))failure