【轻会员】更改密码逻辑调整

PDF Office/PDF Office/Class/KMLightMember/Controller/Login&Register/KMLoginWindowController.swift

@@ -137,13 +137,14 @@ class KMLoginWindowController: NSWindowController {
                         self.verificationCodeView.showAlert(result: result)
                     }
                 }
-            } else if view.inputType == .resetPassword {
-                KMRequestServerManager.manager.resetPassword(account: data.email, firstPassword: data.password, secondPassword: data.rePassword, verifyCode: data.verifyCode) {[unowned self] (success, result) in
+            } else if view.inputType == .loginInputPassword {
+                KMRequestServerManager.manager.verificationCode(account: data.email, verifyCode: data.verifyCode, verifyCodeType: .resetPassword) { success, result in
                     if success {
-                        self.model.email = data.email
-                        self.logType = .login
+                        self.resetPasswordView.model.verifyCode = data.verifyCode
+                        self.resetPasswordView.model.email = data.email
+                        self.logType = .resetPassword
                     } else {
-                        self.verificationCodeView.showAlert(result: result!)
+                        self.verificationCodeView.showAlert(result: result)
                     }
                 }
             }
@@ -202,7 +203,16 @@ class KMLoginWindowController: NSWindowController {
         
         //登录输入密码界面点击忘记密码按钮
         self.loginInputPasswordView.forgotPasswordAction = { [unowned self] (view, data) in
-            self.logType = .resetPassword
+            KMRequestServerManager.manager.getVerifyCode(verifyCodeType: .resetPassword, email: data.email) { success, result in
+                if success {
+                    self.verificationCodeView.inputType = .loginInputPassword
+                    self.verificationCodeView.model.email = data.email
+                    self.verificationCodeView.beginTimer()
+                    self.logType = .verificationCode
+                } else {
+                    self.loginInputPasswordView.showAlert(result: result)
+                }
+            }
         }
         
         //登录输入密码界面点击调整邮箱按钮
@@ -213,16 +223,12 @@ class KMLoginWindowController: NSWindowController {
         //resetPasswordView
         //重置密码界面点击完成按钮
         self.resetPasswordView.doneAction = { [unowned self] (view, data) in
-            KMRequestServerManager.manager.getVerifyCode(verifyCodeType: .resetPassword, email: data.email) { success, result in
+            KMRequestServerManager.manager.resetPassword(account: data.email, firstPassword: data.password, secondPassword: data.rePassword, verifyCode: data.verifyCode) {[unowned self] (success, result) in
                 if success {
-                    self.verificationCodeView.inputType = .resetPassword
-                    self.verificationCodeView.model.email = data.email
-                    self.verificationCodeView.model.password = data.password
-                    self.verificationCodeView.model.rePassword = data.rePassword
-                    self.verificationCodeView.beginTimer()
-                    self.logType = .verificationCode
+                    self.model.email = data.email
+                    self.logType = .login
                 } else {
-                    self.resetPasswordView.showAlert(result: result)
+                    self.verificationCodeView.showAlert(result: result!)
                 }
             }
         }

PDF Office/PDF Office/Class/KMLightMember/Controller/VerificationCode/View/KMLightMemberAlertView.swift

@@ -47,7 +47,7 @@ class KMLightMemberAlertView: KMBaseXibView {
             self.contentView.isHidden = false
         }
         
-        self.titleLabel.stringValue = NSLocalizedString(KMRequestServerErrorCodeType.typeOfMessage(type: KMRequestServerErrorCodeType(rawValue: result.code)!), comment: "")
+        self.titleLabel.stringValue = NSLocalizedString(KMRequestServerErrorCodeType.typeOfMessage(type: KMRequestServerErrorCodeType(rawValue: result.code)), comment: "")
         
         DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) { [unowned self] in
             self.fadeOut()

PDF Office/PDF Office/Class/KMLightMember/Controller/VerificationCode/View/KMVerificationCodeView.swift

@@ -65,7 +65,7 @@ class KMVerificationCodeView: KMBaseXibView {
             switch self.inputType {
             case .register:
                 self.verifyCodeType = .register
-            case .resetPassword:
+            case .loginInputPassword:
                 self.verifyCodeType = .resetPassword
             case .accountInfo:
                 self.verifyCodeType = .logOff

PDF Office/PDF Office/Class/KMLightMember/Manager/KMRequestServerManager.swift

@@ -37,7 +37,7 @@ enum KMRequestServerErrorCodeType: Int, CaseIterable {
     case EXCEPTION_TIME_TRANSFER_ERROR = 326
     case EMAIL_VERIFY_CODE_KEY_ERROR2 = 700
     
-    static func typeOfMessage(type: KMRequestServerErrorCodeType) -> String{
+    static func typeOfMessage(type: KMRequestServerErrorCodeType?) -> String {
         var result: String = ""
         switch type {
         case .EXCEPTION_MSG_IMAGE_CODE_ERROR:
@@ -375,14 +375,19 @@ class KMRequestServerManager: NSObject {
                                      "type": verifyCodeType.rawValue,
                                      "appId": "16"]
 
-        KMRequestServer.requestServer.request(urlString: urlString, method: .post, params: params) { requestSerializer in
+        KMRequestServer.requestServer.request(urlString: urlString, method: .get, params: params) { requestSerializer in
             requestSerializer.setValue("Apifox/1.0.0 (https://www.apifox.cn)", forHTTPHeaderField: "User-Agent")
         } completion: { task, responseObject, error in
-//            if (error == nil && responseObject != nil) {
-//                complete((responseObject as! NSDictionary), nil)
-//            } else {
-//                complete(nil, error!)
-//            }
+            if (error == nil && responseObject != nil) {
+                let result = self.dealData(responseObject: responseObject as! NSDictionary)
+                if result.code == 200 {
+                    complete(true, result)
+                } else {
+                    complete(false, result)
+                }
+            } else {
+                complete(false, Result(error: error as NSError?))
+            }
         }
     }