网络请求改为https

朱林
1 parent 4bd7aa4e
Showing 15 changed files with 44 additions and 31 deletions
CNLiveUserSystemDemo.xcodeproj/project.xcworkspace/xcuserdata/iOS.xcuserdatad/UserInterfaceState.xcuserstate
CNLiveUserSystemDemo.xcodeproj/xcuserdata/iOS.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveFeedback.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveLogin.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveRegister.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUploadIcon.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserInfo.m
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveUserSystemCenter.h
CNLiveUserSystemDemo/CNLiveUserSystemSDK/CNLiveVerificationCode.m
CNLiveUserSystemDemo/Conreollers/LoginViewController.m
CNLiveUserSystemDemo/Conreollers/ModifyUserInfoViewController.m
CNLiveUserSystemDemo/Conreollers/RegisterViewController.m
CNLiveUserSystemDemo/Conreollers/UserInfoViewController.m
CNLiveUserSystemDemo/Conreollers/ViewController.m
CNLiveUserSystemDemo/Views/RegistBasicInformationView.m
@@ -2,16 +2,4 @@
 <Bucket
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            scope = "0"
-            stopOnStyle = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>
@@ -12,7 +12,7 @@
 #import "NSDictionary+Safety.h"
 //反馈
-static  NSString *feedbackURL = @"http://api.cnlive.com/open/api2/user/userReport";
+static  NSString *feedbackURL = @"https://api.cnlive.com/open/api2/user/userReport";
 @implementation CNLiveFeedback
@@ -12,13 +12,13 @@
 #import "NSDictionary+Safety.h"
 //快捷登录
-static  NSString *shortcutLoginURL = @"http://api.cnlive.com/open/api2/user/loginInQuickly";
+static  NSString *shortcutLoginURL = @"https://api.cnlive.com/open/api2/user/loginInQuickly";
 //登录
-static  NSString *loginURL = @"http://api.cnlive.com/open/api2/user/loginIn";
+static  NSString *loginURL = @"https://api.cnlive.com/open/api2/user/loginIn";
 //第三方登录
-static  NSString *thirdLoginURL = @"http://api.cnlive.com/open/api2/user/loginIn3rd";
+static  NSString *thirdLoginURL = @"https://api.cnlive.com/open/api2/user/loginIn3rd";
 @implementation CNLiveLogin
@@ -12,7 +12,7 @@
 #import "NSDictionary+Safety.h"
 //注册
-static  NSString *registerURL = @"http://api.cnlive.com/open/api2/user/register";
+static  NSString *registerURL = @"https://api.cnlive.com/open/api2/user/register";
 @implementation CNLiveRegister
@@ -50,6 +50,13 @@ static  NSString *registerURL = @&quot;http://api.cnlive.com/open/api2/user/register&quot;
     [[CNLiveNetworkManager manager] requestPostURL:registerURL parameters:param success:^(NSURLResponse * _Nullable response, id  _Nullable responseObject) {
         responseObject = [responseObject validatedDictionary];
+        if ([[responseObject allKeys] containsObject:@"errorCode"] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
+            
+            NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+            [userDefaults setObject:responseObject[@"data"][@"token"] forKey:@"CNLiveAuthToken"];
+            [userDefaults synchronize];
+            
+        }
         success(responseObject);
     } failure:^(NSURLResponse * _Nullable response, NSError * _Nullable error) {
@@ -12,10 +12,10 @@
 #import "NSDictionary+Safety.h"
 //获取access_token
-static  NSString *accessTokenURL = @"http://api.cnlive.com/open/api2/token";
+static  NSString *accessTokenURL = @"https://api.cnlive.com/open/api2/token";
 //上传头像
-static  NSString *uploadIconURL = @"http://api.cnlive.com/open/api2/user/updateUserFaceById";
+static  NSString *uploadIconURL = @"https://api.cnlive.com/open/api2/user/updateUserFaceById";
 @implementation CNLiveUploadIcon
@@ -12,19 +12,19 @@
 #import "NSDictionary+Safety.h"
 //更新手机号
-static  NSString *updateMobileURL = @"http://api.cnlive.com/open/api2/user/updateMobileById";
+static  NSString *updateMobileURL = @"https://api.cnlive.com/open/api2/user/updateMobileById";
 //查询用户信息
-static  NSString *queryUserInfoURL = @"http://api.cnlive.com/open/api2/user/readUserById";
+static  NSString *queryUserInfoURL = @"https://api.cnlive.com/open/api2/user/readUserById";
 //修改用户单项信息
-static  NSString *updateUserByIdURL = @"http://api.cnlive.com/open/api2/user/updateUserById";
+static  NSString *updateUserByIdURL = @"https://api.cnlive.com/open/api2/user/updateUserById";
 //更新用户附加信息
-static  NSString *updateOtherInfoURL = @"http://api.cnlive.com/open/api2/user/updateUserExtInfo";
+static  NSString *updateOtherInfoURL = @"https://api.cnlive.com/open/api2/user/updateUserExtInfo";
 //修改密码
-static  NSString *updatePwdURL = @"http://api.cnlive.com/open/api2/user/updatePwdByMobile";
+static  NSString *updatePwdURL = @"https://api.cnlive.com/open/api2/user/updatePwdByMobile";
 @implementation CNLiveUserInfo
@@ -164,6 +164,7 @@ static  NSString *updatePwdURL = @&quot;http://api.cnlive.com/open/api2/user/updatePw
 - (void)requestWithURL:(NSString *)URL parameter:(NSDictionary *)param success:(void(^)(id result))success failure :(void (^)(NSError *  error))failure
 {
+
     [[CNLiveNetworkManager manager] requestPostURL:URL parameters:param success:^(NSURLResponse * _Nullable response, id  _Nullable responseObject) {
         responseObject = [responseObject validatedDictionary];
@@ -35,7 +35,7 @@
 /**
  @abstract      第三方登录
- @param         plat                    第三方平台编号（如platform: 1:sina weibo 2:qq weibo 3:weixin 4:renren 注:如qq登录,plat=@"2"）
+ @param         plat                    第三方平台编号（如plat: 1:sina weibo 2:qq weibo 3:weixin 4:renren 注:如qq登录,plat=@"2"）
  @param         thirdPartyId            第三方用户ID
  @param         nickName                用户昵称
  @param         gender                  性别，m：男、f：女、n：未知（非必填）
@@ -89,7 +89,7 @@
  @abstract      修改用户单项信息
  @param         type                    修改类型（nickName-昵称，gender-性别，email-邮箱, location-联系方式）
  @param         uid                     用户ID
- @param         info                    对应的信息（注gender对应f/m）
+ @param         info                    对应的信息（注gender对应f/m/n）
  @param         success                 成功回调
  @param         failure                 失败回调
  */
@@ -12,13 +12,13 @@
 #import "NSDictionary+Safety.h"
 //快捷登录前发手机验证码
-static  NSString *shortcutLoginURL = @"http://api.cnlive.com/open/api2/user/sendVerifyCode";
+static  NSString *shortcutLoginURL = @"https://api.cnlive.com/open/api2/user/sendVerifyCode";
 //注册或修改手机号前发手机验证码
-static  NSString *registerOrModifyURL = @"http://api.cnlive.com/open/api2/user/sendVerifyCodeForUnRegistered";
+static  NSString *registerOrModifyURL = @"https://api.cnlive.com/open/api2/user/sendVerifyCodeForUnRegistered";
 //找回或修改密码前发手机验证码
-static  NSString *passwordURL = @"http://api.cnlive.com/open/api2/user/sendVerifyCodeForRegistered";
+static  NSString *passwordURL = @"https://api.cnlive.com/open/api2/user/sendVerifyCodeForRegistered";
 @implementation CNLiveVerificationCode
@@ -65,11 +65,13 @@
         } else {
             [Tools toast:result[@"errorMessage"]];
+            [SVProgressHUD dismiss];
         }
     } failure:^(NSError *error) {
         [Tools toast:error.localizedDescription];
+        [SVProgressHUD dismiss];
     }];
 }
@@ -52,10 +52,12 @@
             } else {
                 [Tools toast:result[@"errorMessage"]];
+                [SVProgressHUD dismiss];
             }
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
+            [SVProgressHUD dismiss];
         }];
     } else {
         [CNLiveUserSystemCenter modifyUserInfoType:_modifyType uid:model.uid modifyInfo:_textField1.text success:^(id result) {
@@ -67,10 +69,13 @@
             } else {
                 [Tools toast:result[@"errorMessage"]];
+                [SVProgressHUD dismiss];
             }
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
+            [SVProgressHUD dismiss];
+
         }];
     }
@@ -95,11 +95,14 @@
             } else {
                 [Tools toast:result[@"errorMessage"]];
+                [SVProgressHUD dismiss];
+
             }
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
+            [SVProgressHUD dismiss];
         }];
@@ -115,11 +118,13 @@
             } else {
                 [Tools toast:result[@"errorMessage"]];
+                [SVProgressHUD dismiss];
             }
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
+            [SVProgressHUD dismiss];
         }];
@@ -131,9 +136,11 @@
             } else {
                 [Tools toast:result[@"errorMessage"]];
+                [SVProgressHUD dismiss];
             }
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
+            [SVProgressHUD dismiss];
         }];
     }
@@ -196,11 +196,12 @@
         } else {
             [Tools toast:result[@"errorMessage"]];
+            [SVProgressHUD dismiss];
         }
     } failure:^(NSError *error) {
         [Tools toast:error.localizedDescription];
-
+        [SVProgressHUD dismiss];
     }];
 }
@@ -135,10 +135,12 @@
             } else {
                 [Tools toast:result[@"errorMessage"]];
+                [SVProgressHUD dismiss];
             }
         } failure:^(NSError *error) {
             [Tools toast:error.localizedDescription];
+            [SVProgressHUD dismiss];
         }];
     }
@@ -55,7 +55,7 @@ static BOOL isPhone;
 - (UITextField *)verificationTF
 {
     if (!_verificationTF) {
-        _verificationTF = [[UITextField alloc] initWithFrame:CGRectMake(10, 57, 170, 57)];
+        _verificationTF = [[UITextField alloc] initWithFrame:CGRectMake(10, 57, KScreenWidth - 20, 57)];
         _verificationTF.placeholder = @"请输入您收到的验证码";
         _verificationTF.keyboardType = UIKeyboardTypeNumberPad;
         _verificationTF.font = [UIFont systemFontOfSize:17];