Parcourir la source

😁调整OpenApi开放接口身份验证相关代码 感谢大佬提交 @xjj_0906

zuohuaijun il y a 2 ans
Parent
commit
6764f2fd63
72 fichiers modifiés avec 1300 ajouts et 350 suppressions
  1. 1 0
      Admin.NET/Admin.NET.Application/GlobalUsings.cs
  2. 0 2
      Admin.NET/Admin.NET.Application/OpenApi/DemoOpenApi.cs
  3. 4 2
      Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs
  4. 1 1
      Admin.NET/Admin.NET.Core/GlobalUsings.cs
  5. 11 2
      Admin.NET/Admin.NET.Core/Service/OpenAccess/Dto/OpenAccessInput.cs
  6. 3 3
      Admin.NET/Admin.NET.Core/Service/OpenAccess/Dto/OpenAccessOutput.cs
  7. 18 14
      Admin.NET/Admin.NET.Core/Service/OpenAccess/SysOpenAccessService.cs
  8. 1 2
      Admin.NET/Admin.NET.Core/SignatureAuth/GetAccessSecretContext.cs
  9. 0 0
      Admin.NET/Admin.NET.Core/SignatureAuth/SignatureAuthenticationDefaults.cs
  10. 0 2
      Admin.NET/Admin.NET.Core/SignatureAuth/SignatureAuthenticationEvent.cs
  11. 0 0
      Admin.NET/Admin.NET.Core/SignatureAuth/SignatureAuthenticationExtensions.cs
  12. 15 15
      Admin.NET/Admin.NET.Core/SignatureAuth/SignatureAuthenticationHandler.cs
  13. 0 0
      Admin.NET/Admin.NET.Core/SignatureAuth/SignatureAuthenticationOptions.cs
  14. 1 2
      Admin.NET/Admin.NET.Core/SignatureAuth/SignatureChallengeContext.cs
  15. 1 2
      Admin.NET/Admin.NET.Core/SignatureAuth/SignatureValidatedContext.cs
  16. 1 1
      Admin.NET/Admin.NET.Core/Util/AdminResultProvider.cs
  17. 0 75
      Web/src/api-services/apis/sys-dict-type-api.ts
  18. 25 0
      Web/src/api-services/models/add-config-input.ts
  19. 25 0
      Web/src/api-services/models/add-dict-data-input.ts
  20. 25 0
      Web/src/api-services/models/add-dict-type-input.ts
  21. 25 0
      Web/src/api-services/models/add-menu-input.ts
  22. 25 0
      Web/src/api-services/models/add-notice-input.ts
  23. 30 6
      Web/src/api-services/models/add-open-access-input.ts
  24. 24 0
      Web/src/api-services/models/add-org-input.ts
  25. 25 0
      Web/src/api-services/models/add-plugin-input.ts
  26. 25 0
      Web/src/api-services/models/add-pos-input.ts
  27. 25 0
      Web/src/api-services/models/add-print-input.ts
  28. 25 0
      Web/src/api-services/models/add-role-input.ts
  29. 25 0
      Web/src/api-services/models/add-tenant-input.ts
  30. 24 0
      Web/src/api-services/models/add-user-input.ts
  31. 0 57
      Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-open-access.ts
  32. 1 0
      Web/src/api-services/models/db-type.ts
  33. 3 2
      Web/src/api-services/models/gender-enum.ts
  34. 34 10
      Web/src/api-services/models/open-access-output.ts
  35. 0 63
      Web/src/api-services/models/sql-sugar-paged-list-sys-open-access.ts
  36. 25 0
      Web/src/api-services/models/sys-code-gen-config.ts
  37. 25 0
      Web/src/api-services/models/sys-code-gen.ts
  38. 25 0
      Web/src/api-services/models/sys-config.ts
  39. 25 0
      Web/src/api-services/models/sys-dict-data.ts
  40. 25 0
      Web/src/api-services/models/sys-dict-type.ts
  41. 25 0
      Web/src/api-services/models/sys-file.ts
  42. 25 0
      Web/src/api-services/models/sys-log-diff.ts
  43. 25 0
      Web/src/api-services/models/sys-log-ex.ts
  44. 25 0
      Web/src/api-services/models/sys-log-op.ts
  45. 25 0
      Web/src/api-services/models/sys-log-vis.ts
  46. 25 0
      Web/src/api-services/models/sys-menu.ts
  47. 25 0
      Web/src/api-services/models/sys-notice.ts
  48. 0 81
      Web/src/api-services/models/sys-open-access.ts
  49. 24 0
      Web/src/api-services/models/sys-org.ts
  50. 25 0
      Web/src/api-services/models/sys-plugin.ts
  51. 25 0
      Web/src/api-services/models/sys-pos.ts
  52. 25 0
      Web/src/api-services/models/sys-print.ts
  53. 25 0
      Web/src/api-services/models/sys-role.ts
  54. 25 0
      Web/src/api-services/models/sys-tenant.ts
  55. 24 0
      Web/src/api-services/models/sys-user.ts
  56. 25 0
      Web/src/api-services/models/sys-wechat-pay.ts
  57. 24 0
      Web/src/api-services/models/sys-wechat-user.ts
  58. 25 0
      Web/src/api-services/models/tenant-output.ts
  59. 25 0
      Web/src/api-services/models/update-config-input.ts
  60. 25 0
      Web/src/api-services/models/update-dict-data-input.ts
  61. 25 0
      Web/src/api-services/models/update-dict-type-input.ts
  62. 25 0
      Web/src/api-services/models/update-menu-input.ts
  63. 25 0
      Web/src/api-services/models/update-notice-input.ts
  64. 30 6
      Web/src/api-services/models/update-open-access-input.ts
  65. 24 0
      Web/src/api-services/models/update-org-input.ts
  66. 25 0
      Web/src/api-services/models/update-plugin-input.ts
  67. 25 0
      Web/src/api-services/models/update-pos-input.ts
  68. 25 0
      Web/src/api-services/models/update-print-input.ts
  69. 25 0
      Web/src/api-services/models/update-role-input.ts
  70. 25 0
      Web/src/api-services/models/update-tenant-input.ts
  71. 24 0
      Web/src/api-services/models/update-user-input.ts
  72. 2 2
      Web/src/views/system/openAccess/component/helpView.vue

+ 1 - 0
Admin.NET/Admin.NET.Application/GlobalUsings.cs

@@ -13,6 +13,7 @@ global using Furion.DependencyInjection;
 global using Furion.DynamicApiController;
 global using Furion.FriendlyException;
 global using Mapster;
+global using Microsoft.AspNetCore.Authorization;
 global using Microsoft.AspNetCore.Mvc;
 global using Microsoft.Extensions.DependencyInjection;
 global using SqlSugar;

+ 0 - 2
Admin.NET/Admin.NET.Application/OpenApi/DemoOpenApi.cs

@@ -7,8 +7,6 @@
 // 软件按“原样”提供,不提供任何形式的明示或暗示的保证,包括但不限于对适销性、适用性和非侵权的保证。
 // 在任何情况下,作者或版权持有人均不对任何索赔、损害或其他责任负责,无论是因合同、侵权或其他方式引起的,与软件或其使用或其他交易有关。
 
-using Microsoft.AspNetCore.Authorization;
-
 namespace Admin.NET.Application;
 
 ///// <summary>

+ 4 - 2
Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs

@@ -19,13 +19,15 @@ public class SysOpenAccess : EntityBase
     /// <summary>
     /// 身份标识
     /// </summary>
-    [SugarColumn(ColumnDescription = "身份标识", Length = 80)]
+    [SugarColumn(ColumnDescription = "身份标识", Length = 128)]
+    [Required, MaxLength(128)]
     public virtual string AccessKey { get; set; }
 
     /// <summary>
     /// 密钥
     /// </summary>
-    [SugarColumn(ColumnDescription = "密钥", Length = 255)]
+    [SugarColumn(ColumnDescription = "密钥", Length = 256)]
+    [Required, MaxLength(256)]
     public virtual string AccessSecret { get; set; }
 
     /// <summary>

+ 1 - 1
Admin.NET/Admin.NET.Core/GlobalUsings.cs

@@ -61,4 +61,4 @@ global using System.Text;
 global using System.Text.RegularExpressions;
 global using System.Web;
 global using UAParser;
-global using Yitter.IdGenerator;
+global using Yitter.IdGenerator;

+ 11 - 2
Admin.NET/Admin.NET.Core/Service/Auth/Dto/OpenAccessInput.cs → Admin.NET/Admin.NET.Core/Service/OpenAccess/Dto/OpenAccessInput.cs

@@ -1,4 +1,13 @@
-namespace Admin.NET.Core.Service;
+// 麻省理工学院许可证
+//
+// 版权所有 (c) 2021-2023 zuohuaijun,大名科技(天津)有限公司  联系电话/微信:18020030720  QQ:515096995
+//
+// 特此免费授予获得本软件的任何人以处理本软件的权利,但须遵守以下条件:在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
+//
+// 软件按“原样”提供,不提供任何形式的明示或暗示的保证,包括但不限于对适销性、适用性和非侵权的保证。
+// 在任何情况下,作者或版权持有人均不对任何索赔、损害或其他责任负责,无论是因合同、侵权或其他方式引起的,与软件或其使用或其他交易有关。
+
+namespace Admin.NET.Core.Service;
 
 /// <summary>
 /// 开放接口身份输入参数
@@ -38,4 +47,4 @@ public class UpdateOpenAccessInput : AddOpenAccessInput
 
 public class DeleteOpenAccessInput : BaseIdInput
 {
-}
+}

+ 3 - 3
Admin.NET/Admin.NET.Core/Service/Auth/Dto/OpenAccessOutput.cs → Admin.NET/Admin.NET.Core/Service/OpenAccess/Dto/OpenAccessOutput.cs

@@ -1,9 +1,9 @@
 // 麻省理工学院许可证
-// 
+//
 // 版权所有 (c) 2021-2023 zuohuaijun,大名科技(天津)有限公司  联系电话/微信:18020030720  QQ:515096995
-// 
+//
 // 特此免费授予获得本软件的任何人以处理本软件的权利,但须遵守以下条件:在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
-// 
+//
 // 软件按“原样”提供,不提供任何形式的明示或暗示的保证,包括但不限于对适销性、适用性和非侵权的保证。
 // 在任何情况下,作者或版权持有人均不对任何索赔、损害或其他责任负责,无论是因合同、侵权或其他方式引起的,与软件或其使用或其他交易有关。
 

+ 18 - 14
Admin.NET/Admin.NET.Core/Service/Auth/SysOpenAccessService.cs → Admin.NET/Admin.NET.Core/Service/OpenAccess/SysOpenAccessService.cs

@@ -1,4 +1,12 @@
-using Microsoft.VisualBasic;
+// 麻省理工学院许可证
+//
+// 版权所有 (c) 2021-2023 zuohuaijun,大名科技(天津)有限公司  联系电话/微信:18020030720  QQ:515096995
+//
+// 特此免费授予获得本软件的任何人以处理本软件的权利,但须遵守以下条件:在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
+//
+// 软件按“原样”提供,不提供任何形式的明示或暗示的保证,包括但不限于对适销性、适用性和非侵权的保证。
+// 在任何情况下,作者或版权持有人均不对任何索赔、损害或其他责任负责,无论是因合同、侵权或其他方式引起的,与软件或其使用或其他交易有关。
+
 using System.Security.Claims;
 
 namespace Admin.NET.Core.Service;
@@ -10,18 +18,15 @@ namespace Admin.NET.Core.Service;
 public class SysOpenAccessService : IDynamicApiController, ITransient
 {
     private readonly SqlSugarRepository<SysOpenAccess> _sysOpenAccessRep;
-    private readonly SqlSugarRepository<SysUser> _sysUserRep;
     private readonly SysCacheService _sysCacheService;
 
     /// <summary>
     /// 开放接口身份服务构造函数
     /// </summary>
     public SysOpenAccessService(SqlSugarRepository<SysOpenAccess> sysOpenAccessRep,
-        SqlSugarRepository<SysUser> sysUserRep,
         SysCacheService sysCacheService)
     {
         _sysOpenAccessRep = sysOpenAccessRep;
-        _sysUserRep = sysUserRep;
         _sysCacheService = sysCacheService;
     }
 
@@ -34,16 +39,15 @@ public class SysOpenAccessService : IDynamicApiController, ITransient
     public async Task<SqlSugarPagedList<OpenAccessOutput>> Page(OpenAccessInput input)
     {
         return await _sysOpenAccessRep.AsQueryable()
-            .LeftJoin<SysUser>((o, u) => o.BindUserId == u.Id)
-            .LeftJoin<SysTenant>((o, u, t) => o.BindTenantId == t.Id)
-            .LeftJoin<SysOrg>((o, u, t, oo) => t.OrgId == oo.Id)
-            .WhereIF(!string.IsNullOrWhiteSpace(input.AccessKey?.Trim()), (o, u, t, oo) => o.AccessKey.Contains(input.AccessKey))
-            .Select((o, u, t, oo) =>
-                new OpenAccessOutput
-                {
-                    BindUserAccount = u.Account,
-                    BindTenantName = oo.Name,
-                }, true)
+            .LeftJoin<SysUser>((u, a) => u.BindUserId == a.Id)
+            .LeftJoin<SysTenant>((u, a, b) => u.BindTenantId == b.Id)
+            .LeftJoin<SysOrg>((u, a, b, c) => b.OrgId == c.Id)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.AccessKey?.Trim()), (u, a, b, c) => u.AccessKey.Contains(input.AccessKey))
+            .Select((u, a, b, c) => new OpenAccessOutput
+            {
+                BindUserAccount = a.Account,
+                BindTenantName = c.Name,
+            }, true)
             .ToPagedListAsync(input.Page, input.PageSize);
     }
 

+ 1 - 2
Admin.NET/Admin.NET.Core/SignatureAuthentication/GetAccessSecretContext.cs → Admin.NET/Admin.NET.Core/SignatureAuth/GetAccessSecretContext.cs

@@ -16,8 +16,7 @@ namespace Admin.NET.Core;
 /// </summary>
 public class GetAccessSecretContext : BaseContext<SignatureAuthenticationOptions>
 {
-    public GetAccessSecretContext(
-        HttpContext context,
+    public GetAccessSecretContext(HttpContext context,
         AuthenticationScheme scheme,
         SignatureAuthenticationOptions options)
         : base(context, scheme, options)

+ 0 - 0
Admin.NET/Admin.NET.Core/SignatureAuthentication/SignatureAuthenticationDefaults.cs → Admin.NET/Admin.NET.Core/SignatureAuth/SignatureAuthenticationDefaults.cs


+ 0 - 2
Admin.NET/Admin.NET.Core/SignatureAuthentication/SignatureAuthenticationEvent.cs → Admin.NET/Admin.NET.Core/SignatureAuth/SignatureAuthenticationEvent.cs

@@ -7,8 +7,6 @@
 // 软件按“原样”提供,不提供任何形式的明示或暗示的保证,包括但不限于对适销性、适用性和非侵权的保证。
 // 在任何情况下,作者或版权持有人均不对任何索赔、损害或其他责任负责,无论是因合同、侵权或其他方式引起的,与软件或其使用或其他交易有关。
 
-using System.Security.Claims;
-
 namespace Admin.NET.Core;
 
 /// <summary>

+ 0 - 0
Admin.NET/Admin.NET.Core/SignatureAuthentication/SignatureAuthenticationExtensions.cs → Admin.NET/Admin.NET.Core/SignatureAuth/SignatureAuthenticationExtensions.cs


+ 15 - 15
Admin.NET/Admin.NET.Core/SignatureAuthentication/SignatureAuthenticationHandler.cs → Admin.NET/Admin.NET.Core/SignatureAuth/SignatureAuthenticationHandler.cs

@@ -7,10 +7,10 @@
 // 软件按“原样”提供,不提供任何形式的明示或暗示的保证,包括但不限于对适销性、适用性和非侵权的保证。
 // 在任何情况下,作者或版权持有人均不对任何索赔、损害或其他责任负责,无论是因合同、侵权或其他方式引起的,与软件或其使用或其他交易有关。
 
+using Microsoft.AspNetCore.Authentication;
 using System.Security.Claims;
 using System.Security.Cryptography;
 using System.Text.Encodings.Web;
-using Microsoft.AspNetCore.Authentication;
 
 namespace Admin.NET.Core;
 
@@ -46,7 +46,7 @@ public sealed class SignatureAuthenticationHandler : AuthenticationHandler<Signa
     protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
     {
         var accessKey = Request.Headers["accessKey"].FirstOrDefault();
-        var timestampStr = Request.Headers["timestamp"].FirstOrDefault();//精确到秒
+        var timestampStr = Request.Headers["timestamp"].FirstOrDefault(); // 精确到秒
         var nonce = Request.Headers["nonce"].FirstOrDefault();
         var sign = Request.Headers["sign"].FirstOrDefault();
 
@@ -59,7 +59,7 @@ public sealed class SignatureAuthenticationHandler : AuthenticationHandler<Signa
         if (string.IsNullOrEmpty(sign))
             return await AuthenticateResultFailAsync("sign 不能为空");
 
-        //验证请求数据是否在可接受的时间内
+        // 验证请求数据是否在可接受的时间内
         if (!long.TryParse(timestampStr, out var timestamp))
             return await AuthenticateResultFailAsync("timestamp 值不合法");
 
@@ -67,26 +67,26 @@ public sealed class SignatureAuthenticationHandler : AuthenticationHandler<Signa
         if (requestDate > Clock.UtcNow.Add(Options.AllowedDateDrift).LocalDateTime || requestDate < Clock.UtcNow.Subtract(Options.AllowedDateDrift).LocalDateTime)
             return await AuthenticateResultFailAsync("timestamp 值已超过允许的偏差范围");
 
-        //获取 accessSecret
+        // 获取 accessSecret
         var getAccessSecretContext = new GetAccessSecretContext(Context, Scheme, Options) { AccessKey = accessKey };
         var accessSecret = await Events.GetAccessSecret(getAccessSecretContext);
         if (string.IsNullOrEmpty(accessSecret))
             return await AuthenticateResultFailAsync("accessKey 无效");
 
-        //校验签名
+        // 校验签名
         var appSecretByte = Encoding.UTF8.GetBytes(accessSecret);
         string serverSign = SignData(appSecretByte, GetMessageForSign(Context));
 
         if (serverSign != sign)
             return await AuthenticateResultFailAsync("sign 无效的签名");
 
-        //重放检测
+        // 重放检测
         var cacheKey = $"{CacheConst.KeyOpenAccessNonce}{accessKey}|{nonce}";
         if (_cacheService.ExistKey(cacheKey))
             return await AuthenticateResultFailAsync("重复的请求");
-        _cacheService.Set(cacheKey, null, Options.AllowedDateDrift * 2);//缓存过期时间为偏差范围时间的2倍
+        _cacheService.Set(cacheKey, null, Options.AllowedDateDrift * 2); // 缓存过期时间为偏差范围时间的2倍
 
-        //已验证成功
+        // 已验证成功
         var signatureValidatedContext = new SignatureValidatedContext(Context, Scheme, Options)
         {
             Principal = new ClaimsPrincipal(new ClaimsIdentity(SignatureAuthenticationDefaults.AuthenticationScheme)),
@@ -110,7 +110,7 @@ public sealed class SignatureAuthenticationHandler : AuthenticationHandler<Signa
             AuthenticateFailure = authResult.Failure,
         };
         await Events.Challenge(challengeContext);
-        //质询已处理
+        // 质询已处理
         if (challengeContext.Handled) return;
 
         await base.HandleChallengeAsync(properties);
@@ -122,11 +122,11 @@ public sealed class SignatureAuthenticationHandler : AuthenticationHandler<Signa
     /// <returns></returns>
     private static string GetMessageForSign(HttpContext context)
     {
-        var method = context.Request.Method;//请求方法(大写)
-        var url = context.Request.Path;//请求 url,去除协议、域名、参数,以 / 开头
-        var accessKey = context.Request.Headers["accessKey"].FirstOrDefault();//身份标识
-        var timestamp = context.Request.Headers["timestamp"].FirstOrDefault();//时间戳,精确到秒
-        var nonce = context.Request.Headers["nonce"].FirstOrDefault();//唯一随机数
+        var method = context.Request.Method; // 请求方法(大写)
+        var url = context.Request.Path; // 请求 url,去除协议、域名、参数,以 / 开头
+        var accessKey = context.Request.Headers["accessKey"].FirstOrDefault(); // 身份标识
+        var timestamp = context.Request.Headers["timestamp"].FirstOrDefault(); // 时间戳,精确到秒
+        var nonce = context.Request.Headers["nonce"].FirstOrDefault(); // 唯一随机数
 
         return $"{method}&{url}&{accessKey}&{timestamp}&{nonce}";
     }
@@ -157,7 +157,7 @@ public sealed class SignatureAuthenticationHandler : AuthenticationHandler<Signa
     /// <returns></returns>
     private Task<AuthenticateResult> AuthenticateResultFailAsync(string message)
     {
-        //写入身份验证失败消息
+        // 写入身份验证失败消息
         Context.Items[SignatureAuthenticationDefaults.AuthenticateFailMsgKey] = message;
         return Task.FromResult(AuthenticateResult.Fail(message));
     }

+ 0 - 0
Admin.NET/Admin.NET.Core/SignatureAuthentication/SignatureAuthenticationOptions.cs → Admin.NET/Admin.NET.Core/SignatureAuth/SignatureAuthenticationOptions.cs


+ 1 - 2
Admin.NET/Admin.NET.Core/SignatureAuthentication/SignatureChallengeContext.cs → Admin.NET/Admin.NET.Core/SignatureAuth/SignatureChallengeContext.cs

@@ -16,8 +16,7 @@ namespace Admin.NET.Core;
 /// </summary>
 public class SignatureChallengeContext : PropertiesContext<SignatureAuthenticationOptions>
 {
-    public SignatureChallengeContext(
-        HttpContext context,
+    public SignatureChallengeContext(HttpContext context,
         AuthenticationScheme scheme,
         SignatureAuthenticationOptions options,
         AuthenticationProperties properties)

+ 1 - 2
Admin.NET/Admin.NET.Core/SignatureAuthentication/SignatureValidatedContext.cs → Admin.NET/Admin.NET.Core/SignatureAuth/SignatureValidatedContext.cs

@@ -16,8 +16,7 @@ namespace Admin.NET.Core;
 /// </summary>
 public class SignatureValidatedContext : ResultContext<SignatureAuthenticationOptions>
 {
-    public SignatureValidatedContext(
-        HttpContext context,
+    public SignatureValidatedContext(HttpContext context,
         AuthenticationScheme scheme,
         SignatureAuthenticationOptions options)
         : base(context, scheme, options)

+ 1 - 1
Admin.NET/Admin.NET.Core/Util/AdminResultProvider.cs

@@ -65,7 +65,7 @@ public class AdminResultProvider : IUnifyResultProvider
             // 处理 401 状态码
             case StatusCodes.Status401Unauthorized:
                 var msg = "401 登录已过期,请重新登录";
-                //20231005 如果存在身份验证失败消息,则返回消息内容
+                //存在身份验证失败消息,则返回消息内容
                 if (context.Items.TryGetValue(SignatureAuthenticationDefaults.AuthenticateFailMsgKey, out var authFailMsg))
                     msg = authFailMsg + "";
                 await context.Response.WriteAsJsonAsync(RESTfulResult(statusCode, errors: msg),

+ 0 - 75
Web/src/api-services/apis/sys-dict-type-api.ts

@@ -282,49 +282,6 @@ export const SysDictTypeApiAxiosParamCreator = function (configuration?: Configu
         },
         /**
          * 
-         * @summary 获取所有字典集合
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        apiSysDictTypeGetAllDictGet: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/sysDictType/getAllDict`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication Bearer required
-            // http bearer authentication required
-            if (configuration && configuration.accessToken) {
-                const accessToken = typeof configuration.accessToken === 'function'
-                    ? await configuration.accessToken()
-                    : await configuration.accessToken;
-                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
-            }
-
-            const query = new URLSearchParams(localVarUrlObj.search);
-            for (const key in localVarQueryParameter) {
-                query.set(key, localVarQueryParameter[key]);
-            }
-            for (const key in options.params) {
-                query.set(key, options.params[key]);
-            }
-            localVarUrlObj.search = (new URLSearchParams(query)).toString();
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
          * @summary 获取字典类型列表
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -591,19 +548,6 @@ export const SysDictTypeApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 获取所有字典集合
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async apiSysDictTypeGetAllDictGet(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysDictType>>> {
-            const localVarAxiosArgs = await SysDictTypeApiAxiosParamCreator(configuration).apiSysDictTypeGetAllDictGet(options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
-        /**
-         * 
          * @summary 获取字典类型列表
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -718,15 +662,6 @@ export const SysDictTypeApiFactory = function (configuration?: Configuration, ba
         },
         /**
          * 
-         * @summary 获取所有字典集合
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async apiSysDictTypeGetAllDictGet(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysDictType>> {
-            return SysDictTypeApiFp(configuration).apiSysDictTypeGetAllDictGet(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
          * @summary 获取字典类型列表
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -831,16 +766,6 @@ export class SysDictTypeApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 获取所有字典集合
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysDictTypeApi
-     */
-    public async apiSysDictTypeGetAllDictGet(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysDictType>> {
-        return SysDictTypeApiFp(this.configuration).apiSysDictTypeGetAllDictGet(options).then((request) => request(this.axios, this.basePath));
-    }
-    /**
-     * 
      * @summary 获取字典类型列表
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}

+ 25 - 0
Web/src/api-services/models/add-config-input.ts

@@ -11,6 +11,7 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+import { SysUser } from './sys-user';
 import { YesNoEnum } from './yes-no-enum';
 /**
  * 
@@ -43,12 +44,36 @@ export interface AddConfigInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddConfigInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddConfigInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddConfigInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddConfigInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof AddConfigInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof AddConfigInput

+ 25 - 0
Web/src/api-services/models/add-dict-data-input.ts

@@ -13,6 +13,7 @@
  */
 import { StatusEnum } from './status-enum';
 import { SysDictType } from './sys-dict-type';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -44,12 +45,36 @@ export interface AddDictDataInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddDictDataInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddDictDataInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddDictDataInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddDictDataInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof AddDictDataInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof AddDictDataInput

+ 25 - 0
Web/src/api-services/models/add-dict-type-input.ts

@@ -13,6 +13,7 @@
  */
 import { StatusEnum } from './status-enum';
 import { SysDictData } from './sys-dict-data';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -44,12 +45,36 @@ export interface AddDictTypeInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddDictTypeInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddDictTypeInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddDictTypeInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddDictTypeInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof AddDictTypeInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof AddDictTypeInput

+ 25 - 0
Web/src/api-services/models/add-menu-input.ts

@@ -14,6 +14,7 @@
 import { MenuTypeEnum } from './menu-type-enum';
 import { StatusEnum } from './status-enum';
 import { SysMenu } from './sys-menu';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -45,12 +46,36 @@ export interface AddMenuInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddMenuInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddMenuInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddMenuInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddMenuInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof AddMenuInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof AddMenuInput

+ 25 - 0
Web/src/api-services/models/add-notice-input.ts

@@ -13,6 +13,7 @@
  */
 import { NoticeStatusEnum } from './notice-status-enum';
 import { NoticeTypeEnum } from './notice-type-enum';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -44,12 +45,36 @@ export interface AddNoticeInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddNoticeInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddNoticeInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddNoticeInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddNoticeInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof AddNoticeInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof AddNoticeInput

+ 30 - 6
Web/src/api-services/models/add-open-access-input.ts

@@ -44,23 +44,41 @@ export interface AddOpenAccessInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddOpenAccessInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddOpenAccessInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddOpenAccessInput
      */
     updateUserId?: number | null;
     /**
-     * 软删除
-     * @type {boolean}
+     * 
+     * @type {SysUser}
      * @memberof AddOpenAccessInput
      */
-    isDelete?: boolean;
+    updateUser?: SysUser;
     /**
-     * 
-     * @type {SysUser}
+     * 修改者姓名
+     * @type {string}
      * @memberof AddOpenAccessInput
      */
-    bindUser?: SysUser;
+    updateUserName?: string | null;
+    /**
+     * 软删除
+     * @type {boolean}
+     * @memberof AddOpenAccessInput
+     */
+    isDelete?: boolean;
     /**
      * 绑定租户Id
      * @type {number}
@@ -74,6 +92,12 @@ export interface AddOpenAccessInput {
      */
     bindTenant?: SysTenant;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddOpenAccessInput
+     */
+    bindUser?: SysUser;
+    /**
      * 身份标识
      * @type {string}
      * @memberof AddOpenAccessInput

+ 24 - 0
Web/src/api-services/models/add-org-input.ts

@@ -45,12 +45,36 @@ export interface AddOrgInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddOrgInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddOrgInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddOrgInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddOrgInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof AddOrgInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof AddOrgInput

+ 25 - 0
Web/src/api-services/models/add-plugin-input.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -43,12 +44,36 @@ export interface AddPluginInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddPluginInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddPluginInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddPluginInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddPluginInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof AddPluginInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof AddPluginInput

+ 25 - 0
Web/src/api-services/models/add-pos-input.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -43,12 +44,36 @@ export interface AddPosInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddPosInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddPosInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddPosInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddPosInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof AddPosInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof AddPosInput

+ 25 - 0
Web/src/api-services/models/add-print-input.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -43,12 +44,36 @@ export interface AddPrintInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddPrintInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddPrintInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddPrintInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddPrintInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof AddPrintInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof AddPrintInput

+ 25 - 0
Web/src/api-services/models/add-role-input.ts

@@ -13,6 +13,7 @@
  */
 import { DataScopeEnum } from './data-scope-enum';
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -44,12 +45,36 @@ export interface AddRoleInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddRoleInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddRoleInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddRoleInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddRoleInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof AddRoleInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof AddRoleInput

+ 25 - 0
Web/src/api-services/models/add-tenant-input.ts

@@ -13,6 +13,7 @@
  */
 import { DbType } from './db-type';
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 import { TenantTypeEnum } from './tenant-type-enum';
 /**
  * 
@@ -45,12 +46,36 @@ export interface AddTenantInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddTenantInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddTenantInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddTenantInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddTenantInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof AddTenantInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof AddTenantInput

+ 24 - 0
Web/src/api-services/models/add-user-input.ts

@@ -51,12 +51,36 @@ export interface AddUserInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddUserInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof AddUserInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof AddUserInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof AddUserInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof AddUserInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof AddUserInput

+ 0 - 57
Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-open-access.ts

@@ -1,57 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Admin.NET
- * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3),开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
- *
- * OpenAPI spec version: 1.0.0
- * Contact: 515096995@qq.com
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { SqlSugarPagedListSysOpenAccess } from './sql-sugar-paged-list-sys-open-access';
-/**
- * 全局返回结果
- * @export
- * @interface AdminResultSqlSugarPagedListSysOpenAccess
- */
-export interface AdminResultSqlSugarPagedListSysOpenAccess {
-    /**
-     * 状态码
-     * @type {number}
-     * @memberof AdminResultSqlSugarPagedListSysOpenAccess
-     */
-    code?: number;
-    /**
-     * 类型success、warning、error
-     * @type {string}
-     * @memberof AdminResultSqlSugarPagedListSysOpenAccess
-     */
-    type?: string | null;
-    /**
-     * 错误信息
-     * @type {string}
-     * @memberof AdminResultSqlSugarPagedListSysOpenAccess
-     */
-    message?: string | null;
-    /**
-     * 
-     * @type {SqlSugarPagedListSysOpenAccess}
-     * @memberof AdminResultSqlSugarPagedListSysOpenAccess
-     */
-    result?: SqlSugarPagedListSysOpenAccess;
-    /**
-     * 附加数据
-     * @type {any}
-     * @memberof AdminResultSqlSugarPagedListSysOpenAccess
-     */
-    extras?: any | null;
-    /**
-     * 时间
-     * @type {Date}
-     * @memberof AdminResultSqlSugarPagedListSysOpenAccess
-     */
-    time?: Date;
-}

+ 1 - 0
Web/src/api-services/models/db-type.ts

@@ -38,6 +38,7 @@ export enum DbType {
     NUMBER_18 = 18,
     NUMBER_19 = 19,
     NUMBER_20 = 20,
+    NUMBER_21 = 21,
     NUMBER_900 = 900
 }
 

+ 3 - 2
Web/src/api-services/models/gender-enum.ts

@@ -12,12 +12,13 @@
  * Do not edit the class manually.
  */
 /**
- * 性别枚举<br />&nbsp;男 Male = 1<br />&nbsp;女 Female = 2<br />
+ * 性别枚举<br />&nbsp;男 Male = 1<br />&nbsp;女 Female = 2<br />&nbsp;其他 Other = 3<br />
  * @export
  * @enum {string}
  */
 export enum GenderEnum {
     NUMBER_1 = 1,
-    NUMBER_2 = 2
+    NUMBER_2 = 2,
+    NUMBER_3 = 3
 }
 

+ 34 - 10
Web/src/api-services/models/open-access-output.ts

@@ -44,12 +44,36 @@ export interface OpenAccessOutput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof OpenAccessOutput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof OpenAccessOutput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof OpenAccessOutput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof OpenAccessOutput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof OpenAccessOutput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof OpenAccessOutput
@@ -60,37 +84,37 @@ export interface OpenAccessOutput {
      * @type {string}
      * @memberof OpenAccessOutput
      */
-    accessKey?: string | null;
+    accessKey: string;
     /**
      * 密钥
      * @type {string}
      * @memberof OpenAccessOutput
      */
-    accessSecret?: string | null;
+    accessSecret: string;
     /**
-     * 绑定户Id
+     * 绑定户Id
      * @type {number}
      * @memberof OpenAccessOutput
      */
-    bindUserId?: number;
+    bindTenantId?: number;
     /**
      * 
-     * @type {SysUser}
+     * @type {SysTenant}
      * @memberof OpenAccessOutput
      */
-    bindUser?: SysUser;
+    bindTenant?: SysTenant;
     /**
-     * 绑定户Id
+     * 绑定户Id
      * @type {number}
      * @memberof OpenAccessOutput
      */
-    bindTenantId?: number;
+    bindUserId?: number;
     /**
      * 
-     * @type {SysTenant}
+     * @type {SysUser}
      * @memberof OpenAccessOutput
      */
-    bindTenant?: SysTenant;
+    bindUser?: SysUser;
     /**
      * 绑定用户账号
      * @type {string}

+ 0 - 63
Web/src/api-services/models/sql-sugar-paged-list-sys-open-access.ts

@@ -1,63 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Admin.NET
- * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3),开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
- *
- * OpenAPI spec version: 1.0.0
- * Contact: 515096995@qq.com
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { SysOpenAccess } from './sys-open-access';
-/**
- * 分页泛型集合
- * @export
- * @interface SqlSugarPagedListSysOpenAccess
- */
-export interface SqlSugarPagedListSysOpenAccess {
-    /**
-     * 页码
-     * @type {number}
-     * @memberof SqlSugarPagedListSysOpenAccess
-     */
-    page?: number;
-    /**
-     * 页容量
-     * @type {number}
-     * @memberof SqlSugarPagedListSysOpenAccess
-     */
-    pageSize?: number;
-    /**
-     * 总条数
-     * @type {number}
-     * @memberof SqlSugarPagedListSysOpenAccess
-     */
-    total?: number;
-    /**
-     * 总页数
-     * @type {number}
-     * @memberof SqlSugarPagedListSysOpenAccess
-     */
-    totalPages?: number;
-    /**
-     * 当前页集合
-     * @type {Array<SysOpenAccess>}
-     * @memberof SqlSugarPagedListSysOpenAccess
-     */
-    items?: Array<SysOpenAccess> | null;
-    /**
-     * 是否有上一页
-     * @type {boolean}
-     * @memberof SqlSugarPagedListSysOpenAccess
-     */
-    hasPrevPage?: boolean;
-    /**
-     * 是否有下一页
-     * @type {boolean}
-     * @memberof SqlSugarPagedListSysOpenAccess
-     */
-    hasNextPage?: boolean;
-}

+ 25 - 0
Web/src/api-services/models/sys-code-gen-config.ts

@@ -11,6 +11,7 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+import { SysUser } from './sys-user';
 /**
  * 代码生成字段配置表
  * @export
@@ -42,12 +43,36 @@ export interface SysCodeGenConfig {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysCodeGenConfig
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysCodeGenConfig
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysCodeGenConfig
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysCodeGenConfig
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysCodeGenConfig
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysCodeGenConfig

+ 25 - 0
Web/src/api-services/models/sys-code-gen.ts

@@ -11,6 +11,7 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+import { SysUser } from './sys-user';
 /**
  * 代码生成表
  * @export
@@ -42,12 +43,36 @@ export interface SysCodeGen {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysCodeGen
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysCodeGen
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysCodeGen
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysCodeGen
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysCodeGen
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysCodeGen

+ 25 - 0
Web/src/api-services/models/sys-config.ts

@@ -11,6 +11,7 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+import { SysUser } from './sys-user';
 import { YesNoEnum } from './yes-no-enum';
 /**
  * 系统参数配置表
@@ -43,12 +44,36 @@ export interface SysConfig {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysConfig
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysConfig
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysConfig
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysConfig
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysConfig
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysConfig

+ 25 - 0
Web/src/api-services/models/sys-dict-data.ts

@@ -13,6 +13,7 @@
  */
 import { StatusEnum } from './status-enum';
 import { SysDictType } from './sys-dict-type';
+import { SysUser } from './sys-user';
 /**
  * 系统字典值表
  * @export
@@ -44,12 +45,36 @@ export interface SysDictData {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysDictData
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysDictData
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysDictData
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysDictData
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysDictData
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysDictData

+ 25 - 0
Web/src/api-services/models/sys-dict-type.ts

@@ -13,6 +13,7 @@
  */
 import { StatusEnum } from './status-enum';
 import { SysDictData } from './sys-dict-data';
+import { SysUser } from './sys-user';
 /**
  * 系统字典类型表
  * @export
@@ -44,12 +45,36 @@ export interface SysDictType {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysDictType
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysDictType
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysDictType
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysDictType
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysDictType
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysDictType

+ 25 - 0
Web/src/api-services/models/sys-file.ts

@@ -11,6 +11,7 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+import { SysUser } from './sys-user';
 /**
  * 系统文件表
  * @export
@@ -42,12 +43,36 @@ export interface SysFile {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysFile
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysFile
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysFile
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysFile
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysFile
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysFile

+ 25 - 0
Web/src/api-services/models/sys-log-diff.ts

@@ -11,6 +11,7 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+import { SysUser } from './sys-user';
 /**
  * 系统差异日志表
  * @export
@@ -42,12 +43,36 @@ export interface SysLogDiff {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysLogDiff
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysLogDiff
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysLogDiff
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysLogDiff
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysLogDiff
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysLogDiff

+ 25 - 0
Web/src/api-services/models/sys-log-ex.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { LogLevel } from './log-level';
+import { SysUser } from './sys-user';
 /**
  * 系统异常日志表
  * @export
@@ -43,12 +44,36 @@ export interface SysLogEx {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysLogEx
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysLogEx
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysLogEx
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysLogEx
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysLogEx
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysLogEx

+ 25 - 0
Web/src/api-services/models/sys-log-op.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { LogLevel } from './log-level';
+import { SysUser } from './sys-user';
 /**
  * 系统操作日志表
  * @export
@@ -43,12 +44,36 @@ export interface SysLogOp {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysLogOp
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysLogOp
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysLogOp
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysLogOp
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysLogOp
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysLogOp

+ 25 - 0
Web/src/api-services/models/sys-log-vis.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { LogLevel } from './log-level';
+import { SysUser } from './sys-user';
 /**
  * 系统访问日志表
  * @export
@@ -43,12 +44,36 @@ export interface SysLogVis {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysLogVis
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysLogVis
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysLogVis
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysLogVis
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysLogVis
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysLogVis

+ 25 - 0
Web/src/api-services/models/sys-menu.ts

@@ -14,6 +14,7 @@
 import { MenuTypeEnum } from './menu-type-enum';
 import { StatusEnum } from './status-enum';
 import { SysMenu } from './sys-menu';
+import { SysUser } from './sys-user';
 /**
  * 系统菜单表
  * @export
@@ -45,12 +46,36 @@ export interface SysMenu {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysMenu
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysMenu
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysMenu
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysMenu
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysMenu
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysMenu

+ 25 - 0
Web/src/api-services/models/sys-notice.ts

@@ -13,6 +13,7 @@
  */
 import { NoticeStatusEnum } from './notice-status-enum';
 import { NoticeTypeEnum } from './notice-type-enum';
+import { SysUser } from './sys-user';
 /**
  * 系统通知公告表
  * @export
@@ -44,12 +45,36 @@ export interface SysNotice {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysNotice
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysNotice
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysNotice
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysNotice
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysNotice
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysNotice

+ 0 - 81
Web/src/api-services/models/sys-open-access.ts

@@ -1,81 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Admin.NET
- * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3),开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
- *
- * OpenAPI spec version: 1.0.0
- * Contact: 515096995@qq.com
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-import { SysUser } from './sys-user';
-/**
- * 开放接口身份表
- * @export
- * @interface SysOpenAccess
- */
-export interface SysOpenAccess {
-    /**
-     * 雪花Id
-     * @type {number}
-     * @memberof SysOpenAccess
-     */
-    id?: number;
-    /**
-     * 创建时间
-     * @type {Date}
-     * @memberof SysOpenAccess
-     */
-    createTime?: Date | null;
-    /**
-     * 更新时间
-     * @type {Date}
-     * @memberof SysOpenAccess
-     */
-    updateTime?: Date | null;
-    /**
-     * 创建者Id
-     * @type {number}
-     * @memberof SysOpenAccess
-     */
-    createUserId?: number | null;
-    /**
-     * 修改者Id
-     * @type {number}
-     * @memberof SysOpenAccess
-     */
-    updateUserId?: number | null;
-    /**
-     * 软删除
-     * @type {boolean}
-     * @memberof SysOpenAccess
-     */
-    isDelete?: boolean;
-    /**
-     * 身份标识
-     * @type {string}
-     * @memberof SysOpenAccess
-     */
-    accessKey?: string | null;
-    /**
-     * 密钥
-     * @type {string}
-     * @memberof SysOpenAccess
-     */
-    accessSecret?: string | null;
-    /**
-     * 绑定用户Id
-     * @type {number}
-     * @memberof SysOpenAccess
-     */
-    bindUserId?: number;
-    /**
-     * 
-     * @type {SysUser}
-     * @memberof SysOpenAccess
-     */
-    bindUser?: SysUser;
-}

+ 24 - 0
Web/src/api-services/models/sys-org.ts

@@ -45,12 +45,36 @@ export interface SysOrg {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysOrg
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysOrg
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysOrg
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysOrg
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysOrg
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysOrg

+ 25 - 0
Web/src/api-services/models/sys-plugin.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 /**
  * 系统动态插件表
  * @export
@@ -43,12 +44,36 @@ export interface SysPlugin {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysPlugin
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysPlugin
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysPlugin
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysPlugin
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysPlugin
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysPlugin

+ 25 - 0
Web/src/api-services/models/sys-pos.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 /**
  * 系统职位表
  * @export
@@ -43,12 +44,36 @@ export interface SysPos {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysPos
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysPos
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysPos
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysPos
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysPos
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysPos

+ 25 - 0
Web/src/api-services/models/sys-print.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 /**
  * 系统打印模板表
  * @export
@@ -43,12 +44,36 @@ export interface SysPrint {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysPrint
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysPrint
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysPrint
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysPrint
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysPrint
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysPrint

+ 25 - 0
Web/src/api-services/models/sys-role.ts

@@ -13,6 +13,7 @@
  */
 import { DataScopeEnum } from './data-scope-enum';
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 /**
  * 系统角色表
  * @export
@@ -44,12 +45,36 @@ export interface SysRole {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysRole
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysRole
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysRole
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysRole
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysRole
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysRole

+ 25 - 0
Web/src/api-services/models/sys-tenant.ts

@@ -13,6 +13,7 @@
  */
 import { DbType } from './db-type';
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 import { TenantTypeEnum } from './tenant-type-enum';
 /**
  * 系统租户表
@@ -45,12 +46,36 @@ export interface SysTenant {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysTenant
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysTenant
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysTenant
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysTenant
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysTenant
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysTenant

+ 24 - 0
Web/src/api-services/models/sys-user.ts

@@ -50,12 +50,36 @@ export interface SysUser {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysUser
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysUser
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysUser
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysUser
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysUser
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysUser

+ 25 - 0
Web/src/api-services/models/sys-wechat-pay.ts

@@ -11,6 +11,7 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+import { SysUser } from './sys-user';
 import { SysWechatUser } from './sys-wechat-user';
 /**
  * 系统微信支付表
@@ -43,12 +44,36 @@ export interface SysWechatPay {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysWechatPay
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysWechatPay
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysWechatPay
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysWechatPay
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysWechatPay
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysWechatPay

+ 24 - 0
Web/src/api-services/models/sys-wechat-user.ts

@@ -44,12 +44,36 @@ export interface SysWechatUser {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysWechatUser
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysWechatUser
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof SysWechatUser
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof SysWechatUser
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysWechatUser
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof SysWechatUser

+ 25 - 0
Web/src/api-services/models/tenant-output.ts

@@ -13,6 +13,7 @@
  */
 import { DbType } from './db-type';
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 import { TenantTypeEnum } from './tenant-type-enum';
 /**
  * 
@@ -45,12 +46,36 @@ export interface TenantOutput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof TenantOutput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof TenantOutput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof TenantOutput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof TenantOutput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof TenantOutput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof TenantOutput

+ 25 - 0
Web/src/api-services/models/update-config-input.ts

@@ -11,6 +11,7 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+import { SysUser } from './sys-user';
 import { YesNoEnum } from './yes-no-enum';
 /**
  * 
@@ -43,12 +44,36 @@ export interface UpdateConfigInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateConfigInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdateConfigInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdateConfigInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateConfigInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof UpdateConfigInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof UpdateConfigInput

+ 25 - 0
Web/src/api-services/models/update-dict-data-input.ts

@@ -13,6 +13,7 @@
  */
 import { StatusEnum } from './status-enum';
 import { SysDictType } from './sys-dict-type';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -44,12 +45,36 @@ export interface UpdateDictDataInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateDictDataInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdateDictDataInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdateDictDataInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateDictDataInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof UpdateDictDataInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof UpdateDictDataInput

+ 25 - 0
Web/src/api-services/models/update-dict-type-input.ts

@@ -13,6 +13,7 @@
  */
 import { StatusEnum } from './status-enum';
 import { SysDictData } from './sys-dict-data';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -44,12 +45,36 @@ export interface UpdateDictTypeInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateDictTypeInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdateDictTypeInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdateDictTypeInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateDictTypeInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof UpdateDictTypeInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof UpdateDictTypeInput

+ 25 - 0
Web/src/api-services/models/update-menu-input.ts

@@ -14,6 +14,7 @@
 import { MenuTypeEnum } from './menu-type-enum';
 import { StatusEnum } from './status-enum';
 import { SysMenu } from './sys-menu';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -45,12 +46,36 @@ export interface UpdateMenuInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateMenuInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdateMenuInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdateMenuInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateMenuInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof UpdateMenuInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof UpdateMenuInput

+ 25 - 0
Web/src/api-services/models/update-notice-input.ts

@@ -13,6 +13,7 @@
  */
 import { NoticeStatusEnum } from './notice-status-enum';
 import { NoticeTypeEnum } from './notice-type-enum';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -44,12 +45,36 @@ export interface UpdateNoticeInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateNoticeInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdateNoticeInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdateNoticeInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateNoticeInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof UpdateNoticeInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof UpdateNoticeInput

+ 30 - 6
Web/src/api-services/models/update-open-access-input.ts

@@ -44,23 +44,41 @@ export interface UpdateOpenAccessInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateOpenAccessInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdateOpenAccessInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdateOpenAccessInput
      */
     updateUserId?: number | null;
     /**
-     * 软删除
-     * @type {boolean}
+     * 
+     * @type {SysUser}
      * @memberof UpdateOpenAccessInput
      */
-    isDelete?: boolean;
+    updateUser?: SysUser;
     /**
-     * 
-     * @type {SysUser}
+     * 修改者姓名
+     * @type {string}
      * @memberof UpdateOpenAccessInput
      */
-    bindUser?: SysUser;
+    updateUserName?: string | null;
+    /**
+     * 软删除
+     * @type {boolean}
+     * @memberof UpdateOpenAccessInput
+     */
+    isDelete?: boolean;
     /**
      * 绑定租户Id
      * @type {number}
@@ -74,6 +92,12 @@ export interface UpdateOpenAccessInput {
      */
     bindTenant?: SysTenant;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateOpenAccessInput
+     */
+    bindUser?: SysUser;
+    /**
      * 身份标识
      * @type {string}
      * @memberof UpdateOpenAccessInput

+ 24 - 0
Web/src/api-services/models/update-org-input.ts

@@ -45,12 +45,36 @@ export interface UpdateOrgInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateOrgInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdateOrgInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdateOrgInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateOrgInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof UpdateOrgInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof UpdateOrgInput

+ 25 - 0
Web/src/api-services/models/update-plugin-input.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -43,12 +44,36 @@ export interface UpdatePluginInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdatePluginInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdatePluginInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdatePluginInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdatePluginInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof UpdatePluginInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof UpdatePluginInput

+ 25 - 0
Web/src/api-services/models/update-pos-input.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -43,12 +44,36 @@ export interface UpdatePosInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdatePosInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdatePosInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdatePosInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdatePosInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof UpdatePosInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof UpdatePosInput

+ 25 - 0
Web/src/api-services/models/update-print-input.ts

@@ -12,6 +12,7 @@
  * Do not edit the class manually.
  */
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -43,12 +44,36 @@ export interface UpdatePrintInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdatePrintInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdatePrintInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdatePrintInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdatePrintInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof UpdatePrintInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof UpdatePrintInput

+ 25 - 0
Web/src/api-services/models/update-role-input.ts

@@ -13,6 +13,7 @@
  */
 import { DataScopeEnum } from './data-scope-enum';
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -44,12 +45,36 @@ export interface UpdateRoleInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateRoleInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdateRoleInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdateRoleInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateRoleInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof UpdateRoleInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof UpdateRoleInput

+ 25 - 0
Web/src/api-services/models/update-tenant-input.ts

@@ -13,6 +13,7 @@
  */
 import { DbType } from './db-type';
 import { StatusEnum } from './status-enum';
+import { SysUser } from './sys-user';
 import { TenantTypeEnum } from './tenant-type-enum';
 /**
  * 
@@ -45,12 +46,36 @@ export interface UpdateTenantInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateTenantInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdateTenantInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdateTenantInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateTenantInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof UpdateTenantInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof UpdateTenantInput

+ 24 - 0
Web/src/api-services/models/update-user-input.ts

@@ -51,12 +51,36 @@ export interface UpdateUserInput {
      */
     createUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateUserInput
+     */
+    createUser?: SysUser;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof UpdateUserInput
+     */
+    createUserName?: string | null;
+    /**
      * 修改者Id
      * @type {number}
      * @memberof UpdateUserInput
      */
     updateUserId?: number | null;
     /**
+     * 
+     * @type {SysUser}
+     * @memberof UpdateUserInput
+     */
+    updateUser?: SysUser;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof UpdateUserInput
+     */
+    updateUserName?: string | null;
+    /**
      * 软删除
      * @type {boolean}
      * @memberof UpdateUserInput

+ 2 - 2
Web/src/views/system/openAccess/component/helpView.vue

@@ -7,11 +7,11 @@
 					<span> 说明 </span>
 				</div>
 			</template>
-			<template #footer>
+			<!-- <template #footer>
 				<span class="dialog-footer">
 					<el-button @click="close">关 闭</el-button>
 				</span>
-			</template>
+			</template> -->
 			<div class="text-content">
 				<h2>OpenAPI 使用</h2>
 				<ul>