lixiaojun
2025-02-25 c1822a7c36d07678d28636af8004e2530c902c70
user register
已添加1个文件
已修改6个文件
113 ■■■■ 文件已修改
Desktop/HStation.Desktop.Xhs.Core/Login/LoginFrm.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Desktop/HStation.Desktop.Xhs.Core/Login/LoginHelper.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Desktop/HStation.Desktop.Xhs.Core/MainForm.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Desktop/HStation.Desktop.Xhs.Core/Program.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Dict.Core/HStation.WinFrmUI.Dict.Core.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Core/99-global/LoginUserInfo.cs 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Unit.Core/Yw.WinFrmUI.Unit.Core.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Desktop/HStation.Desktop.Xhs.Core/Login/LoginFrm.cs
@@ -71,22 +71,15 @@
                return;
            }
            this.Invoke(() =>
            {
                var threadId = Thread.CurrentThread.ManagedThreadId;
                Yw.Untity.UserRegister.Regist
                   (
                       result.User.Corpration.ID,
                       result.User.ID,
                       (int)result.User.AdminType,
                       result.User.Name,
                       result.User.Tag,
                       result.User.LoginAccount.ID,
                       result.User.LoginAccount.LoginType.ID,
                       result.Software.Project.ID,
                       result.Software.ID
                   );
            });
            Yw.WinFrmUI.LoginUserInfo.CorpID = result.User.Corpration.ID;
            Yw.WinFrmUI.LoginUserInfo.UserID = result.User.ID;
            Yw.WinFrmUI.LoginUserInfo.AdminType = result.User.AdminType;
            Yw.WinFrmUI.LoginUserInfo.UserName = result.User.Name;
            Yw.WinFrmUI.LoginUserInfo.UserTag = result.User.Tag;
            Yw.WinFrmUI.LoginUserInfo.LoginAccountID = result.User.LoginAccount.ID;
            Yw.WinFrmUI.LoginUserInfo.LoginTypeID = result.User.LoginAccount.LoginType.ID;
            Yw.WinFrmUI.LoginUserInfo.ProjectID = result.Software.Project.ID;
            Yw.WinFrmUI.LoginUserInfo.SoftwareID = result.Software.ID;
            Yw.JwtToken2Helper.Set(result.AccessToken, result.RefreshToken);
@@ -106,5 +99,7 @@
                login.Initial();
            }
        }
    }
}
Desktop/HStation.Desktop.Xhs.Core/Login/LoginHelper.cs
@@ -5,6 +5,7 @@
    /// </summary>
    public class LoginHelper
    {
        /// <summary>
        /// ç™»å½•
        /// </summary>
Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
@@ -10,6 +10,7 @@
using HStation.WinFrmUI.Dict;
using HStation.WinFrmUI.Xhs.PumpProduct;
using System.IO;
using Yw;
using Yw.WinFrmUI;
using Yw.WinFrmUI.Page;
@@ -23,6 +24,7 @@
            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
        }
        //验证权限
        private void VerifyAuth()
        {
Desktop/HStation.Desktop.Xhs.Core/Program.cs
@@ -76,21 +76,25 @@
                #endregion
                if (!LoginHelper.Login())
                {
                    return;
                }
                // Yw.FileFolderZipHelper.Zip(@"C:\Users\ZKC\Desktop\循环水用例", @"C:\Users\ZKC\Desktop\循环水用例.ywrvt");
                //Yw.FileFolderZipHelper.Zip(@"C:\Users\Eventech\Desktop\循环水用例", @"C:\Users\Eventech\Desktop\循环水用例.ywrvt");
                // Yw.FileFolderZipHelper.Zip(@"C:\Users\admin\Desktop\居家办公工作\循环水用例", @"C:\Users\admin\Desktop\居家办公工作\循环水用例.ywrvt");
                //Yw.FileFolderZipHelper.Zip(@"C:\Users\admin\Desktop\居家办公工作\简单用例", @"C:\Users\admin\Desktop\居家办公工作\简单用例.ywrvt");
                Yw.Untity.UserRegister.Regist
                       (
                           Yw.WinFrmUI.LoginUserInfo.CorpID,
                           Yw.WinFrmUI.LoginUserInfo.UserID,
                           (int)Yw.WinFrmUI.LoginUserInfo.AdminType,
                           Yw.WinFrmUI.LoginUserInfo.UserName,
                           Yw.WinFrmUI.LoginUserInfo.UserTag,
                           Yw.WinFrmUI.LoginUserInfo.LoginAccountID,
                           Yw.WinFrmUI.LoginUserInfo.LoginTypeID,
                           Yw.WinFrmUI.LoginUserInfo.ProjectID,
                           Yw.WinFrmUI.LoginUserInfo.SoftwareID
                       );
                //var json = RevitTestHelper.GenerateJson();
                //var jsonFileName = @"C:\Users\admin\Desktop\居家办公工作\二开压缩文件\hydro.json";
                //var jsonContent = File.ReadAllText(jsonFileName);
                //var jsonModel = JsonHelper.Json2Object<HStation.Model.RevitModel>(jsonContent);
                //扫描全局DTO映射
                TypeAdapterConfig.GlobalSettings.Scan
                    (
WinFrmUI/HStation.WinFrmUI.Dict.Core/HStation.WinFrmUI.Dict.Core.csproj
@@ -8,7 +8,7 @@
  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Dict.Core" Version="3.1.2" />
    <PackageReference Include="Yw.BLL.Dict.Core" Version="3.1.3" />
  </ItemGroup>
  <ItemGroup>
WinFrmUI/Yw.WinFrmUI.Core/99-global/LoginUserInfo.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
using Yw.Model;
namespace Yw.WinFrmUI
{
    /// <summary>
    /// ç™»å½•用户信息
    /// </summary>
    public class LoginUserInfo
    {
        /// <summary>
        /// å®¢æˆ·ID
        /// </summary>
        public static long CorpID { get; set; }
        /// <summary>
        /// ç”¨æˆ·ID
        /// </summary>
        public static long UserID { get; set; }
        /// <summary>
        /// æƒé™ç±»åž‹
        /// </summary>
        public static eAdminType AdminType { get; set; }
        /// <summary>
        /// ç”¨æˆ·åç§°
        /// </summary>
        public static string UserName { get; set; }
        /// <summary>
        /// ç”¨æˆ·æ ‡å¿—
        /// </summary>
        public static string UserTag { get; set; }
        /// <summary>
        /// ç™»å½•账户ID
        /// </summary>
        public static long LoginAccountID { get; set; }
        /// <summary>
        /// ç™»å½•类型ID
        /// </summary>
        public static long LoginTypeID { get; set; }
        /// <summary>
        /// é¡¹ç›®ID
        /// </summary>
        public static long ProjectID { get; set; }
        /// <summary>
        /// è½¯ä»¶ID
        /// </summary>
        public static long SoftwareID { get; set; }
    }
}
WinFrmUI/Yw.WinFrmUI.Unit.Core/Yw.WinFrmUI.Unit.Core.csproj
@@ -19,7 +19,7 @@
  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Unit.Core" Version="3.0.6" />
    <PackageReference Include="Yw.BLL.Unit.Core" Version="3.0.7" />
  </ItemGroup>
  <ItemGroup>