diff --git a/EOM.TSHotelManagement.Common/BackendApi/ApiConstants.cs b/EOM.TSHotelManagement.Common/BackendApi/ApiConstants.cs index cfc9123ad7bb3d118f7627c3ca09c5384c58f698..fd0544abbbe1106ec36e64fa8d9266407f0d6e1b 100644 --- a/EOM.TSHotelManagement.Common/BackendApi/ApiConstants.cs +++ b/EOM.TSHotelManagement.Common/BackendApi/ApiConstants.cs @@ -16,6 +16,7 @@ public const string Employee_SelectEmployeeInfoByEmployeeId = "Employee/SelectEmployeeInfoByEmployeeId"; public const string Employee_UpdateEmployee = "Employee/UpdateEmployee"; public const string Employee_SelectEmployeeInfoByEmployeeIdAndEmployeePwd = "Employee/SelectEmployeeInfoByEmployeeIdAndEmployeePwd"; + public const string Employee_UpdateEmployeeAccountPassword= "Employee/UpdateEmployeeAccountPassword"; // EmployeePhoto URLs public const string EmployeePhoto_EmployeePhoto = "EmployeePhoto/EmployeePhoto"; @@ -78,8 +79,8 @@ public const string EnergyManagement_SelectEnergyManagementInfo = "EnergyManagement/SelectEnergyManagementInfo"; public const string EnergyManagement_InsertEnergyManagementInfo = "EnergyManagement/InsertEnergyManagementInfo"; - // Fonts - public const string Fonts_SelectPromotionContentAll = "Fonts/SelectPromotionContentAll"; + // PromotionContent + public const string PromotionContent_SelectPromotionContents = "PromotionContent/SelectPromotionContents"; // NavBar public const string NavBar_NavBarList = "NavBar/NavBarList"; diff --git a/EOM.TSHotelManagement.Common/LocalInfo/LoginInfo.cs b/EOM.TSHotelManagement.Common/LocalInfo/LoginInfo.cs index 114dfc2d45891c2919d54faec5fccb7d21c913e9..bd3a346a4017746cb924efe1453046844c37d173 100644 --- a/EOM.TSHotelManagement.Common/LocalInfo/LoginInfo.cs +++ b/EOM.TSHotelManagement.Common/LocalInfo/LoginInfo.cs @@ -58,5 +58,10 @@ namespace EOM.TSHotelManagement.Common /// 存储当前用户Token /// public static string UserToken = ""; + + /// + /// 软件更新日志 + /// + public static string SoftwareReleaseLog = ""; } } diff --git a/EOM.TSHotelManagement.Common/Util/RecordHelper.cs b/EOM.TSHotelManagement.Common/Util/RecordHelper.cs index d03cda58f28865b8adfab11bb44d23953c2bc59d..a20c925395b7d37d5e32eae2dc3b924fbb9521d6 100644 --- a/EOM.TSHotelManagement.Common/Util/RecordHelper.cs +++ b/EOM.TSHotelManagement.Common/Util/RecordHelper.cs @@ -13,7 +13,7 @@ namespace EOM.TSHotelManagement.Common /// /// /// - public static void Record(string operationLog, int level) + public static void Record(string operationLog, LogLevel level) { string api = ApiConstants.Utility_AddLog; var logDetail = new CreateOperationLogInputDto @@ -21,7 +21,7 @@ namespace EOM.TSHotelManagement.Common OperationTime = Convert.ToDateTime(DateTime.Now), LogContent = operationLog, OperationAccount = LoginInfo.WorkerNo, - LogLevel = level == 1 ? LogLevel.Normal : level == 2 ? LogLevel.Warning : LogLevel.Critical, + LogLevel = level, SoftwareVersion = LoginInfo.SoftwareVersion, IsDelete = 0, DataInsUsr = LoginInfo.WorkerNo, diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs index b5acdeac3764e81dfa6653831738fef8983322d5..0b1c687960d1f09cc46cd5b549c9e63ec1891d41 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs @@ -29,29 +29,29 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAboutUs)); - uiRichTextBox1 = new Sunny.UI.UIRichTextBox(); + rtbAboutUs = new Sunny.UI.UIRichTextBox(); btnOk = new AntdUI.Button(); SuspendLayout(); // - // uiRichTextBox1 + // rtbAboutUs // - uiRichTextBox1.BulletIndent = 5; - uiRichTextBox1.FillColor = Color.White; - uiRichTextBox1.Font = new Font("微软雅黑", 12F); - uiRichTextBox1.HideSelection = false; - uiRichTextBox1.Location = new Point(3, 2); - uiRichTextBox1.Margin = new Padding(3, 4, 3, 4); - uiRichTextBox1.MinimumSize = new Size(1, 1); - uiRichTextBox1.Name = "uiRichTextBox1"; - uiRichTextBox1.Padding = new Padding(1, 2, 1, 2); - uiRichTextBox1.Radius = 10; - uiRichTextBox1.ReadOnly = true; - uiRichTextBox1.ScrollBarStyleInherited = false; - uiRichTextBox1.ShowText = false; - uiRichTextBox1.Size = new Size(385, 146); - uiRichTextBox1.Style = Sunny.UI.UIStyle.Custom; - uiRichTextBox1.TabIndex = 0; - uiRichTextBox1.TextAlignment = ContentAlignment.MiddleCenter; + rtbAboutUs.BulletIndent = 5; + rtbAboutUs.FillColor = Color.White; + rtbAboutUs.Font = new Font("微软雅黑", 12F); + rtbAboutUs.HideSelection = false; + rtbAboutUs.Location = new Point(3, 2); + rtbAboutUs.Margin = new Padding(3, 4, 3, 4); + rtbAboutUs.MinimumSize = new Size(1, 1); + rtbAboutUs.Name = "rtbAboutUs"; + rtbAboutUs.Padding = new Padding(1, 2, 1, 2); + rtbAboutUs.Radius = 10; + rtbAboutUs.ReadOnly = true; + rtbAboutUs.ScrollBarStyleInherited = false; + rtbAboutUs.ShowText = false; + rtbAboutUs.Size = new Size(385, 146); + rtbAboutUs.Style = Sunny.UI.UIStyle.Custom; + rtbAboutUs.TabIndex = 0; + rtbAboutUs.TextAlignment = ContentAlignment.MiddleCenter; // // btnOk // @@ -71,8 +71,8 @@ BackColor = Color.FromArgb(235, 243, 255); ClientSize = new Size(390, 192); Controls.Add(btnOk); - Controls.Add(uiRichTextBox1); - FormBorderStyle = FormBorderStyle.SizableToolWindow; + Controls.Add(rtbAboutUs); + FormBorderStyle = FormBorderStyle.FixedSingle; Icon = (Icon)resources.GetObject("$this.Icon"); Margin = new Padding(2); Name = "FrmAboutUs"; @@ -86,7 +86,7 @@ #endregion - private Sunny.UI.UIRichTextBox uiRichTextBox1; + private Sunny.UI.UIRichTextBox rtbAboutUs; private AntdUI.Button btnOk; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs index 3eb87dac6df3fbcc06f8ff64934b98358d0a9f23..356cf88cd9a17495f1a02d70be5af4537c237a30 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs @@ -22,6 +22,7 @@ * */ using AntdUI; +using EOM.TSHotelManagement.Common.Util; namespace EOM.TSHotelManagement.FormUI { @@ -60,7 +61,8 @@ namespace EOM.TSHotelManagement.FormUI private void FrmAboutUs_Load(object sender, EventArgs e) { - uiRichTextBox1.Text = " 我们团队一直都致力于打造一款人机交互方便，操作简单的管理软件，我们的愿景是“用技术创造易用的开源软件/组件”，一路心怀愿景去制作软件，我们的团队充满活力、激情！\r\n 关于我们团队，您可以浏览：https://www.oscode.top了解更多！ \r\n 关于本软件的详细信息，您可以浏览：https://gitee.com/java-and-net/TopskyHotelManagerSystem 了解更多！另外仍会提供后续的版本升级支持！"; + rtbAboutUs.Text = LocalizationHelper.GetLocalizedString("Our team has always been committed to creating a user-friendly and easy-to-use management software. Our vision is to use technology to create easy-to-use open source software/components and to create software with a vision in mind. Our team is full of vitality and passion!\r\n Regarding our team, you can browse: https://www.oscode.top Learn more! \r\n For detailed information about this software, you can browse: https://gitee.com/java-and-net/TopskyHotelManagerSystem Learn more! In addition, we will still provide support for future version upgrades!", + " 我们团队一直都致力于打造一款人机交互方便，操作简单的管理软件，我们的愿景是“用技术创造易用的开源软件/组件”，一路心怀愿景去制作软件，我们的团队充满活力、激情！\r\n 关于我们团队，您可以浏览：https://www.oscode.top了解更多！ \r\n 关于本软件的详细信息，您可以浏览：https://gitee.com/java-and-net/TopskyHotelManagerSystem 了解更多！另外仍会提供后续的版本升级支持！"); } private void btnOk_Click(object sender, EventArgs e) diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs index 7fa67a5e49772484c80d4f1f1e5f3fdd7fe1d710..82aa20fa01ca5a5d9dc31f8182a71489dc43ff1f 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs @@ -88,7 +88,7 @@ namespace EOM.TSHotelManagement.FormUI FrmRoomManager.Reload(""); FrmRoomManager._RefreshRoomCount(); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + transferRoom.DataChgDate + "位于" + LoginInfo.SoftwareVersion + "执行：" + transferRoom.CustomerNumber + "于" + transferRoom.DataChgDate + "进行了换房！", 2); + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + transferRoom.DataChgDate + "位于" + LoginInfo.SoftwareVersion + "执行：" + transferRoom.CustomerNumber + "于" + transferRoom.DataChgDate + "进行了换房！", Common.Core.LogLevel.Warning); #endregion UIMessageBox.ShowSuccess("转房成功"); this.Close(); diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs index ee628c6f8e61226f36240a1621c80a5c3e70a018..bcd8850f1484594db5be93c23f03ce0a5b19965a 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs @@ -194,7 +194,7 @@ namespace EOM.TSHotelManagement.FormUI { UpdateRoomInputDto r = new UpdateRoomInputDto() { - LastCheckInTime = Convert.ToDateTime(Convert.ToDateTime(DateTime.Now).ToString("yyyy-MM-dd HH:mm:ss")), + LastCheckInTime = DateOnly.FromDateTime(DateTime.Now), CustomerNumber = txtCustoNo.Text, RoomStateId = (int)RoomState.Occupied, RoomNumber = txtRoomNo.Text, @@ -213,7 +213,7 @@ namespace EOM.TSHotelManagement.FormUI FrmRoomManager.Reload(""); FrmRoomManager._RefreshRoomCount(); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerClub + "-" + LoginInfo.WorkerPosition + "-" + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + r.CustomerNumber + "进行了入住操作！", 1); + RecordHelper.Record(LoginInfo.WorkerClub + "-" + LoginInfo.WorkerPosition + "-" + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + r.CustomerNumber + "进行了入住操作！", Common.Core.LogLevel.Normal); #endregion scope.Complete(); this.Close(); diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs index 945be43c82f720cbca88f2279158ab7c32e760fc..18755e5fc9044d0845bd5233a31ea8564834423f 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs @@ -296,7 +296,7 @@ namespace EOM.TSHotelManagement.FormUI FrmRoomManager._RefreshRoomCount(); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerClub + "-" + LoginInfo.WorkerPosition + "-" + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + txtCustomerNumber.Text + "进行了退房结算操作！", 3); + RecordHelper.Record(LoginInfo.WorkerClub + "-" + LoginInfo.WorkerPosition + "-" + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + txtCustomerNumber.Text + "进行了退房结算操作！", Common.Core.LogLevel.Critical); #endregion this.Close(); } diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs index d3ea1c1304bcb83dbc6ebdb22b030512ca26d89e..26fbfe1d23271789e49566286d6a20de2b614c72 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs @@ -131,7 +131,7 @@ namespace EOM.TSHotelManagement.FormUI CustomerNumber = txtCustoNo.Text, CustomerName = txtCustoName.Text, CustomerGender = Convert.ToInt32(cbSex.SelectedValue.ToString()), - DateOfBirth = dtpBirthday.Value.Date, + DateOfBirth = DateOnly.FromDateTime(dtpBirthday.Value.Date), CustomerType = Convert.ToInt32(cbCustoType.SelectedValue.ToString()), PassportId = Convert.ToInt32(cbPassportType.SelectedValue), IdCardNumber = txtCardID.Text, @@ -151,7 +151,7 @@ namespace EOM.TSHotelManagement.FormUI UIMessageBox.Show("修改成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "修改了一名客户信息，客户编号为：" + custo.CustomerNumber, 3); + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "修改了一名客户信息，客户编号为：" + custo.CustomerNumber, Common.Core.LogLevel.Critical); #endregion this.Close(); FrmCustomerManager.ReloadCustomer(false); @@ -199,7 +199,7 @@ namespace EOM.TSHotelManagement.FormUI UIMessageBox.Show("添加成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK); FrmCustomerManager.ReloadCustomer(false); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "添加了一名客户，客户编号为：" + custo.CustomerNumber, 3); + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "添加了一名客户，客户编号为：" + custo.CustomerNumber, Common.Core.LogLevel.Critical); #endregion this.Close(); diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.Designer.cs index 9881f6f11fbca0ca58c4a00bf7fcc19c490f71b9..7c21ae0b90eebc6aac3201d553b053efa394f735 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.Designer.cs @@ -51,7 +51,13 @@ namespace EOM.TSHotelManagement.FormUI uiTabControlMenu2 = new Sunny.UI.UITabControlMenu(); tabPage1 = new TabPage(); tabPage2 = new TabPage(); - label3 = new AntdUI.Label(); + avatar3 = new AntdUI.Avatar(); + txtOldPassword = new AntdUI.Input(); + lblEmployeeId = new AntdUI.Label(); + avatar2 = new AntdUI.Avatar(); + avatar1 = new AntdUI.Avatar(); + btnUpdatePassword = new AntdUI.Button(); + txtNewPassword = new AntdUI.Input(); tabPage3 = new TabPage(); label4 = new AntdUI.Label(); picWorkerPic = new PictureBox(); @@ -369,7 +375,13 @@ namespace EOM.TSHotelManagement.FormUI // // tabPage2 // - tabPage2.Controls.Add(label3); + tabPage2.Controls.Add(avatar3); + tabPage2.Controls.Add(txtOldPassword); + tabPage2.Controls.Add(lblEmployeeId); + tabPage2.Controls.Add(avatar2); + tabPage2.Controls.Add(avatar1); + tabPage2.Controls.Add(btnUpdatePassword); + tabPage2.Controls.Add(txtNewPassword); tabPage2.Location = new Point(201, 0); tabPage2.Name = "tabPage2"; tabPage2.Size = new Size(728, 546); @@ -377,13 +389,83 @@ namespace EOM.TSHotelManagement.FormUI tabPage2.Text = "账号安全"; tabPage2.UseVisualStyleBackColor = true; // - // label3 - // - label3.Location = new Point(210, 255); - label3.Name = "label3"; - label3.Size = new Size(308, 36); - label3.TabIndex = 0; - label3.Text = "功能升级，重置密码需联系管理员进行！"; + // avatar3 + // + avatar3.Image = (Image)resources.GetObject("avatar3.Image"); + avatar3.ImageFit = AntdUI.TFit.None; + avatar3.Location = new Point(224, 204); + avatar3.Name = "avatar3"; + avatar3.Size = new Size(45, 43); + avatar3.TabIndex = 47; + avatar3.Text = "a"; + // + // txtOldPassword + // + txtOldPassword.BackColor = Color.White; + txtOldPassword.Font = new Font("Microsoft YaHei UI", 14F); + txtOldPassword.Location = new Point(267, 201); + txtOldPassword.Name = "txtOldPassword"; + txtOldPassword.PasswordChar = '*'; + txtOldPassword.PasswordCopy = true; + txtOldPassword.PlaceholderColorExtend = ""; + txtOldPassword.PlaceholderText = ""; + txtOldPassword.Size = new Size(238, 52); + txtOldPassword.TabIndex = 46; + // + // lblEmployeeId + // + lblEmployeeId.Location = new Point(267, 131); + lblEmployeeId.Name = "lblEmployeeId"; + lblEmployeeId.Size = new Size(238, 43); + lblEmployeeId.TabIndex = 45; + lblEmployeeId.Text = ""; + lblEmployeeId.TextAlign = ContentAlignment.MiddleCenter; + // + // avatar2 + // + avatar2.Image = (Image)resources.GetObject("avatar2.Image"); + avatar2.ImageFit = AntdUI.TFit.None; + avatar2.Location = new Point(224, 284); + avatar2.Name = "avatar2"; + avatar2.Size = new Size(45, 43); + avatar2.TabIndex = 44; + avatar2.Text = "a"; + // + // avatar1 + // + avatar1.Image = (Image)resources.GetObject("avatar1.Image"); + avatar1.ImageFit = AntdUI.TFit.None; + avatar1.Location = new Point(224, 131); + avatar1.Name = "avatar1"; + avatar1.Size = new Size(45, 43); + avatar1.TabIndex = 43; + avatar1.Text = "a"; + // + // btnUpdatePassword + // + btnUpdatePassword.Font = new Font("Microsoft YaHei UI", 12F); + btnUpdatePassword.Location = new Point(277, 358); + btnUpdatePassword.Name = "btnUpdatePassword"; + btnUpdatePassword.Radius = 8; + btnUpdatePassword.Shape = AntdUI.TShape.Round; + btnUpdatePassword.Size = new Size(191, 57); + btnUpdatePassword.TabIndex = 42; + btnUpdatePassword.Text = "修改密码"; + btnUpdatePassword.Type = AntdUI.TTypeMini.Primary; + btnUpdatePassword.Click += btnUpdatePassword_Click; + // + // txtNewPassword + // + txtNewPassword.BackColor = Color.White; + txtNewPassword.Font = new Font("Microsoft YaHei UI", 14F); + txtNewPassword.Location = new Point(267, 280); + txtNewPassword.Name = "txtNewPassword"; + txtNewPassword.PasswordChar = '*'; + txtNewPassword.PasswordCopy = true; + txtNewPassword.PlaceholderColorExtend = ""; + txtNewPassword.PlaceholderText = ""; + txtNewPassword.Size = new Size(238, 52); + txtNewPassword.TabIndex = 41; // // tabPage3 // @@ -462,7 +544,13 @@ namespace EOM.TSHotelManagement.FormUI private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.TabPage tabPage3; private System.Windows.Forms.PictureBox picWorkerPic; - private AntdUI.Label label3; private AntdUI.Label label4; + private AntdUI.Label lblEmployeeId; + private AntdUI.Avatar avatar2; + private AntdUI.Avatar avatar1; + private AntdUI.Button btnUpdatePassword; + private AntdUI.Input txtNewPassword; + private AntdUI.Avatar avatar3; + private AntdUI.Input txtOldPassword; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs index 49baf1437f79beb7d5cf4badb391ad2bd952c5fb..d71c19dcae81d08434784fc5a694a6a9ab252288 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs @@ -22,8 +22,10 @@ * */ +using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; +using EOM.TSHotelManagement.Common.Util; using jvncorelib.EncryptorLib; using jvncorelib.EntityLib; using Sunny.UI; @@ -100,6 +102,11 @@ namespace EOM.TSHotelManagement.FormUI cboWorkerPosition.DataSource = positions.listSource; cboWorkerPosition.DisplayMember = nameof(ReadPositionOutputDto.PositionName); cboWorkerPosition.ValueMember = nameof(ReadPositionOutputDto.PositionNumber); + + lblEmployeeId.Text = LoginInfo.WorkerNo; + txtOldPassword.PlaceholderText = LocalizationHelper.GetLocalizedString("Please input old password", "请输入旧密码"); + txtNewPassword.PlaceholderText = LocalizationHelper.GetLocalizedString("Please input new password", "请输入新密码"); + LoadData(); } @@ -204,7 +211,7 @@ namespace EOM.TSHotelManagement.FormUI } UIMessageBox.Show("修改成功！", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "修改个人信息操作！", 2); + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "修改个人信息操作！", Common.Core.LogLevel.Warning); #endregion LoadData(); return; @@ -274,5 +281,31 @@ namespace EOM.TSHotelManagement.FormUI UIMessageTip.ShowOk("头像上传成功！稍等将会加载头像哦.."); picWorkerPic.Load(response.Source.PhotoPath); } + + private void btnUpdatePassword_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(txtOldPassword.Text) || string.IsNullOrEmpty(txtNewPassword.Text)) + { + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("Please input new password or old password", "请输入旧密码或新密码"), TType.Error); + return; + } + + var request = HttpHelper.Request(ApiConstants.Employee_UpdateEmployeeAccountPassword, HttpHelper.ModelToJson(new UpdateEmployeeInputDto + { + EmployeeId = LoginInfo.WorkerNo, + OldPassword = txtOldPassword.Text.Trim(), + Password = txtNewPassword.Text.Trim(), + DataChgDate = DateTime.Now, + DataChgUsr = LoginInfo.WorkerNo + })); + var response = HttpHelper.JsonToModel(request.message); + if (response.StatusCode != StatusCodeConstants.Success) + { + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString($"{ApiConstants.Employee_UpdateEmployeeAccountPassword}+Interface service exception, please submit an issue or try updating the version!", $"{ApiConstants.Employee_UpdateEmployeeAccountPassword}+接口服务异常，请提交Issue或尝试更新版本！")); + return; + } + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("Update password success", "更新密码成功"), TType.Success); + return; + } } } diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.resx index 14dcb3b6a00cffded4ba438fe925a51c991f93e6..962430fd9866e5e33f0bab916bc3df5ed0b09fc9 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.resx +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.resx @@ -121,6 +121,42 @@ 17, 17 + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAATBJREFUWEfl + l8ENgzAMRVkAxAgdpaMwRFP12E0YpaNwzBitHIXWNSY/wUGo6pN8QHYcYyc2NM0v0t/8qbv6exDnx9b5 + ob/4s7SrDm3cOv/onH+uyEQ2cl0V6C2VDTWZKDNyvQlKL9+EsjCnPGZliOX4ZKJmSb7Snng7GYTUb0Kk + fpR6CdmwTA1SXwx3KHUa4YawUkl9MeFQFaaUlSx7zSol6Z/hZ0bqitkSQGnZkvxnALzPswDoMNJzjswH + NwROknUlY8fji2tLelaAQVNL9KtZvYEw5BRV5wRvuVn1KoT7PzwA1T80MAL9QwMj0D80MAL9QwMj0D80 + MAL9QwMj0D80MAL98y9f1cAIDkC04uTQKGTRijXf0mgvSc6ZmIV9x7E2BzjvP53lR4ZNEj80h/ICfjHx + PxFMstQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAATBJREFUWEfl + l8ENgzAMRVkAxAgdpaMwRFP12E0YpaNwzBitHIXWNSY/wUGo6pN8QHYcYyc2NM0v0t/8qbv6exDnx9b5 + ob/4s7SrDm3cOv/onH+uyEQ2cl0V6C2VDTWZKDNyvQlKL9+EsjCnPGZliOX4ZKJmSb7Snng7GYTUb0Kk + fpR6CdmwTA1SXwx3KHUa4YawUkl9MeFQFaaUlSx7zSol6Z/hZ0bqitkSQGnZkvxnALzPswDoMNJzjswH + NwROknUlY8fji2tLelaAQVNL9KtZvYEw5BRV5wRvuVn1KoT7PzwA1T80MAL9QwMj0D80MAL9QwMj0D80 + MAL9QwMj0D80MAL98y9f1cAIDkC04uTQKGTRijXf0mgvSc6ZmIV9x7E2BzjvP53lR4ZNEj80h/ICfjHx + PxFMstQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAg1JREFUWEe1 + VrtKA0EUTZmkERStxEfhT1iIra3+QFo7s4pEURL9AUEQQfDR2wkWVkkhCDZ2WlikESbZoAmILyKM3GVn + c/eYye7sbA6cIpuZ+753biZjgeyamMFvQwUpzDuikiuKas4R0medfucdcT5UgzzFPaU61ukc3rUGeCxH + S43W0nG7tnLWeVg4fHue23fraAjKSAyufGSzIY5uv8X9i5TIvZtPObHdbKuzqUQiuyEWlcDpsvuESpFX + j79ycrf5paJA91GmEXhYSTgq7MeTu59eKoqiijJjgypaCdq5/mihokGcP3i1r4WsIwqm3iuuXr4HUUic + BuprJQQVRJGnwcaAoO9NI0AdERjgiALKjgXeAeQRKhnEUAqSTkdehMunnX9KBpEVoUS5RvDmvCPkVNnt + xo0C957qCGUagadhtuJG1kJoBth6r8C7gYwgD1ExGcY9JyaufoRXC/AYEcdKDTm+1Qh9U0zlHeDwC7KG + ivqwm18XF3jfCjH3AKT9XqAJvdp+KpRjOkODps+W5DGxEXwGmAgLVjYwGs9FAnc+04r22zfYkozmQUi5 + xXvuRzEwItabwAePdynpHPcB8qJTwb03DbsOvCYi6yiN0CMgFfoo8A0oVr4MECuyfObb5h7B06B1jluJ + /9mCF6O2DoI8pZh/BT7YtDNBRUB7wBLKQa18NUbTzr+Cko/f/wBMTh9auuIjhwAAAABJRU5ErkJggg== + + AAABAAEAICAAAAEAGACFAwAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs index 4a297c8b89addd7925809dfbb879b5d95a196d83..01f0097ebe996caf1a68029cb48229138cd97a59 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs @@ -206,7 +206,7 @@ namespace EOM.TSHotelManagement.FormUI UpdateRoomInputDto r = new UpdateRoomInputDto() { - LastCheckInTime = DateTime.Now, + LastCheckInTime = DateOnly.FromDateTime(DateTime.Now), CustomerNumber = custo.CustomerNumber, RoomStateId = new EnumHelper().GetEnumValue(RoomState.Occupied), RoomNumber = RoomNumber, diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs index 6fc35bd0259a47ccc663fbd7e1ce8367505c095d..a4126c869e5be160cdf3f6494da6fc32051fc4e0 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs @@ -86,7 +86,7 @@ namespace EOM.TSHotelManagement.FormUI } UIMessageBox.ShowSuccess("预约成功！请在指定时间内进行登记入住"); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + txtCustoTel.Text + "进行了预订房间操作！", 1); + RecordHelper.Record(LoginInfo.WorkerClub + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "帮助" + txtCustoTel.Text + "进行了预订房间操作！", Common.Core.LogLevel.Normal); #endregion scope.Complete(); FrmRoomManager.Reload(""); diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs index c578595409bcd5990e8d2e1a020e42f8810544b3..9ffd387f646a048a8d5a837b1b84d12bb0a46dff 100644 --- a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs +++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs @@ -309,7 +309,7 @@ namespace EOM.TSHotelManagement.FormUI LoadSpendInfoByRoomNo(r.RoomNumber); LoadSellThingInfo(); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + updateSpend.CustomerNumber + "进行了消费商品:" + txtSellName.Text + "操作！", 2); + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + updateSpend.CustomerNumber + "进行了消费商品:" + txtSellName.Text + "操作！", Common.Core.LogLevel.Warning); #endregion scope.Complete(); @@ -353,7 +353,7 @@ namespace EOM.TSHotelManagement.FormUI LoadSpendInfoByRoomNo(r.RoomNumber); LoadSellThingInfo(); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + insertSpend.CustomerNumber + "进行了消费商品:" + txtSellName.Text + "操作！", 2); + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + insertSpend.CustomerNumber + "进行了消费商品:" + txtSellName.Text + "操作！", Common.Core.LogLevel.Warning); #endregion nudNum.Value = 0; @@ -400,7 +400,7 @@ namespace EOM.TSHotelManagement.FormUI LoadSpendInfoByRoomNo(r.RoomNumber); LoadSellThingInfo(); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + spend.CustomerNumber + "进行了消费商品:" + txtSellName.Text + "操作！", 2); + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + spend.CustomerNumber + "进行了消费商品:" + txtSellName.Text + "操作！", Common.Core.LogLevel.Warning); #endregion nudNum.Value = 0; @@ -464,13 +464,13 @@ namespace EOM.TSHotelManagement.FormUI if (updateResponse.StatusCode != StatusCodeConstants.Success) { UIMessageTip.ShowError("撤销失败！", 1000); - RecordHelper.Record($"接口异常。Message：\n{updateResponse.Message}", 3); + RecordHelper.Record($"接口异常。Message：\n{updateResponse.Message}", Common.Core.LogLevel.Critical); UIMessageBox.ShowError($"{ApiConstants.Sellthing_UpdateSellthingInfo}+接口服务异常，请提交Issue或尝试更新版本！"); return; } UIMessageTip.ShowOk("撤销成功！", 1000); #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + spend.CustomerNumber + "撤销了消费商品:" + txtSellName.Text + "操作！", 2); + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "帮助" + spend.CustomerNumber + "撤销了消费商品:" + txtSellName.Text + "操作！", Common.Core.LogLevel.Warning); #endregion LoadSpendInfoByRoomNo(txtRoomNo.Text); LoadSellThingInfo(); diff --git a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.Designer.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.Designer.cs index 08415f3676fe298159977f500c3ea6e09fac32d8..456035f3381444b282e1244bcfcb833942aaa520 100644 --- a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.Designer.cs @@ -28,114 +28,113 @@ /// private void InitializeComponent() { - lblTips = new Sunny.UI.UILabel(); - uiTitlePanel1 = new Sunny.UI.UITitlePanel(); - lbInternetSoftwareVersion = new Sunny.UI.UILabel(); - uiLabel4 = new Sunny.UI.UILabel(); - lblLocalSoftwareVersion = new Sunny.UI.UILabel(); - uiLabel2 = new Sunny.UI.UILabel(); - uiTitlePanel1.SuspendLayout(); + lblTips = new AntdUI.Label(); + lbInternetSoftwareVersion = new AntdUI.Label(); + lblLocalSoftwareVersion = new AntdUI.Label(); + label2 = new AntdUI.Label(); + label1 = new AntdUI.Label(); + label3 = new AntdUI.Label(); + lblReleaseLog = new AntdUI.Input(); SuspendLayout(); // // lblTips // - lblTips.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblTips.ForeColor = Color.FromArgb(48, 48, 48); - lblTips.Location = new Point(44, 51); + lblTips.Location = new Point(12, 48); lblTips.Name = "lblTips"; - lblTips.Size = new Size(247, 23); - lblTips.TabIndex = 1; + lblTips.Size = new Size(311, 23); + lblTips.TabIndex = 3; lblTips.Text = "检测新版本中，请让计算机保持联网状态....."; lblTips.TextAlign = ContentAlignment.MiddleCenter; // - // uiTitlePanel1 - // - uiTitlePanel1.Controls.Add(lbInternetSoftwareVersion); - uiTitlePanel1.Controls.Add(uiLabel4); - uiTitlePanel1.Controls.Add(lblLocalSoftwareVersion); - uiTitlePanel1.Controls.Add(uiLabel2); - uiTitlePanel1.Font = new Font("微软雅黑", 12F); - uiTitlePanel1.ForeColor = Color.White; - uiTitlePanel1.Location = new Point(44, 91); - uiTitlePanel1.Margin = new Padding(4, 5, 4, 5); - uiTitlePanel1.MinimumSize = new Size(1, 1); - uiTitlePanel1.Name = "uiTitlePanel1"; - uiTitlePanel1.Padding = new Padding(0, 25, 0, 0); - uiTitlePanel1.ShowCollapse = true; - uiTitlePanel1.ShowText = false; - uiTitlePanel1.Size = new Size(247, 86); - uiTitlePanel1.TabIndex = 2; - uiTitlePanel1.Text = "软件版本信息"; - uiTitlePanel1.TextAlignment = ContentAlignment.MiddleCenter; - uiTitlePanel1.TitleHeight = 25; - // // lbInternetSoftwareVersion // - lbInternetSoftwareVersion.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lbInternetSoftwareVersion.ForeColor = Color.FromArgb(48, 48, 48); - lbInternetSoftwareVersion.Location = new Point(122, 57); + lbInternetSoftwareVersion.BackColor = Color.Transparent; + lbInternetSoftwareVersion.Location = new Point(152, 106); lbInternetSoftwareVersion.Name = "lbInternetSoftwareVersion"; - lbInternetSoftwareVersion.Size = new Size(110, 23); - lbInternetSoftwareVersion.TabIndex = 8; - lbInternetSoftwareVersion.TextAlign = ContentAlignment.MiddleLeft; - // - // uiLabel4 - // - uiLabel4.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiLabel4.ForeColor = Color.FromArgb(48, 48, 48); - uiLabel4.Location = new Point(14, 57); - uiLabel4.Name = "uiLabel4"; - uiLabel4.Size = new Size(110, 23); - uiLabel4.TabIndex = 7; - uiLabel4.Text = "联网程序版本号："; - uiLabel4.TextAlign = ContentAlignment.MiddleCenter; + lbInternetSoftwareVersion.Size = new Size(140, 23); + lbInternetSoftwareVersion.TabIndex = 7; + lbInternetSoftwareVersion.Text = ""; + lbInternetSoftwareVersion.TextAlign = ContentAlignment.MiddleCenter; // // lblLocalSoftwareVersion // - lblLocalSoftwareVersion.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - lblLocalSoftwareVersion.ForeColor = Color.FromArgb(48, 48, 48); - lblLocalSoftwareVersion.Location = new Point(123, 33); + lblLocalSoftwareVersion.BackColor = Color.Transparent; + lblLocalSoftwareVersion.Location = new Point(152, 77); lblLocalSoftwareVersion.Name = "lblLocalSoftwareVersion"; - lblLocalSoftwareVersion.Size = new Size(110, 23); + lblLocalSoftwareVersion.Size = new Size(140, 23); lblLocalSoftwareVersion.TabIndex = 6; - lblLocalSoftwareVersion.TextAlign = ContentAlignment.MiddleLeft; + lblLocalSoftwareVersion.Text = ""; + lblLocalSoftwareVersion.TextAlign = ContentAlignment.MiddleCenter; + // + // label2 + // + label2.BackColor = Color.Transparent; + label2.Location = new Point(43, 106); + label2.Name = "label2"; + label2.Size = new Size(103, 23); + label2.TabIndex = 5; + label2.Text = "最新程序版本："; + label2.TextAlign = ContentAlignment.MiddleCenter; + // + // label1 + // + label1.BackColor = Color.Transparent; + label1.Location = new Point(43, 77); + label1.Name = "label1"; + label1.Size = new Size(103, 23); + label1.TabIndex = 4; + label1.Text = "本地程序版本："; + label1.TextAlign = ContentAlignment.MiddleCenter; + // + // label3 + // + label3.BackColor = Color.Transparent; + label3.Location = new Point(43, 135); + label3.Name = "label3"; + label3.Size = new Size(103, 23); + label3.TabIndex = 8; + label3.Text = "程序更新日志："; + label3.TextAlign = ContentAlignment.MiddleCenter; // - // uiLabel2 + // lblReleaseLog // - uiLabel2.Font = new Font("微软雅黑", 9F, FontStyle.Regular, GraphicsUnit.Point, 134); - uiLabel2.ForeColor = Color.FromArgb(48, 48, 48); - uiLabel2.Location = new Point(15, 33); - uiLabel2.Name = "uiLabel2"; - uiLabel2.Size = new Size(110, 23); - uiLabel2.TabIndex = 3; - uiLabel2.Text = "本地程序版本号："; - uiLabel2.TextAlign = ContentAlignment.MiddleCenter; + lblReleaseLog.Location = new Point(12, 164); + lblReleaseLog.Multiline = true; + lblReleaseLog.Name = "lblReleaseLog"; + lblReleaseLog.Size = new Size(311, 179); + lblReleaseLog.TabIndex = 9; // // FrmLoading // - AllowShowTitle = false; AutoScaleMode = AutoScaleMode.None; - ClientSize = new Size(335, 186); - Controls.Add(uiTitlePanel1); + BackColor = Color.FromArgb(243, 249, 255); + ClientSize = new Size(335, 355); + Controls.Add(lblReleaseLog); + Controls.Add(label3); + Controls.Add(lbInternetSoftwareVersion); + Controls.Add(lblLocalSoftwareVersion); + Controls.Add(label2); + Controls.Add(label1); Controls.Add(lblTips); + FormBorderStyle = FormBorderStyle.FixedSingle; + MaximizeBox = false; + MinimizeBox = false; Name = "FrmLoading"; - Padding = new Padding(0); - ShowTitle = false; + StartPosition = FormStartPosition.CenterScreen; Text = "FrmLoading"; - ZoomScaleRect = new Rectangle(15, 15, 580, 256); Load += FrmLoading_Load; - uiTitlePanel1.ResumeLayout(false); ResumeLayout(false); } #endregion - private Sunny.UI.UILabel lblTips; - private Sunny.UI.UITitlePanel uiTitlePanel1; private Sunny.UI.UILabel lblDllVersion; - private Sunny.UI.UILabel lblLocalSoftwareVersion; private Sunny.UI.UILabel uiLabel3; - private Sunny.UI.UILabel uiLabel2; - private Sunny.UI.UILabel lbInternetSoftwareVersion; - private Sunny.UI.UILabel uiLabel4; + private AntdUI.Label lblTips; + private AntdUI.Label lbInternetSoftwareVersion; + private AntdUI.Label lblLocalSoftwareVersion; + private AntdUI.Label label2; + private AntdUI.Label label1; + private AntdUI.Label label3; + private AntdUI.Input lblReleaseLog; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.cs index 773dd91591861ce460c54b38b8bbdf7caf4aacf7..124c1c1ac132394ae4f12183cde18932e9f2ceb7 100644 --- a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.cs +++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.cs @@ -23,14 +23,13 @@ */ using AntdUI; using EOM.TSHotelManagement.Common; +using EOM.TSHotelManagement.Common.Util; using Newtonsoft.Json; -using Sunny.UI; using System.Diagnostics; -using System.Text; namespace EOM.TSHotelManagement.FormUI { - public partial class FrmLoading : UIForm + public partial class FrmLoading : Window { private string CurrentVersion => ApplicationUtil.GetApplicationVersion().ToString(); private string GithubRepoUrl = "https://api.github.com/repos/easy-open-meta/TopskyHotelManagerSystem/releases/latest"; @@ -65,7 +64,7 @@ namespace EOM.TSHotelManagement.FormUI { var giteeResult = await giteeResponse.Content.ReadAsStringAsync(); var giteeRelease = JsonConvert.DeserializeObject(giteeResult); - HandleReleaseInfo(giteeRelease.TagName, giteeRelease.Assets, isGitee: true); + HandleReleaseInfo(giteeRelease.TagName, giteeRelease.Body, giteeRelease.Assets, isGitee: true); return; } @@ -74,7 +73,7 @@ namespace EOM.TSHotelManagement.FormUI { var githubResult = await githubResponse.Content.ReadAsStringAsync(); var githubRelease = JsonConvert.DeserializeObject(githubResult); - HandleReleaseInfo(githubRelease.TagName, githubRelease.Assets, isGitee: false); + HandleReleaseInfo(githubRelease.TagName, githubRelease.Body, githubRelease.Assets, isGitee: false); return; } } @@ -91,14 +90,18 @@ namespace EOM.TSHotelManagement.FormUI private void HandleReleaseInfo( string tagName, + string releaseBody, List assets, bool isGitee) where TAsset : class { var version = tagName.Replace("v", string.Empty); + lblReleaseLog.Text = $"{releaseBody}"; + lblReleaseLog.Refresh(); lbInternetSoftwareVersion.Text = version; lbInternetSoftwareVersion.Refresh(); if (version.Equals(lblLocalSoftwareVersion.Text.Trim())) { + LoginInfo.SoftwareReleaseLog = $"{releaseBody}"; AntdUI.Modal.open(this, "系统提示", "当前已是最新版本，无需更新！", TType.Info); Task.Run(() => threadPro()); return; @@ -225,7 +228,7 @@ namespace EOM.TSHotelManagement.FormUI } catch (Exception ex) { - UIMessageBox.Show($"打开浏览器时发生错误: {ex.Message}"); + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString($"An error occurred while opening the browser: {ex.Message}", $"打开浏览器时发生错误: {ex.Message}"), TType.Error); } } @@ -262,6 +265,9 @@ namespace EOM.TSHotelManagement.FormUI [JsonProperty("tag_name")] public string TagName { get; set; } + [JsonProperty("body")] + public string Body { get; set; } + [JsonProperty("assets")] public List Assets { get; set; } } diff --git a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs index 62b5718720c97e22e13effaf142bb867ac3d297a..0f1d14a92da6d4b0178bbdb19517f70ea6e7a72b 100644 --- a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs @@ -30,7 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLogin)); label2 = new Label(); - txtWorkerId = new AntdUI.Input(); + txtAccount = new AntdUI.Input(); txtWorkerPwd = new AntdUI.Input(); picLogin = new AntdUI.Button(); picFormSize = new AntdUI.Button(); @@ -52,15 +52,15 @@ label2.TabIndex = 5; label2.Text = " "; // - // txtWorkerId + // txtAccount // - txtWorkerId.BackColor = Color.White; - txtWorkerId.Font = new Font("Microsoft YaHei UI", 14F); - txtWorkerId.Location = new Point(648, 190); - txtWorkerId.Name = "txtWorkerId"; - txtWorkerId.Size = new Size(238, 52); - txtWorkerId.TabIndex = 32; - txtWorkerId.Text = "WK010"; + txtAccount.BackColor = Color.White; + txtAccount.Font = new Font("Microsoft YaHei UI", 14F); + txtAccount.Location = new Point(648, 190); + txtAccount.Name = "txtAccount"; + txtAccount.PlaceholderText = ""; + txtAccount.Size = new Size(238, 52); + txtAccount.TabIndex = 32; // // txtWorkerPwd // @@ -70,9 +70,10 @@ txtWorkerPwd.Name = "txtWorkerPwd"; txtWorkerPwd.PasswordChar = '*'; txtWorkerPwd.PasswordCopy = true; + txtWorkerPwd.PlaceholderColorExtend = ""; + txtWorkerPwd.PlaceholderText = ""; txtWorkerPwd.Size = new Size(238, 52); txtWorkerPwd.TabIndex = 33; - txtWorkerPwd.Text = "admin"; // // picLogin // @@ -156,7 +157,7 @@ Controls.Add(picFormSize); Controls.Add(picLogin); Controls.Add(txtWorkerPwd); - Controls.Add(txtWorkerId); + Controls.Add(txtAccount); Controls.Add(label2); FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); @@ -164,7 +165,6 @@ Name = "FrmLogin"; StartPosition = FormStartPosition.CenterScreen; Text = "TS酒店管理系统"; - FormClosing += FrmLogin_FormClosing; Load += FrmLogin_Load; MouseDown += FrmLogin_MouseDown; MouseMove += FrmLogin_MouseMove; @@ -174,7 +174,7 @@ #endregion private System.Windows.Forms.Label label2; - private AntdUI.Input txtWorkerId; + private AntdUI.Input txtAccount; private AntdUI.Input txtWorkerPwd; private AntdUI.Button picLogin; private AntdUI.Button picFormSize; diff --git a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs index 8c39b365de30a8b0b9330923f548f495c51dd30d..b1efe2cb42f339ba8e9678fcf17349096105709f 100644 --- a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs +++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs @@ -25,8 +25,8 @@ using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; +using EOM.TSHotelManagement.Common.Util; using jvncorelib.EntityLib; -using Sunny.UI; namespace EOM.TSHotelManagement.FormUI { @@ -52,31 +52,6 @@ namespace EOM.TSHotelManagement.FormUI private Point formOld;//窗体旧坐标 #endregion - #region 调用淡出淡入效果函数 - //[System.Runtime.InteropServices.DllImport("user32.dll")] - #endregion - - #region 窗体淡出淡入方法 - //protected static extern bool AnimateWindow(IntPtr hWnd, int dwTime, int dwFlags); - - ///**********************************************************************************************/ - ////dwflag的取值如下 - //public const Int32 AW_HOR_POSITIVE = 0x00000001; //从左到右显示 - //public const Int32 AW_HOR_NEGATIVE = 0x00000002; //从右到左显示 - //public const Int32 AW_VER_POSITIVE = 0x00000004; //从上到下显示 - //public const Int32 AW_VER_NEGATIVE = 0x00000008; //从下到上显示 - - ////若使用了AW_HIDE标志，则使窗口向内重叠，即收缩窗口；否则使窗口向外扩展，即展开窗口 - //public const Int32 AW_CENTER = 0x00000010; - //public const Int32 AW_HIDE = 0x00010000; //隐藏窗口，缺省则显示窗口 - //public const Int32 AW_ACTIVATE = 0x00020000; //激活窗口。在使用了AW_HIDE标志后不能使用这个标志 - - ////使用滑动类型。缺省则为滚动动画类型。当使用AW_CENTER标志时，这个标志就被忽略 - //public const Int32 AW_SLIDE = 0x00040000; - //public const Int32 AW_BLEND = 0x00080000; //透明度从高到低 - - #endregion - #region 记录移动的窗体坐标 private void FrmLogin_MouseDown(object sender, MouseEventArgs e) { @@ -113,18 +88,12 @@ namespace EOM.TSHotelManagement.FormUI } #endregion - #region 窗体打开时淡入效果 private void FrmLogin_Load(object sender, EventArgs e) { this.Owner.Hide(); + txtAccount.PlaceholderText = LocalizationHelper.GetLocalizedString("Please input employee number or email", "请输入员工编号或邮箱"); + txtWorkerPwd.PlaceholderText = LocalizationHelper.GetLocalizedString("Please input employee password", "请输入员工密码"); } - #endregion - - #region 窗体关闭时淡出效果 - private void FrmLogin_FormClosing(object sender, FormClosingEventArgs e) - { - } - #endregion #region 检验输入完整性 /// @@ -133,15 +102,15 @@ namespace EOM.TSHotelManagement.FormUI /// private bool CheckInput() { - if (txtWorkerId.Text == "") + if (txtAccount.Text == "") { - UIMessageBox.Show("请输入员工编号！", "输入提示", UIStyle.Red); - txtWorkerId.Focus(); + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("Please input employee number or email", "请输入员工编号或邮箱地址"), TType.Error); + txtAccount.Focus(); return false; } if (txtWorkerPwd.Text == "") { - UIMessageBox.Show("请输入员工密码！", "输入提示", UIStyle.Red); + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("Please input password", "请输入员工密码"), TType.Error); txtWorkerPwd.Focus(); return false; } @@ -156,7 +125,7 @@ namespace EOM.TSHotelManagement.FormUI { if (CheckInput()) { - var worker = new ReadEmployeeInputDto() { EmployeeId = txtWorkerId.Text.Trim(), Password = txtWorkerPwd.Text.Trim() }; + var worker = new ReadEmployeeInputDto() { EmployeeId = txtAccount.Text.Trim(), EmailAddress = txtAccount.Text.Trim() , Password = txtWorkerPwd.Text.Trim() }; result = HttpHelper.Request(ApiConstants.Employee_SelectEmployeeInfoByEmployeeIdAndEmployeePwd, HttpHelper.ModelToJson(worker)); @@ -164,8 +133,7 @@ namespace EOM.TSHotelManagement.FormUI if (response.StatusCode != StatusCodeConstants.Success) { - AntdUI.Modal.open(this, "系统提示", "账号或密码错误！", TType.Error); - txtWorkerPwd.Focus(); + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString($"{ApiConstants.Employee_SelectEmployeeInfoByEmployeeIdAndEmployeePwd} is abnormal. Please submit an issue", $"{ApiConstants.Employee_SelectEmployeeInfoByEmployeeIdAndEmployeePwd}+接口服务异常，请提交issue"), TType.Error); return; } @@ -175,7 +143,7 @@ namespace EOM.TSHotelManagement.FormUI { if (w.IsEnable == 0) { - AntdUI.Modal.open(this, "系统提示", "账号已禁用，请联系上级解封！", TType.Error); + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("The account has been disabled, please contact your superiors to unblock it!", "账号已禁用，请联系上级解封！"), TType.Error); return; } @@ -185,20 +153,29 @@ namespace EOM.TSHotelManagement.FormUI LoginInfo.WorkerPosition = w.PositionName; LoginInfo.SoftwareVersion = ApplicationUtil.GetApplicationVersion().ToString(); LoginInfo.UserToken = w.UserToken; + + if (w.IsInitialize == 0) + { + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("The initial password for the current account has not been changed, and it will be directed to the change page later", "当前账号未修改初始密码，稍后将引导至修改页面"), TType.Error); + FrmMySpace frmMySpace = new FrmMySpace(); + frmMySpace.ShowDialog(); + } + FrmMain frm = new FrmMain(this); this.Hide(); frm.ShowDialog(this); } else { - AntdUI.Modal.open(this, "系统提示", "密码错误！", TType.Error); + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("Employee number/email or password incorrect", "员工编号/邮箱地址或密码错误！"), TType.Error); txtWorkerPwd.Focus(); } } } - catch (Exception) + catch (Exception ex) { - AntdUI.Modal.open(this, "系统提示", "服务器维护中，请稍后再试！", TType.Error); + RecordHelper.Record(LocalizationHelper.GetLocalizedString($"Login error:{ex.Message}", $"登录异常:{ex.Message}"),Common.Core.LogLevel.Critical); + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("System prompt", "系统提示"), LocalizationHelper.GetLocalizedString("The server is under maintenance, please try again later", "服务器维护中，请稍后再试！"), TType.Error); } } #endregion diff --git a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.resx b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.resx index 6030d06dff898bc8a4518e08e0c5a2486a9aef20..73223a50cba8877dc2e8417fbdd9ecdd75fe12f8 100644 --- a/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.resx +++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.resx @@ -146,7 +146,7 @@ iVBORw0KGgoAAAANSUhEUgAAA5QAAAH+CAYAAADjxkFdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - EAAACxABrSO9dQAA/7JJREFUeF7s3QdcE+f/B3DbavewVrune1bZ4GQJdM9f/93LLmtbd1WmW6aDDUnA + DAAACwwBP0AiyAAA/7JJREFUeF7s3QdcE+f/B3DbavewVrune1bZ4GQJdM9f/93LLmtbd1WmW6aDDUnA vUft0LZ2WPceuAdkB1CRjeQul+//9VwSjM8FCJDAgd97vd4v4Mldchce4n18VjsAaIcQQgghhBBCCDWU oAAhhBBCCCGEELKHoAAhhBBCCCGEELKHoAAhhBBCCCGEELKHoAAhhBBCCCGEELKHoAAhhBBCCCGEELKH oAAhhBBCCCGEELKHoAAhhBBCCCGEELKHoAAhhBBCCCGEELKHoAAhhBBCCCGEELKHoAAhhBBCCCGEELKH diff --git a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs index 330c317e592225688fe10e060bc1f50cb2f43241..85a8d620891ac724636e083c075e8c6d7bdfb345 100644 --- a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs +++ b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs @@ -44,7 +44,7 @@ toolStripSeparator4 = new ToolStripSeparator(); tsmiLoginBackSystem = new ToolStripMenuItem(); toolStripSeparator2 = new ToolStripSeparator(); - tsmiCheckUpdate = new ToolStripMenuItem(); + tsmiUpdateLog = new ToolStripMenuItem(); tsmiAboutUs = new ToolStripMenuItem(); tsmiExitSystem = new ToolStripMenuItem(); linkLabel1 = new LinkLabel(); @@ -123,7 +123,7 @@ // cmsMain // cmsMain.Font = new Font("Microsoft YaHei UI Light", 12F, FontStyle.Italic, GraphicsUnit.Point, 134); - cmsMain.Items.AddRange(new ToolStripItem[] { tsmiChangeUser, tsmiMySpace, tsmiExChange, toolStripSeparator3, tsmiLockScreen, toolStripSeparator4, tsmiLoginBackSystem, toolStripSeparator2, tsmiCheckUpdate, tsmiAboutUs, tsmiExitSystem }); + cmsMain.Items.AddRange(new ToolStripItem[] { tsmiChangeUser, tsmiMySpace, tsmiExChange, toolStripSeparator3, tsmiLockScreen, toolStripSeparator4, tsmiLoginBackSystem, toolStripSeparator2, tsmiUpdateLog, tsmiAboutUs, tsmiExitSystem }); cmsMain.Name = "cmsMain"; cmsMain.RenderMode = ToolStripRenderMode.Professional; cmsMain.Size = new Size(314, 214); @@ -188,14 +188,13 @@ toolStripSeparator2.Name = "toolStripSeparator2"; toolStripSeparator2.Size = new Size(310, 6); // - // tsmiCheckUpdate + // tsmiUpdateLog // - tsmiCheckUpdate.Font = new Font("Microsoft Sans Serif", 12F, FontStyle.Regular, GraphicsUnit.Point, 134); - tsmiCheckUpdate.Image = Properties.Resources.检查更新__1_; - tsmiCheckUpdate.Name = "tsmiCheckUpdate"; - tsmiCheckUpdate.Size = new Size(313, 24); - tsmiCheckUpdate.Text = "检查更新"; - tsmiCheckUpdate.Click += tsmiCheckUpdate_Click; + tsmiUpdateLog.Font = new Font("Microsoft Sans Serif", 12F); + tsmiUpdateLog.Name = "tsmiUpdateLog"; + tsmiUpdateLog.Size = new Size(313, 24); + tsmiUpdateLog.Text = "查看更新日志"; + tsmiUpdateLog.Click += tsmiUpdateLog_Click; // // tsmiAboutUs // @@ -519,5 +518,6 @@ private AntdUI.Button btnFormSize; private AntdUI.Button btnSetting; private AntdUI.ColorPicker cpUITheme; + private ToolStripMenuItem tsmiUpdateLog; } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs index 2cc2f61aec8c05d8a83a733d6443781ab1ca4ef5..41af63a1f9d136fd11020a7d97ace5991aaff475 100644 --- a/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs +++ b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs @@ -25,11 +25,13 @@ using AntdUI; using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; +using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.FormUI.Properties; using jvncorelib.CodeLib; using Sunny.UI; using System.Diagnostics; using System.Runtime.InteropServices; +using System.Text.RegularExpressions; namespace EOM.TSHotelManagement.FormUI { @@ -55,7 +57,7 @@ namespace EOM.TSHotelManagement.FormUI // 接受Form1对象 this.returnForm1 = F1; #region 获取添加操作日志所需的信息 - RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "版本登入了系统！", 3); + RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "版本登入了系统！", Common.Core.LogLevel.Critical); #endregion Stop = StopUseExit; Start = StartUseExit; @@ -154,7 +156,7 @@ namespace EOM.TSHotelManagement.FormUI private void LoadFonts() { #region 从数据库读取文字滚动的内容 - result = HttpHelper.Request(ApiConstants.Fonts_SelectPromotionContentAll); + result = HttpHelper.Request(ApiConstants.PromotionContent_SelectPromotionContents); var response = HttpHelper.JsonToModel>(result.message); if (response.StatusCode != StatusCodeConstants.Success) { @@ -168,12 +170,12 @@ namespace EOM.TSHotelManagement.FormUI #region 定时器：文字滚动间隔 private void tmrFont_Tick(object sender, EventArgs e) { - if (fonts.listSource.IsNullOrEmpty()) + if (fonts.listSource == null || fonts.listSource.Count == 0) { return; } fontn++; - if (fontn == fonts.total) + if (fontn >= fonts.listSource.Count) { fontn = 0; } @@ -331,32 +333,6 @@ namespace EOM.TSHotelManagement.FormUI #region 检查软件更新版本事件方法 private void tsmiCheckUpdate_Click(object sender, EventArgs e) { - result = HttpHelper.Request(ApiConstants.Base_GetBase); - var response = HttpHelper.JsonToModel>(result.message); - if (response.StatusCode != StatusCodeConstants.Success) - { - UIMessageBox.ShowError($"{ApiConstants.Base_GetBase}+接口服务异常，请重试。{response.Message}"); - return; - } - - var _base = response.Source; - //调用系统默认的浏览器 - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - Process.Start(new ProcessStartInfo(_base.UrlAddress) { UseShellExecute = true }); - } - else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) - { - Process.Start("xdg-open", _base.UrlAddress); - } - else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) - { - Process.Start("open", _base.UrlAddress); - } - else - { - throw new PlatformNotSupportedException("This OS is not supported"); - } } #endregion @@ -437,7 +413,7 @@ namespace EOM.TSHotelManagement.FormUI CheckNumber = new UniqueCode().GetNewId("CK"), DataInsDate = DateTime.Now, IsDelete = 0, - CheckStatus = 0, + CheckStatus = btnHello.BackgroundImage == Resources.早上 ? 0 : 1, EmployeeId = LoginInfo.WorkerNo, CheckMethod = "系统界面", CheckTime = DateTime.Now, @@ -553,5 +529,10 @@ namespace EOM.TSHotelManagement.FormUI } } + + private void tsmiUpdateLog_Click(object sender, EventArgs e) + { + AntdUI.Modal.open(this, LocalizationHelper.GetLocalizedString("Update log", "更新日志"), LoginInfo.SoftwareReleaseLog, TType.Info); + } } } diff --git a/topsky-hotel-management-system-web-api b/topsky-hotel-management-system-web-api index f3a82fb0ed00d5562ebec272be3a675a06e24211..e6513d6270cd376a629b4b924d3d5f33054e8fea 160000 --- a/topsky-hotel-management-system-web-api +++ b/topsky-hotel-management-system-web-api @@ -1 +1 @@ -Subproject commit f3a82fb0ed00d5562ebec272be3a675a06e24211 +Subproject commit e6513d6270cd376a629b4b924d3d5f33054e8fea