From 567401d7d0338c582e22ed24399dabc6803e3ec8 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 14 八月 2025 14:45:15 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.Core/Utils/AliyunUtils/AliyunOSSUtils.cs | 2 +-
FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/EditEnterpriseEmployeeCommand.cs | 4 ++--
FlexJobApi.Core/FlexJobApi.Core.xml | 4 ++--
FlexJobApi.Core/Enums/Common/EnumValidationTypes.cs | 4 ++--
FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs | 4 ++--
FlexJobApi.Core/Utils/StringUtils/StringUtils.cs | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/FlexJobApi.Core/Enums/Common/EnumValidationTypes.cs b/FlexJobApi.Core/Enums/Common/EnumValidationTypes.cs
index 7fcede8..0ae0a02 100644
--- a/FlexJobApi.Core/Enums/Common/EnumValidationTypes.cs
+++ b/FlexJobApi.Core/Enums/Common/EnumValidationTypes.cs
@@ -17,11 +17,11 @@
/// 鎵嬫満鍙�
/// </summary>
[ValidationItemMetadata(@"^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$", "鎵嬫満鍙锋牸寮忎笉姝ｇ‘")]
- PhoneNumber,
+ ValidPhoneNumber,
/// <summary>
/// 韬唤璇佸彿
/// </summary>
[ValidationItemMetadata(@"^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12][0-9]|3[01])\d{3}(\d|X|x)$", "韬唤璇佸彿鏍煎紡涓嶆纭�")]
- Identity,
+ ValiIdentity,
}
}
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index bd56e29..8c35fdd 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -2647,12 +2647,12 @@
楠岃瘉绫诲瀷
</summary>
</member>
- <member name="F:FlexJobApi.Core.EnumValidationTypes.PhoneNumber">
+ <member name="F:FlexJobApi.Core.EnumValidationTypes.ValidPhoneNumber">
<summary>
鎵嬫満鍙�
</summary>
</member>
- <member name="F:FlexJobApi.Core.EnumValidationTypes.Identity">
+ <member name="F:FlexJobApi.Core.EnumValidationTypes.ValiIdentity">
<summary>
韬唤璇佸彿
</summary>
diff --git a/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/EditEnterpriseEmployeeCommand.cs b/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/EditEnterpriseEmployeeCommand.cs
index 5c5ad77..6fd5c8e 100644
--- a/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/EditEnterpriseEmployeeCommand.cs
+++ b/FlexJobApi.Core/Models/UserServer/EnterpriseEmployees/Commands/EditEnterpriseEmployeeCommand.cs
@@ -24,7 +24,7 @@
/// 韬唤璇佸彿
/// </summary>
[Required]
- [DataValidation(EnumValidationTypes.Identity)]
+ [DataValidation(EnumValidationTypes.ValiIdentity)]
public string Identity { get; set; }
/// <summary>
@@ -32,7 +32,7 @@
/// </summary>
/// <remarks>鑱旂郴鐢佃瘽</remarks>
[Required]
- [DataValidation(EnumValidationTypes.PhoneNumber)]
+ [DataValidation(EnumValidationTypes.ValidPhoneNumber)]
public string ContactPhoneNumber { get; set; }
/// <summary>
diff --git a/FlexJobApi.Core/Utils/AliyunUtils/AliyunOSSUtils.cs b/FlexJobApi.Core/Utils/AliyunUtils/AliyunOSSUtils.cs
index e7b569a..5a5b2d4 100644
--- a/FlexJobApi.Core/Utils/AliyunUtils/AliyunOSSUtils.cs
+++ b/FlexJobApi.Core/Utils/AliyunUtils/AliyunOSSUtils.cs
@@ -96,7 +96,7 @@
{
var options = App.GetOptions<AliyunOptions>().OSS;
var client = new OssClient(options.Endpoint, options.AccessKeyId, options.AccessSecret);
- var req = new GeneratePresignedUriRequest(options.BucketName, url, SignHttpMethod.Get)
+ var req = new GeneratePresignedUriRequest(options.BucketName, url.TrimStart('/'), SignHttpMethod.Get)
{
Expiration = DateTime.Now.AddHours(1),
Process = process
diff --git a/FlexJobApi.Core/Utils/StringUtils/StringUtils.cs b/FlexJobApi.Core/Utils/StringUtils/StringUtils.cs
index 287d9cf..1a0cf08 100644
--- a/FlexJobApi.Core/Utils/StringUtils/StringUtils.cs
+++ b/FlexJobApi.Core/Utils/StringUtils/StringUtils.cs
@@ -81,7 +81,7 @@
public static bool CheckIsIdentityNumber18(this string identity)
{
- return identity.IsNotNull() && identity.TryValidate(EnumValidationTypes.Identity).IsValid && identity.Length == 18;
+ return identity.IsNotNull() && identity.TryValidate(EnumValidationTypes.ValiIdentity).IsValid && identity.Length == 18;
}
/// <summary>
diff --git a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs
index 1dea969..8544539 100644
--- a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs
@@ -56,7 +56,7 @@
{
errors.Add("璇峰～鍐欐墜鏈哄彿");
}
- else if (!model.ContactPhoneNumber.TryValidate(EnumValidationTypes.PhoneNumber).IsValid)
+ else if (!model.ContactPhoneNumber.TryValidate(EnumValidationTypes.ValidPhoneNumber).IsValid)
{
errors.Add("鎵嬫満鍙锋牸寮忎笉姝ｇ‘");
}
@@ -64,7 +64,7 @@
{
errors.Add("璇峰～鍐欒韩浠借瘉鍙�");
}
- else if (!model.Identity.TryValidate(EnumValidationTypes.Identity).IsValid)
+ else if (!model.Identity.TryValidate(EnumValidationTypes.ValiIdentity).IsValid)
{
errors.Add("韬唤璇佸彿鏍煎紡涓嶆纭�");
}
--
Gitblit v1.9.1