From 017af840d60fd6a56da9711308bf8239cb7fc1e6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 13 十一月 2020 11:01:01 +0800
Subject: [PATCH] 2020-11-13 1.部分接口替换备份
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index eac7338..5e78b81 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -5,6 +5,7 @@
using HDL_ON.UI.CSS;
using Shared;
using HDL_ON.Entity;
+using HDL_ON.DAL.Server;
namespace HDL_ON.UI.UI1Login
{
@@ -89,7 +90,7 @@
{
//鑾峰彇楠岃瘉鐮�
var result = pm.GetLoginVerCode(phoneNumber);
- if (result.StateCode.ToUpper() == "SUCCESS")
+ if (result.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
{
}
//鐧诲綍澶辫触
@@ -858,7 +859,7 @@
bool LoadMethod_Login()
{
var result = false;
- ResponsePack loginResult;
+ ResponsePackNew loginResult;
if (logintMode == 0 || loginType == 1)
{
//璋冪敤鐧诲綍鎺ュ彛
@@ -869,21 +870,19 @@
//璋冪敤楠岃瘉鐮佺櫥褰曟帴鍙�
loginResult = pm.LoginValidCode(account, password);
}
- if (loginResult.StateCode.ToUpper() == "SUCCESS")
+ if (loginResult.Code == HttpUtil.SUCCESS_CODE)
{
- var loginDataStr = Newtonsoft.Json.Linq.JObject.FromObject(loginResult.ResponseData);
-
- //璁板綍鐢ㄦ埛鏁版嵁
+ var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
MainPage.LoginUser = new UserInfo
{
- ID = (int)loginDataStr.GetValue("UserID"),
- masterID = (int)loginDataStr.GetValue("MainUserID"),
- accountType = (int)loginDataStr.GetValue("UserType"),
- loginTokenString = loginDataStr.GetValue("Token").ToString(),
+ userType = revertData.userType,
accountString = account,
password = password,
lastTime = DateTime.Now,
- userName = loginDataStr.GetValue("Remark").ToString(),
+ ID = revertData.userId,
+ loginTokenString = revertData.headerPrefix + revertData.accessToken,
+ refreshToken = revertData.refreshToken,
+ userName = revertData.name
};
MainPage.LoginUser.SaveUserInfo();
MainPage.Log("鐧诲綍鎴愬姛銆�");
@@ -898,8 +897,9 @@
//鐧诲綍澶辫触
else
{
+ //2020-11-12 寰呬慨鏀�
string tipStr = "Sever erorr";
- switch (loginResult.StateCode)
+ switch (loginResult.Code)
{
case "ValidCodeAndPhoneNoEqual":
tipStr = Language.StringByID(StringId.VerificationCodeError);
@@ -957,7 +957,7 @@
var result = false;
var responsePack = pm.GetHomePager();
- if (responsePack == "Success")
+ if (responsePack == HttpUtil.SUCCESS_CODE)
{
result = true;
}
--
Gitblit v1.8.0