gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🍉 refactor: 优化代码并修复一些问题

Browse Source
This commit is contained in:
喵你个汪呀 2025-08-24 22:38:46 +08:00
parent e5ccc603fc
commit 5a76b6034d
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin.NET/Admin.NET.Core/Logging/LoggingMonitorDto.cs
View File

@ -262,7 +262,7 @@ public class LoggingParametersDto
public class LoggingReturnInformationDto public class LoggingReturnInformationDto
{ {
/// <summary> /// <summary>
/// 返回类型（如X.Core.XResult<System.Object>） /// 返回类型
/// </summary> /// </summary>
public string Type { get; set; } public string Type { get; set; }
@ -272,7 +272,7 @@ public class LoggingReturnInformationDto
public int? HttpStatusCode { get; set; } public int? HttpStatusCode { get; set; }
/// <summary> /// <summary>
/// 实际返回类型（如Task<List<T>>） /// 实际返回类型
/// </summary> /// </summary>
public string ActType { get; set; } public string ActType { get; set; }

4
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs
View File

@ -43,8 +43,10 @@ public class SysTenantService : IDynamicApiController, ITransient
SysRoleMenuService sysRoleMenuService, SysRoleMenuService sysRoleMenuService,
SysConfigService sysConfigService, SysConfigService sysConfigService,
SysCacheService sysCacheService, SysCacheService sysCacheService,
IEventPublisher eventPublisher) IEventPublisher eventPublisher,
UserManager userManager)
{ {
_userManager = userManager;
_sysTenantRep = sysTenantRep; _sysTenantRep = sysTenantRep;
_sysOrgRep = sysOrgRep; _sysOrgRep = sysOrgRep;
_sysRoleRep = sysRoleRep; _sysRoleRep = sysRoleRep;

2
Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/BaseWorkWxDto.cs
View File

@ -59,7 +59,7 @@ public class BaseIdWorkWxOutput : BaseWorkWxOutput
/// 获取接口凭证输入参数 /// 获取接口凭证输入参数
/// </summary> /// </summary>
/// https://developer.work.weixin.qq.com/document/path/91039 /// https://developer.work.weixin.qq.com/document/path/91039
[HttpRemoteApi(Action = "gettoken", Desc = "获取接口凭证", HttpMethod = HttpMethodEnum.Get, IgnoreLog = true)] [HttpRemoteApi(Action = "gettoken", Desc = "获取接口凭证", HttpMethod = HttpMethodEnum.Get, IgnoreLog = false)]
public class TokenWorkWxInput public class TokenWorkWxInput
{ {
/// <summary> /// <summary>

12
Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Dept/Dto/DeptWorkWxInput.cs
View File

@ -21,13 +21,13 @@ namespace Admin.NET.Plugin.WorkWeixin;
public class CreateDeptWorkWxInput : AuthWorkWxInput public class CreateDeptWorkWxInput : AuthWorkWxInput
{ {
/// <summary> /// <summary>
/// 部门名称。同一个层级的部门名称不能重复。长度限制为1~64个UTF-8字符，字符不能包括\:*?"<>｜ /// 部门名称。同一个层级的部门名称不能重复。长度限制为1~64个UTF-8字符，字符不能包括\:*?"&lt;&gt;|
/// </summary> /// </summary>
/// <remarks>是否必填：是</remarks> /// <remarks>是否必填：是</remarks>
[CustomJsonProperty("name")] [CustomJsonProperty("name")]
[Required(ErrorMessage = "部门名称不能为空")] [Required(ErrorMessage = "部门名称不能为空")]
[StringLength(64, MinimumLength = 1, ErrorMessage = "部门名称长度必须在1-64个字符之间")] [StringLength(64, MinimumLength = 1, ErrorMessage = "部门名称长度必须在1-64个字符之间")]
[RegularExpression(@"^[^\\:*?""<>｜]+$", ErrorMessage = "部门名称不能包含\\:*?\"<>｜字符")] [RegularExpression(@"^[^\\:*?""<>|]+$", ErrorMessage = "部门名称不能包含\\:*?\"<>|字符")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
@ -36,7 +36,7 @@ public class CreateDeptWorkWxInput : AuthWorkWxInput
/// <remarks>是否必填：否</remarks> /// <remarks>是否必填：否</remarks>
[CustomJsonProperty("name_en")] [CustomJsonProperty("name_en")]
[StringLength(64, MinimumLength = 1, ErrorMessage = "英文名称长度必须在1-64个字符之间")] [StringLength(64, MinimumLength = 1, ErrorMessage = "英文名称长度必须在1-64个字符之间")]
[RegularExpression(@"^[^\\:*?""<>｜]*$", ErrorMessage = "英文名称不能包含\\:*?\"<>｜字符")] [RegularExpression(@"^[^\\:*?""<>|]*$", ErrorMessage = "英文名称不能包含\\:*?\"<>|字符")]
public string NameEn { get; set; } public string NameEn { get; set; }
/// <summary> /// <summary>
@ -89,12 +89,12 @@ public class UpdateDeptWorkWxInput : AuthWorkWxInput
public long Id { get; set; } public long Id { get; set; }
/// <summary> /// <summary>
/// 部门名称。长度限制为1~64个UTF-8字符，字符不能包括\:*?"<>｜ /// 部门名称。长度限制为1~64个UTF-8字符，字符不能包括\:*?"&lt;&gt;|
/// </summary> /// </summary>
/// <remarks>是否必填：否</remarks> /// <remarks>是否必填：否</remarks>
[CustomJsonProperty("name")] [CustomJsonProperty("name")]
[StringLength(64, MinimumLength = 1, ErrorMessage = "部门名称长度必须在1-64个字符之间")] [StringLength(64, MinimumLength = 1, ErrorMessage = "部门名称长度必须在1-64个字符之间")]
[RegularExpression(@"^[^\\:*?""<>｜]+$", ErrorMessage = "部门名称不能包含\\:*?\"<>｜字符")] [RegularExpression(@"^[^\\:*?""<>|]+$", ErrorMessage = "部门名称不能包含\\:*?\"<>|字符")]
public string Name { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
@ -103,7 +103,7 @@ public class UpdateDeptWorkWxInput : AuthWorkWxInput
/// <remarks>是否必填：否</remarks> /// <remarks>是否必填：否</remarks>
[CustomJsonProperty("name_en")] [CustomJsonProperty("name_en")]
[StringLength(64, MinimumLength = 1, ErrorMessage = "英文名称长度必须在1-64个字符之间")] [StringLength(64, MinimumLength = 1, ErrorMessage = "英文名称长度必须在1-64个字符之间")]
[RegularExpression(@"^[^\\:*?""<>｜]*$", ErrorMessage = "英文名称不能包含\\:*?\"<>｜字符")] [RegularExpression(@"^[^\\:*?""<>|]*$", ErrorMessage = "英文名称不能包含\\:*?\"<>|字符")]
public string NameEn { get; set; } public string NameEn { get; set; }
/// <summary> /// <summary>

6
Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/WorkWxBaseService.cs
View File

@ -36,7 +36,11 @@ public class WorkWxBaseService(
CorpId = await sysConfigService.GetConfigValueByCode(WorkWeixinConst.WorkWeixinCorpId), CorpId = await sysConfigService.GetConfigValueByCode(WorkWeixinConst.WorkWeixinCorpId),
CorpSecret = await sysConfigService.GetConfigValueByCode(WorkWeixinConst.WorkWeixinCorpSecret) CorpSecret = await sysConfigService.GetConfigValueByCode(WorkWeixinConst.WorkWeixinCorpSecret)
}); });
if (string.IsNullOrWhiteSpace(result.AccessToken)) return null; if (string.IsNullOrWhiteSpace(result.AccessToken))
{
Log.Error("[企业微信] 获取接口凭证失败");
return null;
}
sysCacheService.Set(WorkWeixinConst.KeyWorkWeixinToken, result.AccessToken, TimeSpan.FromSeconds(result.ExpiresIn)); sysCacheService.Set(WorkWeixinConst.KeyWorkWeixinToken, result.AccessToken, TimeSpan.FromSeconds(result.ExpiresIn));
return result.AccessToken; return result.AccessToken;
} }