bugfix - 注册登录

Author: wanghengheng

Coding_iOS/Controllers/Login/CannotLoginViewController.m

@@ -222,6 +222,7 @@ - (void)phoneCodeBtnClicked:(PhoneCodeButton *)sender{
     sender.enabled = NO;
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/password/forget" withParams:@{@"account": _userStr} withMethodType:Post andBlock:^(id data, NSError *error) {
         if (data) {
+            [NSObject showHudTipStr:@"验证码发送成功"];
             [sender startUpTimer];
         }else{
             [sender invalidateTimer];
@@ -241,8 +242,8 @@ - (void)footerBtnClicked:(id)sender{
             }
             [self.footerBtn startQueryAnimate];
             NSMutableDictionary *params = @{@"account": _userStr,
-                                            @"password": _password,
-                                            @"confirm": _confirm_password,
+                                            @"password": [_password sha1Str],
+                                            @"confirm": [_confirm_password sha1Str],
                                             @"code": _phoneCode}.mutableCopy;
             params[@"j_captcha"] = _j_captcha;
             [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/password/reset" withParams:params withMethodType:Post andBlock:^(id data, NSError *error) {
@@ -253,12 +254,11 @@ - (void)footerBtnClicked:(id)sender{
                 }
             }];
         }else{
-            NSString *tipStr = @"重置密码邮件已经发送，请尽快去邮箱查看";
             [self.footerBtn startQueryAnimate];
             [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/password/forget" withParams:@{@"account": _userStr, @"j_captcha": _j_captcha} withMethodType:Post andBlock:^(id data, NSError *error) {
                 [self.footerBtn stopQueryAnimate];
                 if (data) {
-                    [NSObject showHudTipStr:tipStr];
+                    [NSObject showHudTipStr:@"重置密码邮件已经发送，请尽快去邮箱查看"];
                     [self.navigationController popToRootViewControllerAnimated:YES];
                 }
             }];

Coding_iOS/Controllers/Login/RegisterViewController.m

@@ -323,6 +323,7 @@ - (void)phoneCodeBtnClicked:(PhoneCodeButton *)sender{
     sender.enabled = NO;
     [[Coding_NetAPIManager sharedManager] request_GeneratePhoneCodeWithPhone:_myRegister.phone type:PurposeToRegister block:^(id data, NSError *error) {
         if (data) {
+            [NSObject showHudTipStr:@"验证码发送成功"];
             [sender startUpTimer];
         }else{
             [sender invalidateTimer];

Coding_iOS/Controllers/MeSetting/SettingPhoneViewController.m

@@ -101,6 +101,7 @@ - (void)phoneCodeBtnClicked:(PhoneCodeButton *)sender{
     sender.enabled = NO;
     [[Coding_NetAPIManager sharedManager] request_GeneratePhoneCodeToResetPhone:_phone block:^(id data, NSError *error) {
         if (data) {
+            [NSObject showHudTipStr:@"验证码发送成功"];
             [sender startUpTimer];
         }else{
             [sender invalidateTimer];

Coding_iOS/Models/Login.m

@@ -30,7 +30,7 @@ - (instancetype)init
 }
 
 - (NSString *)toPath{
-    return @"https://coding.net/api/v2/account/login";
+    return @"api/v2/account/login";
 }
 - (NSDictionary *)toParams{
     NSMutableDictionary *params = @{@"account": self.email,

Coding_iOS/Util/Manager/Coding_NetAPIManager.m

@@ -312,9 +312,14 @@ - (void)request_ActivateBySetGlobal_key:(NSString *)global_key block:(void (^)(i
 - (void)request_SendActivateEmail:(NSString *)email block:(void (^)(id data, NSError *error))block{
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/account/register/email/send" withParams:@{@"email": email} withMethodType:Post andBlock:^(id data, NSError *error) {
         if (data) {
-            [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"激活账号_重发激活邮件"];
-            
-            block(data, nil);
+            if ([(NSNumber *)data[@"data"] boolValue]) {
+                [MobClick event:kUmeng_Event_Request_ActionOfServer label:@"激活账号_重发激活邮件"];
+                
+                block(data, nil);
+            }else{
+                [NSObject showHudTipStr:@"发送失败"];
+                block(nil, nil);
+            }
         }else{
             block(nil, error);
         }