From bc0ed5b6cfda6c72c06f451b77da8518c41ab210 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期四, 20 三月 2025 16:16:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.cs | 73 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 29 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.cs
index 2feaff8..98cc463 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.cs
@@ -36,7 +36,7 @@
private void BtnEditPwd_Click(object sender, EventArgs e)
{
var dlg = new UpdatePwdDlg();
- dlg.SetBindingData(GlobalParas._GlobalParas.LoginID);
+ dlg.SetBindingData(LoginUserInfo.LoginAccountID);
dlg.ShowDialog();
}
@@ -61,25 +61,27 @@
var loginType = await BLLFactory<Yw.BLL.UserLoginType>.Instance.GetByIdentifier(LoginType.SMS);
if (loginType != null)
{
- var isExist = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.IsExist(new IsExistUserLoginAccountInput
- {
- CorpID = GlobalParas._GlobalParas.CorpID,
- LoginTypeID = loginType.ID,
- Identifier = _smsTemplate,
- Credential = this.txtMobileNumber.Text.Trim()
- });
+ var isExist = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.IsExist
+ (
+ Yw.WinFrmUI.LoginUserInfo.CorpID,
+ Yw.WinFrmUI.LoginUserInfo.UserID,
+ _smsTemplate,
+ this.txtMobileNumber.Text.Trim()
+ );
if (isExist)
{
TipFormHelper.ShowError("璐︽埛宸插瓨鍦�!");
return;
}
- var vmo = new Yw.Vmo.AddUserLoginAccountVmo();
- vmo.CorpID = GlobalParas._GlobalParas.CorpID;
- vmo.UserID = GlobalParas._GlobalParas.UserID;
- vmo.LoginTypeID = loginType.ID;
- vmo.Identifier = _smsTemplate;
- vmo.Credential = this.txtMobileNumber.Text.Trim();
- vmo.IfVerified = true;
+ var vmo = new Yw.Vmo.AddUserLoginAccountVmo()
+ {
+ CorpID = Yw.WinFrmUI.LoginUserInfo.CorpID,
+ UserID = Yw.WinFrmUI.LoginUserInfo.UserID,
+ LoginTypeID = loginType.ID,
+ Identifier = _smsTemplate,
+ Credential = this.txtMobileNumber.Text.Trim(),
+ IfVerified = true
+ };
var bol = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.Insert(vmo);
if (bol > 0)
{
@@ -110,26 +112,39 @@
{
var tokenInfo = await BLLFactory<Yw.BLL.ToolWechat>.Instance.GetTokenInfo(code, _vxTemplate);
if (tokenInfo == null)
- return;
- var isExist = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.IsExist(new IsExistUserLoginAccountInput
{
- CorpID = GlobalParas._GlobalParas.CorpID,
- LoginTypeID = loginType.ID,
- Identifier = _vxTemplate,
- Credential = tokenInfo.openid
- });
+ return;
+ }
+ var userInfo = await BLLFactory<Yw.BLL.ToolWechat>.Instance.GetUserInfo(tokenInfo.access_token, tokenInfo.openid);
+ if (userInfo == null)
+ {
+ return;
+ }
+
+ var isExist = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.IsExist
+ (
+ Yw.WinFrmUI.LoginUserInfo.CorpID,
+ loginType.ID,
+ _vxTemplate,
+ tokenInfo.openid
+ );
if (isExist)
{
TipFormHelper.ShowError("璐︽埛宸插瓨鍦�!");
return;
}
- var vmo = new Yw.Vmo.AddUserLoginAccountVmo();
- vmo.CorpID = GlobalParas._GlobalParas.CorpID;
- vmo.UserID = GlobalParas._GlobalParas.UserID;
- vmo.LoginTypeID = loginType.ID;
- vmo.Identifier = _vxTemplate;
- vmo.Credential = tokenInfo.openid;
- vmo.IfVerified = true;
+
+ var vmo = new Yw.Vmo.AddUserLoginAccountVmo()
+ {
+ CorpID = Yw.WinFrmUI.LoginUserInfo.CorpID,
+ UserID = Yw.WinFrmUI.LoginUserInfo.UserID,
+ LoginTypeID = loginType.ID,
+ Identifier = _vxTemplate,
+ Credential = tokenInfo.openid,
+ IfVerified = true,
+ ExtraInfo = JsonHelper.Object2Json(userInfo)
+ };
+
var bol = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.Insert(vmo);
if (bol > 0)
{
--
Gitblit v1.9.3