登录相关内容修复

Asteria/Fuction/Login/VC/AS_ForgotC.m

@@ -84,7 +84,7 @@
                 [self handle_closeEvent];
             } ViewController:self];
         }else{
-            [self.view makeToast:RequestErrorMsg duration:2 position:CSToastPositionCenter];
+            [self.view makeToast:RequestMsg duration:2 position:CSToastPositionCenter];
         }
     } failure:^(NSError *error) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];

Asteria/Fuction/Login/VC/AS_LoginC.m

@@ -82,6 +82,18 @@
     params[@"username"] = self.xxx_emailTFV.xxx_emailTF.text;
     params[@"password"] = self.xxx_passwordV.xxx_passwordTF.text;
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    [ASNetTools xxx_loginWithParam:params success:^(id _Nonnull result) {
+        [MBProgressHUD hideHUDForView :self.view animated:YES];
+        @weakify(self)
+        [self.view makeToast:@"Login Suecess" duration:2 position:CSToastPositionCenter title:nil image:nil style:nil completion:^(BOOL didTap) {
+            @strongify(self)
+            [self handle_closeEvent:nil];
+        }];
+    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+        [MBProgressHUD hideHUDForView :self.view animated:YES];
+        [self.view makeToast:msg duration:2 position:CSToastPositionCenter];
+    }];
+    /*
     [PPNetworkHelper POST:urlStr parameters:params success:^(id responseObject) {
         [MBProgressHUD hideHUDForView :self.view animated:YES];
         NSDictionary *tmpDic= responseObject;
@@ -115,6 +127,7 @@
             [self.view makeToast:errorMsg duration:2 position:CSToastPositionCenter];
         }
     }];
+     */
 }
 
 

Asteria/NetTools/ASNetApis.h

@@ -16,7 +16,8 @@
 
 // MARK: - host
 #if (DEBUG)
-#define HostPath @"www.bilisar.com"//@"https://www.bilisar.com/"  //测试
+//#define HostPath @"www.bilisar.com"//@"https://www.bilisar.com/"  //测试
+#define HostPath @"pc.bilisar.com"  //正式
 #else
 #define HostPath @"pc.bilisar.com"//@"https://pc.bilisar.com/"  //正式
 #endif

Asteria/NetTools/ASNetTools.h

@@ -35,6 +35,10 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)login;
 + (void)debugRegist;
 
++(void)xxx_loginWithParam:(NSDictionary *)param
+                 success:(void(^)(id))success
+                   faild:(void(^)(NSString *code, NSString *msg))faild;
+
 
 @end
 

Asteria/NetTools/ASNetTools.m

@@ -347,4 +347,20 @@
     }];
 }
 
++(void)xxx_loginWithParam:(NSDictionary *)param
+                 success:(void(^)(id))success
+                   faild:(void(^)(NSString *code, NSString *msg))faild {
+    [ASNetTools.shared postWithPath:loginUrl param:param success:^(id _Nonnull result) {
+        NSString *token = [NSString stringWithFormat:@"Bearer %@", result];
+        [DataUtil setLoginToken:token];
+        [ASNetTools.shared updateEngine];
+        [ASUserInfoManager.shared getInfo];
+        success(result);
+        NSLog(@"----url:%@-----result:%@------", loginUrl, result);
+    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+        NSLog(@"----url:%@-----code:%@----msg:%@--", loginUrl, code, msg);
+        faild(code,msg);
+    }];
+}
+
 @end

Asteria/Product/Config/ProjectConfigDefine.h

@@ -11,13 +11,12 @@
 ///wm_tips 所有的pod模块的特定化依赖，每个Project修改，额、
 
 ///AS 服务器
-#define AS_WebSever @"https://pc.bilisar.com"
-#define AS_Server @"https://pc.bilisar.com/rest/"
+#define AS_Server ([NSString stringWithFormat:@"https://%@/rest/",HostPath])
 
 
-#define RequestSuccess ([responseObject[@"code"] integerValue] == 200 || [responseObject[@"success"] boolValue] == true)
+#define RequestSuccess ([responseObject[@"status"] integerValue] == 1)
 #define RequestNoLogin [responseObject[@"code"] integerValue] ==-1
-#define RequestErrorMsg responseObject[@"msg"]
+#define RequestMsg responseObject[@"msg"]
 
 #define ReqNetWorkFaild @"Network request failed"