😒固定内置接口名称以适应自定义应用层接口多样性

Admin.NET/Admin.NET.Application/Configuration/App.json

@@ -14,7 +14,7 @@
         "CamelCaseSeparator": "", // 骆驼(驼峰)/帕斯卡命名分隔符
         "LowercaseRoute": false, // 小写路由格式
         "AsLowerCamelCase": true, // 启用小驼峰命名（首字母小写）
-        "KeepVerb": false // 保留动作谓词
+        //"KeepVerb": false // 保留动作谓词
         //"KeepName": true // 保留默认名称
     },
     "FriendlyExceptionSettings": {

Admin.NET/Admin.NET.Application/Configuration/JWT.json

@@ -10,7 +10,8 @@
         "ValidAudience": "Admin.NET", // 签收方，string 类型
         "ValidateLifetime": true, // 是否验证过期时间，bool 类型，默认true，建议true
         "ExpiredTime": 10080, // 过期时间，long 类型，单位分钟，默认20分钟
-        "ClockSkew": 5 // 过期时间容错值，long 类型，单位秒，默认5秒
+        "ClockSkew": 5, // 过期时间容错值，long 类型，单位秒，默认5秒
+        "Algorithm": "HS256" // 加密算法，string 类型，默认 HS256
     },
     "RefreshToken": {
         "ExpiredTime": 20160 // 过期时间单位分钟（一般 refresh_token 的有效时间 > 2 * access_token 的有效时间）

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -4133,11 +4133,11 @@
         </member>
         <member name="M:Admin.NET.Core.Service.SysAuthService.GetUserInfo">
             <summary>
-            获取用户信息
+            获取登录账号信息
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysAuthService.RefreshToken(System.String)">
+        <member name="M:Admin.NET.Core.Service.SysAuthService.GetRefreshToken(System.String)">
             <summary>
             获取刷新Token
             </summary>
@@ -4151,25 +4151,25 @@
         </member>
         <member name="M:Admin.NET.Core.Service.SysAuthService.GetLoginConfig">
             <summary>
-            登录配置
+            获取登录配置
             </summary>
             <returns></returns>
         </member>
         <member name="M:Admin.NET.Core.Service.SysAuthService.GetCaptcha">
             <summary>
-            生成图片验证码
+            获取验证码
             </summary>
             <returns></returns>
         </member>
         <member name="M:Admin.NET.Core.Service.SysAuthService.SwaggerCheckUrl">
             <summary>
-            Swagger登录检查
+            swagger登录检查
             </summary>
             <returns></returns>
         </member>
         <member name="M:Admin.NET.Core.Service.SysAuthService.SwaggerSubmitUrl(Furion.SpecificationDocument.SpecificationAuth)">
             <summary>
-            Swagger登录
+            swagger登录提交
             </summary>
             <param name="auth"></param>
             <returns></returns>
@@ -4181,7 +4181,7 @@
         </member>
         <member name="M:Admin.NET.Core.Service.SysCacheService.GetKeyList">
             <summary>
-            获取所有缓存键名
+            获取缓存键名集合
             </summary>
             <returns></returns>
         </member>
@@ -4655,18 +4655,18 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysCodeGenConfigService.Delete(System.Int64)">
+        <member name="M:Admin.NET.Core.Service.SysCodeGenConfigService.UpdateCodeGenConfig(System.Collections.Generic.List{Admin.NET.Core.Service.CodeGenConfig})">
             <summary>
-            删除代码生成配置
+            更新代码生成配置
             </summary>
-            <param name="codeGenId"></param>
+            <param name="inputList"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysCodeGenConfigService.UpdateCodeGenConfig(System.Collections.Generic.List{Admin.NET.Core.Service.CodeGenConfig})">
+        <member name="M:Admin.NET.Core.Service.SysCodeGenConfigService.DeleteCodeGenConfig(System.Int64)">
             <summary>
-            更新代码生成配置
+            删除代码生成配置
             </summary>
-            <param name="inputList"></param>
+            <param name="codeGenId"></param>
             <returns></returns>
         </member>
         <member name="M:Admin.NET.Core.Service.SysCodeGenConfigService.GetDetail(Admin.NET.Core.Service.CodeGenConfig)">
@@ -4709,18 +4709,18 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysCodeGenService.DeleteCodeGen(System.Collections.Generic.List{Admin.NET.Core.Service.DeleteCodeGenInput})">
+        <member name="M:Admin.NET.Core.Service.SysCodeGenService.UpdateCodeGen(Admin.NET.Core.Service.UpdateCodeGenInput)">
             <summary>
-            删除代码生成
+            更新代码生成
             </summary>
-            <param name="inputs"></param>
+            <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysCodeGenService.UpdateCodeGen(Admin.NET.Core.Service.UpdateCodeGenInput)">
+        <member name="M:Admin.NET.Core.Service.SysCodeGenService.DeleteCodeGen(System.Collections.Generic.List{Admin.NET.Core.Service.DeleteCodeGenInput})">
             <summary>
-            更新代码生成
+            删除代码生成
             </summary>
-            <param name="input"></param>
+            <param name="inputs"></param>
             <returns></returns>
         </member>
         <member name="M:Admin.NET.Core.Service.SysCodeGenService.GetDetail(Admin.NET.Core.Service.QueryCodeGenInput)">
@@ -4855,16 +4855,16 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysConfigService.GetDetail(Admin.NET.Core.Service.ConfigInput)">
+        <member name="M:Admin.NET.Core.Service.SysConfigService.DeleteConfig(Admin.NET.Core.Service.DeleteConfigInput)">
             <summary>
-            获取参数配置详情
+            删除参数配置
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysConfigService.DeleteConfig(Admin.NET.Core.Service.DeleteConfigInput)">
+        <member name="M:Admin.NET.Core.Service.SysConfigService.GetDetail(Admin.NET.Core.Service.ConfigInput)">
             <summary>
-            删除参数配置
+            获取参数配置详情
             </summary>
             <param name="input"></param>
             <returns></returns>
@@ -5112,16 +5112,16 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysDictDataService.GetDetail(Admin.NET.Core.Service.DictDataInput)">
+        <member name="M:Admin.NET.Core.Service.SysDictDataService.DeleteDictData(Admin.NET.Core.Service.DeleteDictDataInput)">
             <summary>
-            获取字典值详情
+            删除字典值
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysDictDataService.DeleteDictData(Admin.NET.Core.Service.DeleteDictDataInput)">
+        <member name="M:Admin.NET.Core.Service.SysDictDataService.GetDetail(Admin.NET.Core.Service.DictDataInput)">
             <summary>
-            删除字典值
+            获取字典值详情
             </summary>
             <param name="input"></param>
             <returns></returns>
@@ -5140,14 +5140,14 @@
             <param name="dictTypeId"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysDictDataService.GetDictDataList(System.String)">
+        <member name="M:Admin.NET.Core.Service.SysDictDataService.GetDataList(System.String)">
             <summary>
             根据字典类型编码获取字典值集合
             </summary>
             <param name="code"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysDictDataService.GetDictDataList(Admin.NET.Core.Service.QueryDictDataInput)">
+        <member name="M:Admin.NET.Core.Service.SysDictDataService.GetDataList(Admin.NET.Core.Service.QueryDictDataInput)">
             <summary>
             根据查询条件获取字典值集合
             </summary>
@@ -5192,16 +5192,16 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysDictTypeService.GetDetail(Admin.NET.Core.Service.DictTypeInput)">
+        <member name="M:Admin.NET.Core.Service.SysDictTypeService.DeleteDictType(Admin.NET.Core.Service.DeleteDictTypeInput)">
             <summary>
-            获取字典类型详情
+            删除字典类型
             </summary>
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysDictTypeService.DeleteDictType(Admin.NET.Core.Service.DeleteDictTypeInput)">
+        <member name="M:Admin.NET.Core.Service.SysDictTypeService.GetDetail(Admin.NET.Core.Service.DictTypeInput)">
             <summary>
-            删除字典类型
+            获取字典类型详情
             </summary>
             <param name="input"></param>
             <returns></returns>
@@ -5837,7 +5837,7 @@
         </member>
         <member name="M:Admin.NET.Core.Service.SysMenuService.GetBtnPermissionList">
             <summary>
-            获取按钮权限列表
+            获取按钮权限集合
             </summary>
             <returns></returns>
         </member>
@@ -5941,7 +5941,7 @@
             <param name="input"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysNoticeService.Public(Admin.NET.Core.Service.NoticeInput)">
+        <member name="M:Admin.NET.Core.Service.SysNoticeService.PublicNotice(Admin.NET.Core.Service.NoticeInput)">
             <summary>
             发布通知公告
             </summary>
@@ -6424,7 +6424,7 @@
         </member>
         <member name="M:Admin.NET.Core.Service.SysRoleService.GetOwnMenuList(Admin.NET.Core.Service.RoleInput)">
             <summary>
-            根据角色Id获取菜单集合
+            根据角色Id获取菜单Id集合
             </summary>
             <param name="input"></param>
             <returns></returns>
@@ -6842,7 +6842,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysUserService.SetBaseInfo(Admin.NET.Core.SysUser)">
+        <member name="M:Admin.NET.Core.Service.SysUserService.UpdateBaseInfo(Admin.NET.Core.SysUser)">
             <summary>
             更新用户基本信息
             </summary>
@@ -6878,14 +6878,14 @@
         </member>
         <member name="M:Admin.NET.Core.Service.SysUserService.GetOwnRoleList(System.Int64)">
             <summary>
-            获取用户拥有角色
+            获取用户拥有角色集合
             </summary>
             <param name="userId"></param>
             <returns></returns>
         </member>
-        <member name="M:Admin.NET.Core.Service.SysUserService.GetExtOrgList(System.Int64)">
+        <member name="M:Admin.NET.Core.Service.SysUserService.GetOwnExtOrgList(System.Int64)">
             <summary>
-            获取用户扩展机构
+            获取用户扩展机构集合
             </summary>
             <param name="userId"></param>
             <returns></returns>

Admin.NET/Admin.NET.Core/Entity/SysUser.cs

@@ -18,7 +18,7 @@ public class SysUser : EntityTenant
     /// 密码
     /// </summary>
     [SugarColumn(ColumnDescription = "密码", Length = 512)]
-    [Required, MaxLength(512)]
+    [MaxLength(512)]
     [System.Text.Json.Serialization.JsonIgnore]
     [JsonIgnore]
     public virtual string Password { get; set; }

Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -50,6 +50,7 @@ public class SysAuthService : IDynamicApiController, ITransient
     /// <param name="input"></param>
     /// <remarks>用户名/密码：superadmin/123456</remarks>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Login")]
     [AllowAnonymous]
     [SuppressMonitor]
     public async Task<LoginOutput> Login([Required] LoginInput input)
@@ -121,9 +122,10 @@ public class SysAuthService : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// 获取用户信息
+    /// 获取登录账号信息
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "UserInfo")]
     public async Task<LoginUserOutput> GetUserInfo()
     {
         var user = await _sysUserRep.GetFirstAsync(u => u.Id == _userManager.UserId);
@@ -174,7 +176,8 @@ public class SysAuthService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="accessToken"></param>
     /// <returns></returns>
-    public string RefreshToken([Required] string accessToken)
+    [ApiDescriptionSettings(Name = "RefreshToken")]
+    public string GetRefreshToken([Required] string accessToken)
     {
         return JWTEncryption.GenerateRefreshToken(accessToken, _refreshTokenOptions.ExpiredTime);
     }
@@ -182,6 +185,7 @@ public class SysAuthService : IDynamicApiController, ITransient
     /// <summary>
     /// 退出系统
     /// </summary>
+    [ApiDescriptionSettings(Name = "Logout")]
     public async void Logout()
     {
         if (string.IsNullOrWhiteSpace(_userManager.Account))
@@ -203,9 +207,10 @@ public class SysAuthService : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// 登录配置
+    /// 获取登录配置
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "LoginConfig")]
     [AllowAnonymous]
     [SuppressMonitor]
     public async Task<dynamic> GetLoginConfig()
@@ -217,9 +222,10 @@ public class SysAuthService : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// 生成图片验证码
+    /// 获取验证码
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Captcha")]
     [AllowAnonymous]
     [SuppressMonitor]
     public dynamic GetCaptcha()
@@ -230,7 +236,7 @@ public class SysAuthService : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// Swagger登录检查
+    /// swagger登录检查
     /// </summary>
     /// <returns></returns>
     [HttpPost("/api/swagger/checkUrl"), NonUnify]
@@ -241,7 +247,7 @@ public class SysAuthService : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// Swagger登录
+    /// swagger登录提交
     /// </summary>
     /// <param name="auth"></param>
     /// <returns></returns>

Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs

@@ -14,9 +14,10 @@ public class SysCacheService : IDynamicApiController, ISingleton
     }
 
     /// <summary>
-    /// 获取所有缓存键名
+    /// 获取缓存键名集合
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "KeyList")]
     public List<string> GetKeyList()
     {
         return _cache.Keys.ToList();
@@ -28,7 +29,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
     /// <param name="key"></param>
     /// <param name="value"></param>
     /// <returns></returns>
-    [ApiDescriptionSettings(Name = "Add")]
+    [ApiDescriptionSettings(false)]
     public void Set(string key, object value)
     {
         _cache.Set(key, value);
@@ -41,7 +42,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
     /// <param name="value"></param>
     /// <param name="expire"></param>
     /// <returns></returns>
-    [ApiDescriptionSettings(Name = "AddAndSetExp")]
+    [ApiDescriptionSettings(false)]
     public void Set(string key, object value, TimeSpan expire)
     {
         _cache.Set(key, value, expire);
@@ -53,7 +54,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
     /// <typeparam name="T"></typeparam>
     /// <param name="key"></param>
     /// <returns></returns>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     public T Get<T>(string key)
     {
         return _cache.Get<T>(key);
@@ -75,7 +76,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
     /// </summary>
     /// <param name="key">键</param>
     /// <returns></returns>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     public bool ExistKey(string key)
     {
         return _cache.ContainsKey(key);
@@ -99,6 +100,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
     /// </summary>
     /// <param name="key"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Value")]
     public dynamic GetValue(string key)
     {
         return _cache.Get<dynamic>(key);

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs

@@ -18,6 +18,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "List")]
     public async Task<List<CodeGenConfig>> GetList([FromQuery] CodeGenConfig input)
     {
         return await _db.Queryable<SysCodeGenConfig>()
@@ -25,17 +26,6 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
             .Select<CodeGenConfig>().ToListAsync();
     }
 
-    /// <summary>
-    /// 删除代码生成配置
-    /// </summary>
-    /// <param name="codeGenId"></param>
-    /// <returns></returns>
-    [NonAction]
-    public async Task Delete(long codeGenId)
-    {
-        await _db.Deleteable<SysCodeGenConfig>().Where(u => u.CodeGenId == codeGenId).ExecuteCommandAsync();
-    }
-
     /// <summary>
     /// 更新代码生成配置
     /// </summary>
@@ -48,11 +38,23 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
         await _db.Updateable(inputList.Adapt<List<SysCodeGenConfig>>()).ExecuteCommandAsync();
     }
 
+    /// <summary>
+    /// 删除代码生成配置
+    /// </summary>
+    /// <param name="codeGenId"></param>
+    /// <returns></returns>
+    [ApiDescriptionSettings(false)]
+    public async Task DeleteCodeGenConfig(long codeGenId)
+    {
+        await _db.Deleteable<SysCodeGenConfig>().Where(u => u.CodeGenId == codeGenId).ExecuteCommandAsync();
+    }
+
     /// <summary>
     /// 获取代码生成配置详情
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Detail")]
     public async Task<SysCodeGenConfig> GetDetail([FromQuery] CodeGenConfig input)
     {
         return await _db.Queryable<SysCodeGenConfig>().FirstAsync(u => u.Id == input.Id);
@@ -63,7 +65,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="tableColumnOuputList"></param>
     /// <param name="codeGenerate"></param>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     public void AddList(List<ColumnOuput> tableColumnOuputList, SysCodeGen codeGenerate)
     {
         if (tableColumnOuputList == null) return;

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -31,6 +31,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<SysCodeGen>> GetPage([FromQuery] CodeGenInput input)
     {
         return await _db.Queryable<SysCodeGen>()
@@ -57,6 +58,21 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         _codeGenConfigService.AddList(GetColumnList(input), newCodeGen);
     }
 
+    /// <summary>
+    /// 更新代码生成
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Update")]
+    public async Task UpdateCodeGen(UpdateCodeGenInput input)
+    {
+        var isExist = await _db.Queryable<SysCodeGen>().AnyAsync(u => u.TableName == input.TableName && u.Id != input.Id);
+        if (isExist)
+            throw Oops.Oh(ErrorCodeEnum.D1400);
+
+        await _db.Updateable(input.Adapt<SysCodeGen>()).ExecuteCommandAsync();
+    }
+
     /// <summary>
     /// 删除代码生成
     /// </summary>
@@ -73,31 +89,17 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             _db.Deleteable<SysCodeGen>().In(u.Id).ExecuteCommand();
 
             // 删除配置表中
-            codeGenConfigTaskList.Add(_codeGenConfigService.Delete(u.Id));
+            codeGenConfigTaskList.Add(_codeGenConfigService.DeleteCodeGenConfig(u.Id));
         });
         await Task.WhenAll(codeGenConfigTaskList);
     }
 
-    /// <summary>
-    /// 更新代码生成
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [ApiDescriptionSettings(Name = "Update")]
-    public async Task UpdateCodeGen(UpdateCodeGenInput input)
-    {
-        var isExist = await _db.Queryable<SysCodeGen>().AnyAsync(u => u.TableName == input.TableName && u.Id != input.Id);
-        if (isExist)
-            throw Oops.Oh(ErrorCodeEnum.D1400);
-
-        await _db.Updateable(input.Adapt<SysCodeGen>()).ExecuteCommandAsync();
-    }
-
     /// <summary>
     /// 获取代码生成详情
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Detail")]
     public async Task<SysCodeGen> GetDetail([FromQuery] QueryCodeGenInput input)
     {
         return await _db.Queryable<SysCodeGen>().SingleAsync(m => m.Id == input.Id);
@@ -107,6 +109,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// 获取数据库库集合
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "DatabaseList")]
     public async Task<List<DatabaseOutput>> GetDatabaseList()
     {
         var dbCongigs = App.GetOptions<DbConnectionOptions>().ConnectionConfigs;
@@ -117,6 +120,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// 获取数据库表(实体)集合
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "TableList")]
     public async Task<List<TableOutput>> GetTableList(string configId = SqlSugarConst.ConfigId)
     {
         var provider = _db.AsTenant().GetConnectionScope(configId);
@@ -139,7 +143,8 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// 根据表名获取列集合
     /// </summary>
     /// <returns></returns>
-    public List<ColumnOuput> GetColumnListByTableName(string tableName, string configId = SqlSugarConst.ConfigId)
+    [ApiDescriptionSettings(Name = "ColumnListByTableName")]
+    public List<ColumnOuput> GetColumnListByTableName([Required] string tableName, string configId = SqlSugarConst.ConfigId)
     {
         // 切库---多库代码生成用
         var provider = _db.AsTenant().GetConnectionScope(configId);
@@ -189,6 +194,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// 代码生成到本地
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "RunLocal")]
     public async Task RunLocal(SysCodeGen input)
     {
         // 先删除该表已生成的菜单列表

Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs

@@ -21,6 +21,7 @@ public class SysConfigService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<SysConfig>> GetPage([FromQuery] PageConfigInput input)
     {
         return await _sysConfigRep.AsQueryable()
@@ -34,6 +35,7 @@ public class SysConfigService : IDynamicApiController, ITransient
     /// 获取参数配置列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "List")]
     public async Task<List<SysConfig>> GetList()
     {
         return await _sysConfigRep.GetListAsync();
@@ -72,16 +74,6 @@ public class SysConfigService : IDynamicApiController, ITransient
         _sysCacheService.Remove(config.Code);
     }
 
-    /// <summary>
-    /// 获取参数配置详情
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public async Task<SysConfig> GetDetail([FromQuery] ConfigInput input)
-    {
-        return await _sysConfigRep.GetFirstAsync(u => u.Id == input.Id);
-    }
-
     /// <summary>
     /// 删除参数配置
     /// </summary>
@@ -99,12 +91,23 @@ public class SysConfigService : IDynamicApiController, ITransient
         _sysCacheService.Remove(config.Code);
     }
 
+    /// <summary>
+    /// 获取参数配置详情
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Detail")]
+    public async Task<SysConfig> GetDetail([FromQuery] ConfigInput input)
+    {
+        return await _sysConfigRep.GetFirstAsync(u => u.Id == input.Id);
+    }
+
     /// <summary>
     /// 获取参数配置值
     /// </summary>
     /// <param name="code"></param>
     /// <returns></returns>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     public async Task<T> GetConfigValue<T>(string code)
     {
         var value = _sysCacheService.Get<string>(code);

Admin.NET/Admin.NET.Core/Service/Const/SysConstService.cs

@@ -18,6 +18,7 @@ public class SysConstService : IDynamicApiController, ITransient
     /// 获取所有常量列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "List")]
     public async Task<List<ConstOutput>> GetList()
     {
         var key = $"{CacheConst.KeyConst}list";
@@ -41,7 +42,8 @@ public class SysConstService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="typeName"></param>
     /// <returns></returns>
-    public async Task<List<ConstOutput>> GetData(string typeName)
+    [ApiDescriptionSettings(Name = "Data")]
+    public async Task<List<ConstOutput>> GetData([Required] string typeName)
     {
         var key = $"{CacheConst.KeyConst}{typeName.ToUpper()}";
         var constlist = _sysCacheService.Get<List<ConstOutput>>(key);

Admin.NET/Admin.NET.Core/Service/DataBase/SysDatabaseService.cs

@@ -23,6 +23,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
     /// 获取库列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "List")]
     public List<dynamic> GetList()
     {
         return App.GetOptions<DbConnectionOptions>().ConnectionConfigs.Select(u => u.ConfigId).ToList();
@@ -34,6 +35,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
     /// <param name="tableName">表名</param>
     /// <param name="configId">ConfigId</param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "ColumnList")]
     [AllowAnonymous]
     public List<DbColumnOutput> GetColumnList(string tableName, string configId = SqlSugarConst.ConfigId)
     {
@@ -99,6 +101,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="configId">ConfigId</param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "TableList")]
     public List<DbTableInfo> GetTableList(string configId = SqlSugarConst.ConfigId)
     {
         var db = _db.AsTenant().GetConnectionScope(configId);

Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs

@@ -19,6 +19,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<SysDictData>> GetPage([FromQuery] PageDictDataInput input)
     {
         var code = !string.IsNullOrEmpty(input.Code?.Trim());
@@ -35,6 +36,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
     /// 获取字典值列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "List")]
     public async Task<List<SysDictData>> GetList([FromQuery] GetDataDictDataInput input)
     {
         return await GetDictDataListByDictTypeId(input.DictTypeId);
@@ -72,16 +74,6 @@ public class SysDictDataService : IDynamicApiController, ITransient
         await _sysDictDataRep.UpdateAsync(input.Adapt<SysDictData>());
     }
 
-    /// <summary>
-    /// 获取字典值详情
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public async Task<SysDictData> GetDetail([FromQuery] DictDataInput input)
-    {
-        return await _sysDictDataRep.GetFirstAsync(u => u.Id == input.Id);
-    }
-
     /// <summary>
     /// 删除字典值
     /// </summary>
@@ -97,11 +89,23 @@ public class SysDictDataService : IDynamicApiController, ITransient
         await _sysDictDataRep.DeleteAsync(dictData);
     }
 
+    /// <summary>
+    /// 获取字典值详情
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Detail")]
+    public async Task<SysDictData> GetDetail([FromQuery] DictDataInput input)
+    {
+        return await _sysDictDataRep.GetFirstAsync(u => u.Id == input.Id);
+    }
+
     /// <summary>
     /// 修改字典值状态
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "SetStatus")]
     public async Task SetStatus(DictDataInput input)
     {
         var dictData = await _sysDictDataRep.GetFirstAsync(u => u.Id == input.Id);
@@ -120,7 +124,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="dictTypeId"></param>
     /// <returns></returns>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     public async Task<List<SysDictData>> GetDictDataListByDictTypeId(long dictTypeId)
     {
         return await _sysDictDataRep.AsQueryable()
@@ -133,7 +137,8 @@ public class SysDictDataService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="code"></param>
     /// <returns></returns>
-    public async Task<dynamic> GetDictDataList(string code)
+    [ApiDescriptionSettings(Name = "DataList")]
+    public async Task<dynamic> GetDataList([Required] string code)
     {
         return await _sysDictDataRep.Context.Queryable<SysDictType>()
             .LeftJoin<SysDictData>((a, b) => a.Id == b.DictTypeId)
@@ -150,7 +155,8 @@ public class SysDictDataService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    public async Task<dynamic> GetDictDataList([FromQuery] QueryDictDataInput input)
+    [ApiDescriptionSettings(Name = "DataList")]
+    public async Task<dynamic> GetDataList([FromQuery] QueryDictDataInput input)
     {
         return await _sysDictDataRep.Context.Queryable<SysDictType>()
             .LeftJoin<SysDictData>((a, b) => a.Id == b.DictTypeId)

Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs

@@ -21,6 +21,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
     /// 获取字典类型分页列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<SysDictType>> GetPage([FromQuery] PageDictTypeInput input)
     {
         var code = !string.IsNullOrEmpty(input.Code?.Trim());
@@ -36,6 +37,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
     /// 获取字典类型列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "List")]
     public async Task<List<SysDictType>> GetList()
     {
         return await _sysDictTypeRep.AsQueryable().OrderBy(u => u.OrderNo).ToListAsync();
@@ -46,6 +48,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "DataList")]
     [AllowAnonymous]
     public async Task<List<SysDictData>> GetDataList([FromQuery] GetDataDictTypeInput input)
     {
@@ -89,16 +92,6 @@ public class SysDictTypeService : IDynamicApiController, ITransient
         await _sysDictTypeRep.UpdateAsync(input.Adapt<SysDictType>());
     }
 
-    /// <summary>
-    /// 获取字典类型详情
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public async Task<SysDictType> GetDetail([FromQuery] DictTypeInput input)
-    {
-        return await _sysDictTypeRep.GetFirstAsync(u => u.Id == input.Id);
-    }
-
     /// <summary>
     /// 删除字典类型
     /// </summary>
@@ -114,11 +107,23 @@ public class SysDictTypeService : IDynamicApiController, ITransient
         await _sysDictTypeRep.DeleteAsync(dictType);
     }
 
+    /// <summary>
+    /// 获取字典类型详情
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Detail")]
+    public async Task<SysDictType> GetDetail([FromQuery] DictTypeInput input)
+    {
+        return await _sysDictTypeRep.GetFirstAsync(u => u.Id == input.Id);
+    }
+
     /// <summary>
     /// 修改字典类型状态
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "SetStatus")]
     public async Task SetStatus(DictTypeInput input)
     {
         var dictType = await _sysDictTypeRep.GetFirstAsync(u => u.Id == input.Id);

Admin.NET/Admin.NET.Core/Service/File/SysFileService.cs

@@ -37,6 +37,7 @@ public class SysFileService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<SysFile>> GetPage([FromQuery] PageFileInput input)
     {
         return await _sysFileRep.AsQueryable()
@@ -53,6 +54,7 @@ public class SysFileService : IDynamicApiController, ITransient
     /// <param name="file"></param>
     /// <param name="path"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "UploadFile")]
     public async Task<FileOutput> UploadFile([Required] IFormFile file, [FromQuery] string? path)
     {
         var sysFile = await HandleUploadFile(file, path);
@@ -71,6 +73,7 @@ public class SysFileService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="files"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "UploadFiles")]
     public async Task<List<FileOutput>> UploadFiles([Required] List<IFormFile> files)
     {
         var filelist = new List<FileOutput>();
@@ -86,6 +89,7 @@ public class SysFileService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "DownloadFile")]
     public async Task<IActionResult> DownloadFile(FileInput input)
     {
         var file = await GetFile(input);
@@ -260,6 +264,7 @@ public class SysFileService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="file"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "UploadAvatar")]
     public async Task<FileOutput> UploadAvatar([Required] IFormFile file)
     {
         var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();
@@ -281,6 +286,7 @@ public class SysFileService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="file"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "UploadSignature")]
     public async Task<FileOutput> UploadSignature([Required] IFormFile file)
     {
         var sysUserRep = _sysFileRep.ChangeRepository<SqlSugarRepository<SysUser>>();

Admin.NET/Admin.NET.Core/Service/Job/SysJobService.cs

@@ -25,6 +25,7 @@ public class SysJobService : IDynamicApiController, ITransient
     /// <summary>
     /// 获取作业分页列表
     /// </summary>
+    [ApiDescriptionSettings(Name = "PageJobDetail")]
     public async Task<SqlSugarPagedList<JobOutput>> GetPageJobDetail([FromQuery] PageJobInput input)
     {
         var jobDetails = await _sysJobDetailRep.AsQueryable()
@@ -103,6 +104,7 @@ public class SysJobService : IDynamicApiController, ITransient
     /// <summary>
     /// 获取触发器列表
     /// </summary>
+    [ApiDescriptionSettings(Name = "JobTriggerList")]
     public async Task<List<SysJobTrigger>> GetJobTriggerList([FromQuery] JobDetailInput input)
     {
         return await _sysJobTriggerRep.AsQueryable()
@@ -156,6 +158,7 @@ public class SysJobService : IDynamicApiController, ITransient
     /// 暂停所有作业
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "PauseAllJob")]
     public void PauseAllJob()
     {
         _schedulerFactory.PauseAll();
@@ -165,6 +168,7 @@ public class SysJobService : IDynamicApiController, ITransient
     /// 启动所有作业
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "StartAllJob")]
     public void StartAllJob()
     {
         _schedulerFactory.StartAll();
@@ -173,6 +177,7 @@ public class SysJobService : IDynamicApiController, ITransient
     /// <summary>
     /// 暂停作业
     /// </summary>
+    [ApiDescriptionSettings(Name = "PauseJob")]
     public void PauseJob(JobDetailInput input)
     {
         _ = _schedulerFactory.TryGetJob(input.JobId, out var _scheduler);
@@ -182,6 +187,7 @@ public class SysJobService : IDynamicApiController, ITransient
     /// <summary>
     /// 启动作业
     /// </summary>
+    [ApiDescriptionSettings(Name = "StartJob")]
     public void StartJob(JobDetailInput input)
     {
         _ = _schedulerFactory.TryGetJob(input.JobId, out var _scheduler);
@@ -191,6 +197,7 @@ public class SysJobService : IDynamicApiController, ITransient
     /// <summary>
     /// 暂停触发器
     /// </summary>
+    [ApiDescriptionSettings(Name = "PauseTrigger")]
     public void PauseTrigger(JobTriggerInput input)
     {
         _ = _schedulerFactory.TryGetJob(input.JobId, out var _scheduler);
@@ -200,6 +207,7 @@ public class SysJobService : IDynamicApiController, ITransient
     /// <summary>
     /// 启动触发器
     /// </summary>
+    [ApiDescriptionSettings(Name = "StartTrigger")]
     public void StartTrigger(JobTriggerInput input)
     {
         _ = _schedulerFactory.TryGetJob(input.JobId, out var _scheduler);
@@ -209,6 +217,7 @@ public class SysJobService : IDynamicApiController, ITransient
     /// <summary>
     /// 强制唤醒作业调度器
     /// </summary>
+    [ApiDescriptionSettings(Name = "CancelSleep")]
     public void CancelSleep()
     {
         _schedulerFactory.CancelSleep();
@@ -217,6 +226,7 @@ public class SysJobService : IDynamicApiController, ITransient
     /// <summary>
     /// 强制触发所有作业持久化
     /// </summary>
+    [ApiDescriptionSettings(Name = "PersistAll")]
     public void PersistAll()
     {
         _schedulerFactory.PersistAll();
@@ -225,6 +235,7 @@ public class SysJobService : IDynamicApiController, ITransient
     /// <summary>
     /// 获取集群列表
     /// </summary>
+    [ApiDescriptionSettings(Name = "JobClusterList")]
     public async Task<List<SysJobCluster>> GetJobClusterList()
     {
         return await _sysJobClusterRep.GetListAsync();

Admin.NET/Admin.NET.Core/Service/Logging/SysLogDiffService.cs

@@ -17,6 +17,7 @@ public class SysLogDiffService : IDynamicApiController, ITransient
     /// 获取差异日志分页列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     [SuppressMonitor]
     public async Task<SqlSugarPagedList<SysLogDiff>> GetPage([FromQuery] PageLogInput input)
     {

Admin.NET/Admin.NET.Core/Service/Logging/SysLogExService.cs

@@ -19,6 +19,7 @@ public class SysLogExService : IDynamicApiController, ITransient
     /// 获取异常日志分页列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     [SuppressMonitor]
     public async Task<SqlSugarPagedList<SysLogEx>> GetPage([FromQuery] PageLogInput input)
     {

Admin.NET/Admin.NET.Core/Service/Logging/SysLogOpService.cs

@@ -19,6 +19,7 @@ public class SysLogOpService : IDynamicApiController, ITransient
     /// 获取操作日志分页列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     [SuppressMonitor]
     public async Task<SqlSugarPagedList<SysLogOp>> GetPage([FromQuery] PageLogInput input)
     {

Admin.NET/Admin.NET.Core/Service/Logging/SysLogVisService.cs

@@ -17,6 +17,7 @@ public class SysLogVisService : IDynamicApiController, ITransient
     /// 获取访问日志分页列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     [SuppressMonitor]
     public async Task<SqlSugarPagedList<SysLogVis>> GetPage([FromQuery] PageLogInput input)
     {

Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs

@@ -29,6 +29,7 @@ public class SysMenuService : IDynamicApiController, ITransient
     /// 获取登录菜单树
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "LoginMenuTree")]
     public async Task<List<MenuOutput>> GetLoginMenuTree()
     {
         if (_userManager.SuperAdmin)
@@ -68,6 +69,7 @@ public class SysMenuService : IDynamicApiController, ITransient
     /// 获取菜单列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "List")]
     [AllowAnonymous]
     public async Task<List<SysMenu>> GetList([FromQuery] MenuInput input)
     {
@@ -174,9 +176,10 @@ public class SysMenuService : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// 获取按钮权限列表
+    /// 获取按钮权限集合
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "BtnPermissionList")]
     public async Task<List<string>> GetBtnPermissionList()
     {
         var userId = _userManager.UserId;
@@ -197,7 +200,7 @@ public class SysMenuService : IDynamicApiController, ITransient
     /// 获取所有按钮权限集合
     /// </summary>
     /// <returns></returns>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     public async Task<List<string>> GetAllBtnList()
     {
         var permissions = _sysCacheService.Get<List<string>>(CacheConst.KeyPermission + 0); // 先从缓存里面读取

Admin.NET/Admin.NET.Core/Service/Message/SysMessageService.cs

@@ -30,6 +30,7 @@ public class SysMessageService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "SendAllUser")]
     public async Task SendAllUser(MessageInput input)
     {
         await _chatHubContext.Clients.All.ReceiveMessage(input);
@@ -40,6 +41,7 @@ public class SysMessageService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "SendOtherUser")]
     public async Task SendOtherUser(MessageInput input)
     {
         var onlineuserlist = _sysCacheService.Get<List<SysOnlineUser>>(CacheConst.KeyOnlineUser);
@@ -56,6 +58,7 @@ public class SysMessageService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "SendUser")]
     public async Task SendUser(MessageInput input)
     {
         var onlineuserlist = _sysCacheService.Get<List<SysOnlineUser>>(CacheConst.KeyOnlineUser);
@@ -74,6 +77,7 @@ public class SysMessageService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "SendUsers")]
     public async Task SendUsers(MessageInput input)
     {
         var onlineuserlist = _sysCacheService.Get<List<SysOnlineUser>>(CacheConst.KeyOnlineUser);
@@ -92,7 +96,8 @@ public class SysMessageService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="message"></param>
     /// <returns></returns>
-    public async Task SendEmail(string message)
+    [ApiDescriptionSettings(Name = "SendEmail")]
+    public async Task SendEmail([Required] string message)
     {
         await _fluentEmail.To(_emailOptions.DefaultToEmail).Body(message).SendAsync();
     }

Admin.NET/Admin.NET.Core/Service/Notice/SysNoticeService.cs

@@ -31,6 +31,7 @@ public class SysNoticeService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<SysNotice>> GetPage([FromQuery] PageNoticeInput input)
     {
         return await _sysNoticeRep.AsQueryable()
@@ -87,7 +88,8 @@ public class SysNoticeService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    public async Task Public(NoticeInput input)
+    [ApiDescriptionSettings(Name = "Public")]
+    public async Task PublicNotice(NoticeInput input)
     {
         // 更新发布状态和时间
         await _sysNoticeRep.UpdateAsync(u => new SysNotice() { Status = NoticeStatusEnum.PUBLIC, PublicTime = DateTime.Now }, u => u.Id == input.Id);
@@ -114,6 +116,7 @@ public class SysNoticeService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "SetRead")]
     public async Task SetRead(NoticeInput input)
     {
         await _sysNoticeUserRep.UpdateAsync(u => new SysNoticeUser
@@ -128,6 +131,7 @@ public class SysNoticeService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "PageReceived")]
     public async Task<SqlSugarPagedList<SysNoticeUser>> GetPageReceived([FromQuery] PageNoticeInput input)
     {
         return await _sysNoticeRep.AsSugarClient().Queryable<SysNoticeUser>().Includes(u => u.SysNotice)
@@ -142,6 +146,7 @@ public class SysNoticeService : IDynamicApiController, ITransient
     /// 获取未读的通知公告（当前用户）
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "UnReadList")]
     public async Task<List<SysNotice>> GetUnReadList()
     {
         var noticeUserList = await _sysNoticeRep.AsSugarClient().Queryable<SysNoticeUser>().Includes(u => u.SysNotice)
@@ -154,7 +159,7 @@ public class SysNoticeService : IDynamicApiController, ITransient
     /// 初始化通知公告信息
     /// </summary>
     /// <param name="notice"></param>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     private void InitNoticeInfo(SysNotice notice)
     {
         notice.PublicUserId = _userManager.UserId;

Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs

@@ -25,6 +25,7 @@ public class SysOnlineUserService : IDynamicApiController, ITransient
     /// 获取在线用户分页列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<SysOnlineUser>> GetPage([FromQuery] PageOnlineUserInput input)
     {
         return await _sysOnlineUerRep.AsQueryable()
@@ -38,6 +39,7 @@ public class SysOnlineUserService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="user"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "ForceOffline")]
     [NonValidation]
     public async Task ForceOffline(SysOnlineUser user)
     {
@@ -51,7 +53,7 @@ public class SysOnlineUserService : IDynamicApiController, ITransient
     /// <param name="notice"></param>
     /// <param name="userIds"></param>
     /// <returns></returns>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     public async Task PublicNotice(SysNotice notice, List<long> userIds)
     {
         var userList = await _sysOnlineUerRep.GetListAsync(m => userIds.Contains(m.UserId));
@@ -67,7 +69,7 @@ public class SysOnlineUserService : IDynamicApiController, ITransient
     /// 单用户登录
     /// </summary>
     /// <returns></returns>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     public async Task SignleLogin(long userId)
     {
         if (await _sysConfigService.GetConfigValue<bool>(CommonConst.SysSingleLogin))

Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs

@@ -32,6 +32,7 @@ public class SysOrgService : IDynamicApiController, ITransient
     /// 获取机构列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "List")]
     public async Task<List<SysOrg>> GetList([FromQuery] OrgInput input)
     {
         var orgIdList = await GetUserOrgIdList();
@@ -169,7 +170,7 @@ public class SysOrgService : IDynamicApiController, ITransient
     /// 根据用户Id获取机构Id集合
     /// </summary>
     /// <returns></returns>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     public async Task<List<long>> GetUserOrgIdList()
     {
         if (_userManager.SuperAdmin)
@@ -274,7 +275,7 @@ public class SysOrgService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="pid"></param>
     /// <returns></returns>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     public async Task<List<long>> GetChildIdListWithSelfById(long pid)
     {
         var orgTreeList = await _sysOrgRep.AsQueryable().ToChildListAsync(u => u.Pid, pid, true);

Admin.NET/Admin.NET.Core/Service/Pos/SysPosService.cs

@@ -21,6 +21,7 @@ public class SysPosService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "List")]
     public async Task<List<SysPos>> GetList([FromQuery] PosInput input)
     {
         return await _sysPosRep.AsQueryable()

Admin.NET/Admin.NET.Core/Service/Region/SysRegionService.cs

@@ -21,6 +21,7 @@ public class SysRegionService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<SysRegion>> GetPage([FromQuery] PageRegionInput input)
     {
         return await _sysRegionRep.AsQueryable()
@@ -35,6 +36,7 @@ public class SysRegionService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "List")]
     public async Task<List<SysRegion>> GetList([FromQuery] RegionInput input)
     {
         return await _sysRegionRep.GetListAsync(u => u.Pid == input.Id);

Admin.NET/Admin.NET.Core/Service/Role/SysRoleService.cs

@@ -36,6 +36,7 @@ public class SysRoleService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<SysRole>> GetPage([FromQuery] PageRoleInput input)
     {
         return await _sysRoleRep.AsQueryable()
@@ -49,6 +50,7 @@ public class SysRoleService : IDynamicApiController, ITransient
     /// 获取角色列表
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "List")]
     public async Task<List<RoleOutput>> GetList()
     {
         return await _sysRoleRep.AsQueryable().OrderBy(u => u.OrderNo).Select<RoleOutput>().ToListAsync();
@@ -135,6 +137,7 @@ public class SysRoleService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "GrantMenu")]
     public async Task GrantMenu(RoleMenuInput input)
     {
         await _sysRoleMenuService.GrantRoleMenu(input);
@@ -145,6 +148,7 @@ public class SysRoleService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "GrantDataScope")]
     public async Task GrantDataScope(RoleOrgInput input)
     {
         // 删除所有用户机构缓存
@@ -178,10 +182,11 @@ public class SysRoleService : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// 根据角色Id获取菜单集合
+    /// 根据角色Id获取菜单Id集合
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "OwnMenuList")]
     public async Task<List<long>> GetOwnMenuList([FromQuery] RoleInput input)
     {
         return await _sysRoleMenuService.GetRoleMenuIdList(new List<long> { input.Id });
@@ -192,6 +197,7 @@ public class SysRoleService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "OwnOrgList")]
     public async Task<List<long>> GetOwnOrgList([FromQuery] RoleInput input)
     {
         return await _sysRoleOrgService.GetRoleOrgIdList(new List<long> { input.Id });
@@ -202,13 +208,14 @@ public class SysRoleService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "SetStatus")]
     public async Task<int> SetStatus(RoleInput input)
     {
         if (!Enum.IsDefined(typeof(StatusEnum), input.Status))
             throw Oops.Oh(ErrorCodeEnum.D3005);
 
         return await _sysRoleRep.AsUpdateable()
-            .SetColumns(u => u.Status == (StatusEnum)input.Status)
+            .SetColumns(u => u.Status == input.Status)
             .Where(u => u.Id == input.Id)
             .ExecuteCommandAsync();
     }

Admin.NET/Admin.NET.Core/Service/Server/SysServerService.cs

@@ -24,6 +24,7 @@ public class SysServerService : IDynamicApiController, ITransient
     /// 获取服务器配置信息
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "ServerBase")]
     public dynamic GetServerBase()
     {
         return new
@@ -46,6 +47,7 @@ public class SysServerService : IDynamicApiController, ITransient
     /// 获取服务器内存信息
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "ServerUsed")]
     public dynamic GetServerUsed()
     {
         var programStartTime = Process.GetCurrentProcess().StartTime;
@@ -70,6 +72,7 @@ public class SysServerService : IDynamicApiController, ITransient
     /// 获取服务器磁盘信息
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "ServerDisk")]
     public dynamic GetServerDisk()
     {
         return ComputerUtil.GetDiskInfos();
@@ -79,6 +82,7 @@ public class SysServerService : IDynamicApiController, ITransient
     /// 获取框架主要程序集
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "AssemblyList")]
     public dynamic GetAssemblyList()
     {
         var furionAssembly = typeof(App).Assembly.GetName();

Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -51,6 +51,7 @@ public class SysTenantService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<TenantOutput>> GetPage([FromQuery] PageTenantInput input)
     {
         return await _sysTenantRep.AsQueryable()
@@ -83,7 +84,7 @@ public class SysTenantService : IDynamicApiController, ITransient
     /// 获取库隔离的租户列表
     /// </summary>
     /// <returns></returns>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     public async Task<List<SysTenant>> GetTenantDbList()
     {
         return await _sysTenantRep.GetListAsync(u => u.TenantType == TenantTypeEnum.Db && u.Status == StatusEnum.Enable);
@@ -123,6 +124,7 @@ public class SysTenantService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "SetStatus")]
     public async Task<int> SetStatus(TenantInput input)
     {
         var tenant = await _sysTenantRep.GetFirstAsync(u => u.Id == input.Id);
@@ -286,6 +288,7 @@ public class SysTenantService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "GrantMenu")]
     public async Task GrantMenu(RoleMenuInput input)
     {
         var tenantAdminUser = await _sysUserRep.GetFirstAsync(u => u.TenantId == input.Id && u.AccountType == AccountTypeEnum.Admin);
@@ -301,6 +304,7 @@ public class SysTenantService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "OwnMenuList")]
     public async Task<List<long>> GetOwnMenuList([FromQuery] TenantUserInput input)
     {
         var roleIds = await _sysUserRoleService.GetUserRoleIdList(input.UserId);
@@ -312,6 +316,7 @@ public class SysTenantService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "ResetPwd")]
     public async Task ResetPwd(TenantUserInput input)
     {
         var password = await _sysConfigService.GetConfigValue<string>(CommonConst.SysPassword);
@@ -323,7 +328,7 @@ public class SysTenantService : IDynamicApiController, ITransient
     /// 缓存所有租户
     /// </summary>
     /// <returns></returns>
-    [NonAction]
+    [ApiDescriptionSettings(false)]
     public async Task UpdateTenantCache()
     {
         _sysCacheService.Remove(CacheConst.KeyTenant);

Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -33,6 +33,7 @@ public class SysUserService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<SysUser>> GetPage([FromQuery] PageUserInput input)
     {
         var orgList = input.OrgId > 0 ? await _sysOrgService.GetChildIdListWithSelfById(input.OrgId) :
@@ -130,6 +131,7 @@ public class SysUserService : IDynamicApiController, ITransient
     /// 查看用户基本信息
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "BaseInfo")]
     public async Task<SysUser> GetBaseInfo()
     {
         return await _sysUserRep.GetFirstAsync(u => u.Id == _userManager.UserId);
@@ -139,7 +141,8 @@ public class SysUserService : IDynamicApiController, ITransient
     /// 更新用户基本信息
     /// </summary>
     /// <returns></returns>
-    public async Task<int> SetBaseInfo(SysUser user)
+    [ApiDescriptionSettings(Name = "BaseInfo")]
+    public async Task<int> UpdateBaseInfo(SysUser user)
     {
         return await _sysUserRep.AsUpdateable(user)
             .IgnoreColumns(u => new { u.CreateTime, u.Account, u.Password, u.AccountType, u.OrgId, u.PosId }).ExecuteCommandAsync();
@@ -150,6 +153,7 @@ public class SysUserService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "SetStatus")]
     public async Task<int> SetStatus(UserInput input)
     {
         var user = await _sysUserRep.GetFirstAsync(u => u.Id == input.Id);
@@ -168,6 +172,7 @@ public class SysUserService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "GrantRole")]
     public async Task GrantRole(UserRoleInput input)
     {
         var user = await _sysUserRep.GetFirstAsync(u => u.Id == input.UserId);
@@ -182,6 +187,7 @@ public class SysUserService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "ChangePwd")]
     public async Task<int> ChangePwd(ChangePwdInput input)
     {
         var user = await _sysUserRep.GetFirstAsync(u => u.Id == _userManager.UserId);
@@ -205,6 +211,7 @@ public class SysUserService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "ResetPwd")]
     public async Task<int> ResetPwd(ResetPwdUserInput input)
     {
         var password = await _sysConfigService.GetConfigValue<string>(CommonConst.SysPassword);
@@ -215,21 +222,23 @@ public class SysUserService : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// 获取用户拥有角色
+    /// 获取用户拥有角色集合
     /// </summary>
     /// <param name="userId"></param>
     /// <returns></returns>
-    public async Task<List<long>> GetOwnRoleList(long userId)
+    [ApiDescriptionSettings(Name = "OwnRoleList")]
+    public async Task<List<long>> GetOwnRoleList([Required] long userId)
     {
         return await _sysUserRoleService.GetUserRoleIdList(userId);
     }
 
     /// <summary>
-    /// 获取用户扩展机构
+    /// 获取用户扩展机构集合
     /// </summary>
     /// <param name="userId"></param>
     /// <returns></returns>
-    public async Task<List<SysUserExtOrg>> GetExtOrgList(long userId)
+    [ApiDescriptionSettings(Name = "OwnExtOrgList")]
+    public async Task<List<SysUserExtOrg>> GetOwnExtOrgList([Required] long userId)
     {
         return await _sysUserExtOrgService.GetUserExtOrgList(userId);
     }

Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs

@@ -44,6 +44,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "GenerateParametersForJsapiPay")]
     public dynamic GenerateParametersForJsapiPay(WechatPayParaInput input)
     {
         return WechatTenpayClient.GenerateParametersForJsapiPayRequest(_wechatPayOptions.AppId, input.PrepayId);
@@ -52,6 +53,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient
     /// <summary>
     /// 微信支付统一下单获取Id(商户直连)
     /// </summary>
+    [ApiDescriptionSettings(Name = "CreatePayTransaction")]
     public async Task<dynamic> CreatePayTransaction([FromBody] WechatPayTransactionInput input)
     {
         var request = new CreatePayTransactionJsapiRequest()
@@ -93,6 +95,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient
     /// <summary>
     /// 微信支付统一下单获取Id(服务商模式)
     /// </summary>
+    [ApiDescriptionSettings(Name = "CreatePayPartnerTransaction")]
     public async Task<dynamic> CreatePayPartnerTransaction([FromBody] WechatPayTransactionInput input)
     {
         var request = new CreatePayPartnerTransactionJsapiRequest()
@@ -142,6 +145,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="tradeId"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "PayInfo")]
     public async Task<SysWechatPay> GetPayInfo(string tradeId)
     {
         return await _sysWechatPayUserRep.GetFirstAsync(u => u.OutTradeNumber == tradeId);
@@ -151,6 +155,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient
     /// 微信支付成功回调(商户直连)
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "PayCallBack")]
     [AllowAnonymous]
     public async Task<WechatPayOutput> PayCallBack()
     {
@@ -197,6 +202,7 @@ public class SysWechatPayService : IDynamicApiController, ITransient
     /// 微信支付成功回调(服务商模式)
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "PayPartnerCallBack")]
     [AllowAnonymous]
     public async Task PayPartnerCallBack()
     {

Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatService.cs

@@ -21,6 +21,7 @@ public class SysWechatService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "GenAuthUrl")]
     [AllowAnonymous]
     public string GenAuthUrl(GenAuthUrlInput input)
     {
@@ -31,6 +32,7 @@ public class SysWechatService : IDynamicApiController, ITransient
     /// 授权登录(Code换取OpenId)
     /// </summary>
     /// <param name="input"></param>
+    [ApiDescriptionSettings(Name = "SnsOAuth2")]
     [AllowAnonymous]
     public async Task<string> SnsOAuth2([Required] WechatOAuth2Input input)
     {
@@ -71,6 +73,7 @@ public class SysWechatService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "OpenIdLogin")]
     [AllowAnonymous]
     public async Task<dynamic> OpenIdLogin(WechatUserLogin input)
     {
@@ -94,6 +97,7 @@ public class SysWechatService : IDynamicApiController, ITransient
     /// 获取配置签名参数(wx.config)
     /// </summary>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "GenConfigPara")]
     public async Task<dynamic> GenConfigPara(SignatureInput input)
     {
         var resCgibinToken = await _wechatApiClient.ExecuteCgibinTokenAsync(new CgibinTokenRequest());

Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatUserService.cs

@@ -18,6 +18,7 @@ public class SysWechatUserService : IDynamicApiController, ITransient
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
+    [ApiDescriptionSettings(Name = "Page")]
     public async Task<SqlSugarPagedList<SysWechatUser>> GetPage([FromQuery] WechatUserInput input)
     {
         return await _sysWechatUserRep.AsQueryable()

Web/src/api-services/apis/sys-auth-api.ts

@@ -29,7 +29,7 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
     return {
         /**
          * 
-         * @summary Swagger登录检查
+         * @summary swagger登录检查
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -65,7 +65,7 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary Swagger登录
+         * @summary swagger登录提交
          * @param {string} [userName] 
          * @param {string} [password] 
          * @param {*} [options] Override http request option.
@@ -115,7 +115,7 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary 生成图片验证码
+         * @summary 获取验证码
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -151,7 +151,7 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary 登录配置
+         * @summary 获取登录配置
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -273,10 +273,10 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysAuthRefreshTokenAccessTokenPost: async (accessToken: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysAuthRefreshTokenAccessTokenGet: async (accessToken: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'accessToken' is not null or undefined
             if (accessToken === null || accessToken === undefined) {
-                throw new RequiredError('accessToken','Required parameter accessToken was null or undefined when calling apiSysAuthRefreshTokenAccessTokenPost.');
+                throw new RequiredError('accessToken','Required parameter accessToken was null or undefined when calling apiSysAuthRefreshTokenAccessTokenGet.');
             }
             const localVarPath = `/api/sysAuth/refreshToken/{accessToken}`
                 .replace(`{${"accessToken"}}`, encodeURIComponent(String(accessToken)));
@@ -286,7 +286,7 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
             if (configuration) {
                 baseOptions = configuration.baseOptions;
             }
-            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -310,7 +310,7 @@ export const SysAuthApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary 获取用户信息
+         * @summary 获取登录账号信息
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -355,7 +355,7 @@ export const SysAuthApiFp = function(configuration?: Configuration) {
     return {
         /**
          * 
-         * @summary Swagger登录检查
+         * @summary swagger登录检查
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -368,7 +368,7 @@ export const SysAuthApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary Swagger登录
+         * @summary swagger登录提交
          * @param {string} [userName] 
          * @param {string} [password] 
          * @param {*} [options] Override http request option.
@@ -383,7 +383,7 @@ export const SysAuthApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 生成图片验证码
+         * @summary 获取验证码
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -396,7 +396,7 @@ export const SysAuthApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 登录配置
+         * @summary 获取登录配置
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -441,8 +441,8 @@ export const SysAuthApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysAuthRefreshTokenAccessTokenPost(accessToken: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultString>>> {
-            const localVarAxiosArgs = await SysAuthApiAxiosParamCreator(configuration).apiSysAuthRefreshTokenAccessTokenPost(accessToken, options);
+        async apiSysAuthRefreshTokenAccessTokenGet(accessToken: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultString>>> {
+            const localVarAxiosArgs = await SysAuthApiAxiosParamCreator(configuration).apiSysAuthRefreshTokenAccessTokenGet(accessToken, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -450,7 +450,7 @@ export const SysAuthApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 获取用户信息
+         * @summary 获取登录账号信息
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -472,7 +472,7 @@ export const SysAuthApiFactory = function (configuration?: Configuration, basePa
     return {
         /**
          * 
-         * @summary Swagger登录检查
+         * @summary swagger登录检查
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -481,7 +481,7 @@ export const SysAuthApiFactory = function (configuration?: Configuration, basePa
         },
         /**
          * 
-         * @summary Swagger登录
+         * @summary swagger登录提交
          * @param {string} [userName] 
          * @param {string} [password] 
          * @param {*} [options] Override http request option.
@@ -492,7 +492,7 @@ export const SysAuthApiFactory = function (configuration?: Configuration, basePa
         },
         /**
          * 
-         * @summary 生成图片验证码
+         * @summary 获取验证码
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -501,7 +501,7 @@ export const SysAuthApiFactory = function (configuration?: Configuration, basePa
         },
         /**
          * 
-         * @summary 登录配置
+         * @summary 获取登录配置
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -534,12 +534,12 @@ export const SysAuthApiFactory = function (configuration?: Configuration, basePa
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysAuthRefreshTokenAccessTokenPost(accessToken: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultString>> {
-            return SysAuthApiFp(configuration).apiSysAuthRefreshTokenAccessTokenPost(accessToken, options).then((request) => request(axios, basePath));
+        async apiSysAuthRefreshTokenAccessTokenGet(accessToken: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultString>> {
+            return SysAuthApiFp(configuration).apiSysAuthRefreshTokenAccessTokenGet(accessToken, options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @summary 获取用户信息
+         * @summary 获取登录账号信息
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -558,7 +558,7 @@ export const SysAuthApiFactory = function (configuration?: Configuration, basePa
 export class SysAuthApi extends BaseAPI {
     /**
      * 
-     * @summary Swagger登录检查
+     * @summary swagger登录检查
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysAuthApi
@@ -568,7 +568,7 @@ export class SysAuthApi extends BaseAPI {
     }
     /**
      * 
-     * @summary Swagger登录
+     * @summary swagger登录提交
      * @param {string} [userName] 
      * @param {string} [password] 
      * @param {*} [options] Override http request option.
@@ -580,7 +580,7 @@ export class SysAuthApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 生成图片验证码
+     * @summary 获取验证码
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysAuthApi
@@ -590,7 +590,7 @@ export class SysAuthApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 登录配置
+     * @summary 获取登录配置
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysAuthApi
@@ -627,12 +627,12 @@ export class SysAuthApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysAuthApi
      */
-    public async apiSysAuthRefreshTokenAccessTokenPost(accessToken: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultString>> {
-        return SysAuthApiFp(this.configuration).apiSysAuthRefreshTokenAccessTokenPost(accessToken, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysAuthRefreshTokenAccessTokenGet(accessToken: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultString>> {
+        return SysAuthApiFp(this.configuration).apiSysAuthRefreshTokenAccessTokenGet(accessToken, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 获取用户信息
+     * @summary 获取登录账号信息
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysAuthApi

Web/src/api-services/apis/sys-cache-api.ts

@@ -19,113 +19,12 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr
 import { AdminResultInt32 } from '../models';
 import { AdminResultListString } from '../models';
 import { AdminResultObject } from '../models';
-import { TimeSpan } from '../models';
 /**
  * SysCacheApi - axios parameter creator
  * @export
  */
 export const SysCacheApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
-        /**
-         * 
-         * @summary 增加缓存并设置过期时间
-         * @param {string} key 
-         * @param {TimeSpan} expire 
-         * @param {any} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        apiSysCacheAddAndSetExpKeyExpirePost: async (key: string, expire: TimeSpan, body?: any, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'key' is not null or undefined
-            if (key === null || key === undefined) {
-                throw new RequiredError('key','Required parameter key was null or undefined when calling apiSysCacheAddAndSetExpKeyExpirePost.');
-            }
-            // verify required parameter 'expire' is not null or undefined
-            if (expire === null || expire === undefined) {
-                throw new RequiredError('expire','Required parameter expire was null or undefined when calling apiSysCacheAddAndSetExpKeyExpirePost.');
-            }
-            const localVarPath = `/api/sysCache/addAndSetExp/{key}/{expire}`
-                .replace(`{${"key"}}`, encodeURIComponent(String(key)))
-                .replace(`{${"expire"}}`, encodeURIComponent(String(expire)));
-            // 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: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication Bearer required
-
-            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
-
-            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};
-            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
-
-            return {
-                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary 增加缓存
-         * @param {string} key 
-         * @param {any} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        apiSysCacheAddKeyPost: async (key: string, body?: any, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'key' is not null or undefined
-            if (key === null || key === undefined) {
-                throw new RequiredError('key','Required parameter key was null or undefined when calling apiSysCacheAddKeyPost.');
-            }
-            const localVarPath = `/api/sysCache/add/{key}`
-                .replace(`{${"key"}}`, encodeURIComponent(String(key)));
-            // 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: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication Bearer required
-
-            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
-
-            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};
-            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
-
-            return {
-                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @summary 根据键名前缀删除缓存
@@ -212,7 +111,7 @@ export const SysCacheApiAxiosParamCreator = function (configuration?: Configurat
         },
         /**
          * 
-         * @summary 获取所有缓存键名
+         * @summary 获取缓存键名集合
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -297,37 +196,6 @@ export const SysCacheApiAxiosParamCreator = function (configuration?: Configurat
  */
 export const SysCacheApiFp = function(configuration?: Configuration) {
     return {
-        /**
-         * 
-         * @summary 增加缓存并设置过期时间
-         * @param {string} key 
-         * @param {TimeSpan} expire 
-         * @param {any} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async apiSysCacheAddAndSetExpKeyExpirePost(key: string, expire: TimeSpan, body?: any, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysCacheApiAxiosParamCreator(configuration).apiSysCacheAddAndSetExpKeyExpirePost(key, expire, body, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
-        /**
-         * 
-         * @summary 增加缓存
-         * @param {string} key 
-         * @param {any} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async apiSysCacheAddKeyPost(key: string, body?: any, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysCacheApiAxiosParamCreator(configuration).apiSysCacheAddKeyPost(key, body, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
         /**
          * 
          * @summary 根据键名前缀删除缓存
@@ -358,7 +226,7 @@ export const SysCacheApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 获取所有缓存键名
+         * @summary 获取缓存键名集合
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -392,29 +260,6 @@ export const SysCacheApiFp = function(configuration?: Configuration) {
  */
 export const SysCacheApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     return {
-        /**
-         * 
-         * @summary 增加缓存并设置过期时间
-         * @param {string} key 
-         * @param {TimeSpan} expire 
-         * @param {any} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async apiSysCacheAddAndSetExpKeyExpirePost(key: string, expire: TimeSpan, body?: any, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysCacheApiFp(configuration).apiSysCacheAddAndSetExpKeyExpirePost(key, expire, body, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary 增加缓存
-         * @param {string} key 
-         * @param {any} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async apiSysCacheAddKeyPost(key: string, body?: any, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysCacheApiFp(configuration).apiSysCacheAddKeyPost(key, body, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @summary 根据键名前缀删除缓存
@@ -437,7 +282,7 @@ export const SysCacheApiFactory = function (configuration?: Configuration, baseP
         },
         /**
          * 
-         * @summary 获取所有缓存键名
+         * @summary 获取缓存键名集合
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -464,31 +309,6 @@ export const SysCacheApiFactory = function (configuration?: Configuration, baseP
  * @extends {BaseAPI}
  */
 export class SysCacheApi extends BaseAPI {
-    /**
-     * 
-     * @summary 增加缓存并设置过期时间
-     * @param {string} key 
-     * @param {TimeSpan} expire 
-     * @param {any} [body] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysCacheApi
-     */
-    public async apiSysCacheAddAndSetExpKeyExpirePost(key: string, expire: TimeSpan, body?: any, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysCacheApiFp(this.configuration).apiSysCacheAddAndSetExpKeyExpirePost(key, expire, body, options).then((request) => request(this.axios, this.basePath));
-    }
-    /**
-     * 
-     * @summary 增加缓存
-     * @param {string} key 
-     * @param {any} [body] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysCacheApi
-     */
-    public async apiSysCacheAddKeyPost(key: string, body?: any, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysCacheApiFp(this.configuration).apiSysCacheAddKeyPost(key, body, options).then((request) => request(this.axios, this.basePath));
-    }
     /**
      * 
      * @summary 根据键名前缀删除缓存
@@ -513,7 +333,7 @@ export class SysCacheApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 获取所有缓存键名
+     * @summary 获取缓存键名集合
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysCacheApi

Web/src/api-services/apis/sys-dict-data-api.ts

@@ -74,27 +74,30 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
         },
         /**
          * 
-         * @summary 删除字典值
-         * @param {DeleteDictDataInput} [body] 
+         * @summary 根据字典类型编码获取字典值集合
+         * @param {string} code 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysDictDataDeleteDelete: async (body?: DeleteDictDataInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/sysDictData/delete`;
+        apiSysDictDataDataListCodeGet: async (code: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'code' is not null or undefined
+            if (code === null || code === undefined) {
+                throw new RequiredError('code','Required parameter code was null or undefined when calling apiSysDictDataDataListCodeGet.');
+            }
+            const localVarPath = `/api/sysDictData/dataList/{code}`
+                .replace(`{${"code"}}`, encodeURIComponent(String(code)));
             // 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: 'DELETE', ...baseOptions, ...options};
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
 
-            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
-
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
                 query.set(key, localVarQueryParameter[key]);
@@ -105,8 +108,6 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
             localVarUrlObj.search = (new URLSearchParams(query)).toString();
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
 
             return {
                 url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
@@ -115,18 +116,18 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
         },
         /**
          * 
-         * @summary 获取字典值详情
-         * @param {number} id 主键Id
-         * @param {StatusEnum} [status] 状态
+         * @summary 根据查询条件获取字典值集合
+         * @param {string} code 编码
+         * @param {number} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysDictDataDetailGet: async (id: number, status?: StatusEnum, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            if (id === null || id === undefined) {
-                throw new RequiredError('id','Required parameter id was null or undefined when calling apiSysDictDataDetailGet.');
+        apiSysDictDataDataListGet: async (code: string, status?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'code' is not null or undefined
+            if (code === null || code === undefined) {
+                throw new RequiredError('code','Required parameter code was null or undefined when calling apiSysDictDataDataListGet.');
             }
-            const localVarPath = `/api/sysDictData/detail`;
+            const localVarPath = `/api/sysDictData/dataList`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -139,12 +140,12 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
 
             // authentication Bearer required
 
-            if (status !== undefined) {
-                localVarQueryParameter['Status'] = status;
+            if (code !== undefined) {
+                localVarQueryParameter['Code'] = code;
             }
 
-            if (id !== undefined) {
-                localVarQueryParameter['Id'] = id;
+            if (status !== undefined) {
+                localVarQueryParameter['Status'] = status;
             }
 
             const query = new URLSearchParams(localVarUrlObj.search);
@@ -165,30 +166,27 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
         },
         /**
          * 
-         * @summary 根据字典类型编码获取字典值集合
-         * @param {string} code 
+         * @summary 删除字典值
+         * @param {DeleteDictDataInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysDictDataDictDataListCodeGet: async (code: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'code' is not null or undefined
-            if (code === null || code === undefined) {
-                throw new RequiredError('code','Required parameter code was null or undefined when calling apiSysDictDataDictDataListCodeGet.');
-            }
-            const localVarPath = `/api/sysDictData/dictDataList/{code}`
-                .replace(`{${"code"}}`, encodeURIComponent(String(code)));
+        apiSysDictDataDeleteDelete: async (body?: DeleteDictDataInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysDictData/delete`;
             // 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 localVarRequestOptions :AxiosRequestConfig = { method: 'DELETE', ...baseOptions, ...options};
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
 
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
                 query.set(key, localVarQueryParameter[key]);
@@ -199,6 +197,8 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
             localVarUrlObj.search = (new URLSearchParams(query)).toString();
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
 
             return {
                 url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
@@ -207,18 +207,18 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
         },
         /**
          * 
-         * @summary 根据查询条件获取字典值集合
-         * @param {string} code 编码
-         * @param {number} [status] 状态
+         * @summary 获取字典值详情
+         * @param {number} id 主键Id
+         * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysDictDataDictDataListGet: async (code: string, status?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'code' is not null or undefined
-            if (code === null || code === undefined) {
-                throw new RequiredError('code','Required parameter code was null or undefined when calling apiSysDictDataDictDataListGet.');
+        apiSysDictDataDetailGet: async (id: number, status?: StatusEnum, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            if (id === null || id === undefined) {
+                throw new RequiredError('id','Required parameter id was null or undefined when calling apiSysDictDataDetailGet.');
             }
-            const localVarPath = `/api/sysDictData/dictDataList`;
+            const localVarPath = `/api/sysDictData/detail`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -231,14 +231,14 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
 
             // authentication Bearer required
 
-            if (code !== undefined) {
-                localVarQueryParameter['Code'] = code;
-            }
-
             if (status !== undefined) {
                 localVarQueryParameter['Status'] = status;
             }
 
+            if (id !== undefined) {
+                localVarQueryParameter['Id'] = id;
+            }
+
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
                 query.set(key, localVarQueryParameter[key]);
@@ -483,13 +483,13 @@ export const SysDictDataApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 删除字典值
-         * @param {DeleteDictDataInput} [body] 
+         * @summary 根据字典类型编码获取字典值集合
+         * @param {string} code 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysDictDataDeleteDelete(body?: DeleteDictDataInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysDictDataApiAxiosParamCreator(configuration).apiSysDictDataDeleteDelete(body, options);
+        async apiSysDictDataDataListCodeGet(code: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
+            const localVarAxiosArgs = await SysDictDataApiAxiosParamCreator(configuration).apiSysDictDataDataListCodeGet(code, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -497,14 +497,14 @@ export const SysDictDataApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 获取字典值详情
-         * @param {number} id 主键Id
-         * @param {StatusEnum} [status] 状态
+         * @summary 根据查询条件获取字典值集合
+         * @param {string} code 编码
+         * @param {number} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysDictDataDetailGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysDictData>>> {
-            const localVarAxiosArgs = await SysDictDataApiAxiosParamCreator(configuration).apiSysDictDataDetailGet(id, status, options);
+        async apiSysDictDataDataListGet(code: string, status?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
+            const localVarAxiosArgs = await SysDictDataApiAxiosParamCreator(configuration).apiSysDictDataDataListGet(code, status, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -512,13 +512,13 @@ export const SysDictDataApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 根据字典类型编码获取字典值集合
-         * @param {string} code 
+         * @summary 删除字典值
+         * @param {DeleteDictDataInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysDictDataDictDataListCodeGet(code: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
-            const localVarAxiosArgs = await SysDictDataApiAxiosParamCreator(configuration).apiSysDictDataDictDataListCodeGet(code, options);
+        async apiSysDictDataDeleteDelete(body?: DeleteDictDataInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysDictDataApiAxiosParamCreator(configuration).apiSysDictDataDeleteDelete(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -526,14 +526,14 @@ export const SysDictDataApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 根据查询条件获取字典值集合
-         * @param {string} code 编码
-         * @param {number} [status] 状态
+         * @summary 获取字典值详情
+         * @param {number} id 主键Id
+         * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysDictDataDictDataListGet(code: string, status?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
-            const localVarAxiosArgs = await SysDictDataApiAxiosParamCreator(configuration).apiSysDictDataDictDataListGet(code, status, options);
+        async apiSysDictDataDetailGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysDictData>>> {
+            const localVarAxiosArgs = await SysDictDataApiAxiosParamCreator(configuration).apiSysDictDataDetailGet(id, status, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -623,45 +623,45 @@ export const SysDictDataApiFactory = function (configuration?: Configuration, ba
         },
         /**
          * 
-         * @summary 删除字典值
-         * @param {DeleteDictDataInput} [body] 
+         * @summary 根据字典类型编码获取字典值集合
+         * @param {string} code 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysDictDataDeleteDelete(body?: DeleteDictDataInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysDictDataApiFp(configuration).apiSysDictDataDeleteDelete(body, options).then((request) => request(axios, basePath));
+        async apiSysDictDataDataListCodeGet(code: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
+            return SysDictDataApiFp(configuration).apiSysDictDataDataListCodeGet(code, options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @summary 获取字典值详情
-         * @param {number} id 主键Id
-         * @param {StatusEnum} [status] 状态
+         * @summary 根据查询条件获取字典值集合
+         * @param {string} code 编码
+         * @param {number} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysDictDataDetailGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysDictData>> {
-            return SysDictDataApiFp(configuration).apiSysDictDataDetailGet(id, status, options).then((request) => request(axios, basePath));
+        async apiSysDictDataDataListGet(code: string, status?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
+            return SysDictDataApiFp(configuration).apiSysDictDataDataListGet(code, status, options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @summary 根据字典类型编码获取字典值集合
-         * @param {string} code 
+         * @summary 删除字典值
+         * @param {DeleteDictDataInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysDictDataDictDataListCodeGet(code: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
-            return SysDictDataApiFp(configuration).apiSysDictDataDictDataListCodeGet(code, options).then((request) => request(axios, basePath));
+        async apiSysDictDataDeleteDelete(body?: DeleteDictDataInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysDictDataApiFp(configuration).apiSysDictDataDeleteDelete(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @summary 根据查询条件获取字典值集合
-         * @param {string} code 编码
-         * @param {number} [status] 状态
+         * @summary 获取字典值详情
+         * @param {number} id 主键Id
+         * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysDictDataDictDataListGet(code: string, status?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
-            return SysDictDataApiFp(configuration).apiSysDictDataDictDataListGet(code, status, options).then((request) => request(axios, basePath));
+        async apiSysDictDataDetailGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysDictData>> {
+            return SysDictDataApiFp(configuration).apiSysDictDataDetailGet(id, status, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -733,49 +733,49 @@ export class SysDictDataApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 删除字典值
-     * @param {DeleteDictDataInput} [body] 
+     * @summary 根据字典类型编码获取字典值集合
+     * @param {string} code 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysDictDataApi
      */
-    public async apiSysDictDataDeleteDelete(body?: DeleteDictDataInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysDictDataApiFp(this.configuration).apiSysDictDataDeleteDelete(body, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysDictDataDataListCodeGet(code: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
+        return SysDictDataApiFp(this.configuration).apiSysDictDataDataListCodeGet(code, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 获取字典值详情
-     * @param {number} id 主键Id
-     * @param {StatusEnum} [status] 状态
+     * @summary 根据查询条件获取字典值集合
+     * @param {string} code 编码
+     * @param {number} [status] 状态
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysDictDataApi
      */
-    public async apiSysDictDataDetailGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysDictData>> {
-        return SysDictDataApiFp(this.configuration).apiSysDictDataDetailGet(id, status, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysDictDataDataListGet(code: string, status?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
+        return SysDictDataApiFp(this.configuration).apiSysDictDataDataListGet(code, status, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 根据字典类型编码获取字典值集合
-     * @param {string} code 
+     * @summary 删除字典值
+     * @param {DeleteDictDataInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysDictDataApi
      */
-    public async apiSysDictDataDictDataListCodeGet(code: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
-        return SysDictDataApiFp(this.configuration).apiSysDictDataDictDataListCodeGet(code, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysDictDataDeleteDelete(body?: DeleteDictDataInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysDictDataApiFp(this.configuration).apiSysDictDataDeleteDelete(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 根据查询条件获取字典值集合
-     * @param {string} code 编码
-     * @param {number} [status] 状态
+     * @summary 获取字典值详情
+     * @param {number} id 主键Id
+     * @param {StatusEnum} [status] 状态
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysDictDataApi
      */
-    public async apiSysDictDataDictDataListGet(code: string, status?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
-        return SysDictDataApiFp(this.configuration).apiSysDictDataDictDataListGet(code, status, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysDictDataDetailGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysDictData>> {
+        return SysDictDataApiFp(this.configuration).apiSysDictDataDetailGet(id, status, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 

Web/src/api-services/apis/sys-menu-api.ts

@@ -72,7 +72,7 @@ export const SysMenuApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary 获取按钮权限列表
+         * @summary 获取按钮权限集合
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -295,7 +295,7 @@ export const SysMenuApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 获取按钮权限列表
+         * @summary 获取按钮权限集合
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -383,7 +383,7 @@ export const SysMenuApiFactory = function (configuration?: Configuration, basePa
         },
         /**
          * 
-         * @summary 获取按钮权限列表
+         * @summary 获取按钮权限集合
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -453,7 +453,7 @@ export class SysMenuApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 获取按钮权限列表
+     * @summary 获取按钮权限集合
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysMenuApi

Web/src/api-services/apis/sys-role-api.ts

@@ -235,7 +235,7 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary 根据角色Id获取菜单集合
+         * @summary 根据角色Id获取菜单Id集合
          * @param {number} id 主键Id
          * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
@@ -566,7 +566,7 @@ export const SysRoleApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 根据角色Id获取菜单集合
+         * @summary 根据角色Id获取菜单Id集合
          * @param {number} id 主键Id
          * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
@@ -702,7 +702,7 @@ export const SysRoleApiFactory = function (configuration?: Configuration, basePa
         },
         /**
          * 
-         * @summary 根据角色Id获取菜单集合
+         * @summary 根据角色Id获取菜单Id集合
          * @param {number} id 主键Id
          * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
@@ -824,7 +824,7 @@ export class SysRoleApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 根据角色Id获取菜单集合
+     * @summary 根据角色Id获取菜单Id集合
      * @param {number} id 主键Id
      * @param {StatusEnum} [status] 状态
      * @param {*} [options] Override http request option.

Web/src/api-services/apis/sys-user-api.ts

@@ -112,6 +112,47 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 更新用户基本信息
+         * @param {SysUser} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysUserBaseInfoPut: async (body?: SysUser, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysUser/baseInfo`;
+            // 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: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+            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};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary 修改用户密码
@@ -196,30 +237,27 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary 获取用户扩展机构
-         * @param {number} userId 
+         * @summary 授权用户角色
+         * @param {UserRoleInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysUserExtOrgListUserIdGet: async (userId: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'userId' is not null or undefined
-            if (userId === null || userId === undefined) {
-                throw new RequiredError('userId','Required parameter userId was null or undefined when calling apiSysUserExtOrgListUserIdGet.');
-            }
-            const localVarPath = `/api/sysUser/extOrgList/{userId}`
-                .replace(`{${"userId"}}`, encodeURIComponent(String(userId)));
+        apiSysUserGrantRolePost: async (body?: UserRoleInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysUser/grantRole`;
             // 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 localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
 
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
                 query.set(key, localVarQueryParameter[key]);
@@ -230,6 +268,8 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             localVarUrlObj.search = (new URLSearchParams(query)).toString();
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
 
             return {
                 url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
@@ -238,27 +278,30 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary 授权用户角色
-         * @param {UserRoleInput} [body] 
+         * @summary 获取用户扩展机构集合
+         * @param {number} userId 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysUserGrantRolePost: async (body?: UserRoleInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/sysUser/grantRole`;
+        apiSysUserOwnExtOrgListUserIdGet: async (userId: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'userId' is not null or undefined
+            if (userId === null || userId === undefined) {
+                throw new RequiredError('userId','Required parameter userId was null or undefined when calling apiSysUserOwnExtOrgListUserIdGet.');
+            }
+            const localVarPath = `/api/sysUser/ownExtOrgList/{userId}`
+                .replace(`{${"userId"}}`, encodeURIComponent(String(userId)));
             // 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: 'POST', ...baseOptions, ...options};
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
 
-            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
-
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
                 query.set(key, localVarQueryParameter[key]);
@@ -269,8 +312,6 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
             localVarUrlObj.search = (new URLSearchParams(query)).toString();
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
 
             return {
                 url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
@@ -279,7 +320,7 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary 获取用户拥有角色
+         * @summary 获取用户拥有角色集合
          * @param {number} userId 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -441,47 +482,6 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
                 options: localVarRequestOptions,
             };
         },
-        /**
-         * 
-         * @summary 更新用户基本信息
-         * @param {SysUser} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        apiSysUserSetBaseInfoPost: async (body?: SysUser, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/sysUser/setBaseInfo`;
-            // 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: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication Bearer required
-
-            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
-
-            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};
-            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
-
-            return {
-                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @summary 设置用户状态
@@ -600,6 +600,20 @@ export const SysUserApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * 
+         * @summary 更新用户基本信息
+         * @param {SysUser} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysUserBaseInfoPut(body?: SysUser, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultInt32>>> {
+            const localVarAxiosArgs = await SysUserApiAxiosParamCreator(configuration).apiSysUserBaseInfoPut(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 修改用户密码
@@ -630,13 +644,13 @@ export const SysUserApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 获取用户扩展机构
-         * @param {number} userId 
+         * @summary 授权用户角色
+         * @param {UserRoleInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysUserExtOrgListUserIdGet(userId: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysUserExtOrg>>> {
-            const localVarAxiosArgs = await SysUserApiAxiosParamCreator(configuration).apiSysUserExtOrgListUserIdGet(userId, options);
+        async apiSysUserGrantRolePost(body?: UserRoleInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysUserApiAxiosParamCreator(configuration).apiSysUserGrantRolePost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -644,13 +658,13 @@ export const SysUserApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 授权用户角色
-         * @param {UserRoleInput} [body] 
+         * @summary 获取用户扩展机构集合
+         * @param {number} userId 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysUserGrantRolePost(body?: UserRoleInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysUserApiAxiosParamCreator(configuration).apiSysUserGrantRolePost(body, options);
+        async apiSysUserOwnExtOrgListUserIdGet(userId: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysUserExtOrg>>> {
+            const localVarAxiosArgs = await SysUserApiAxiosParamCreator(configuration).apiSysUserOwnExtOrgListUserIdGet(userId, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -658,7 +672,7 @@ export const SysUserApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 获取用户拥有角色
+         * @summary 获取用户拥有角色集合
          * @param {number} userId 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -706,20 +720,6 @@ export const SysUserApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
-        /**
-         * 
-         * @summary 更新用户基本信息
-         * @param {SysUser} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async apiSysUserSetBaseInfoPost(body?: SysUser, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultInt32>>> {
-            const localVarAxiosArgs = await SysUserApiAxiosParamCreator(configuration).apiSysUserSetBaseInfoPost(body, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
         /**
          * 
          * @summary 设置用户状态
@@ -776,6 +776,16 @@ export const SysUserApiFactory = function (configuration?: Configuration, basePa
         async apiSysUserBaseInfoGet(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysUser>> {
             return SysUserApiFp(configuration).apiSysUserBaseInfoGet(options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary 更新用户基本信息
+         * @param {SysUser} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysUserBaseInfoPut(body?: SysUser, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultInt32>> {
+            return SysUserApiFp(configuration).apiSysUserBaseInfoPut(body, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 修改用户密码
@@ -798,27 +808,27 @@ export const SysUserApiFactory = function (configuration?: Configuration, basePa
         },
         /**
          * 
-         * @summary 获取用户扩展机构
-         * @param {number} userId 
+         * @summary 授权用户角色
+         * @param {UserRoleInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysUserExtOrgListUserIdGet(userId: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysUserExtOrg>> {
-            return SysUserApiFp(configuration).apiSysUserExtOrgListUserIdGet(userId, options).then((request) => request(axios, basePath));
+        async apiSysUserGrantRolePost(body?: UserRoleInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysUserApiFp(configuration).apiSysUserGrantRolePost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @summary 授权用户角色
-         * @param {UserRoleInput} [body] 
+         * @summary 获取用户扩展机构集合
+         * @param {number} userId 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysUserGrantRolePost(body?: UserRoleInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysUserApiFp(configuration).apiSysUserGrantRolePost(body, options).then((request) => request(axios, basePath));
+        async apiSysUserOwnExtOrgListUserIdGet(userId: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysUserExtOrg>> {
+            return SysUserApiFp(configuration).apiSysUserOwnExtOrgListUserIdGet(userId, options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @summary 获取用户拥有角色
+         * @summary 获取用户拥有角色集合
          * @param {number} userId 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -854,16 +864,6 @@ export const SysUserApiFactory = function (configuration?: Configuration, basePa
         async apiSysUserResetPwdPost(body?: ResetPwdUserInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultInt32>> {
             return SysUserApiFp(configuration).apiSysUserResetPwdPost(body, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @summary 更新用户基本信息
-         * @param {SysUser} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async apiSysUserSetBaseInfoPost(body?: SysUser, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultInt32>> {
-            return SysUserApiFp(configuration).apiSysUserSetBaseInfoPost(body, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @summary 设置用户状态
@@ -915,6 +915,17 @@ export class SysUserApi extends BaseAPI {
     public async apiSysUserBaseInfoGet(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysUser>> {
         return SysUserApiFp(this.configuration).apiSysUserBaseInfoGet(options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * 
+     * @summary 更新用户基本信息
+     * @param {SysUser} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysUserApi
+     */
+    public async apiSysUserBaseInfoPut(body?: SysUser, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultInt32>> {
+        return SysUserApiFp(this.configuration).apiSysUserBaseInfoPut(body, options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 修改用户密码
@@ -939,29 +950,29 @@ export class SysUserApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 获取用户扩展机构
-     * @param {number} userId 
+     * @summary 授权用户角色
+     * @param {UserRoleInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysUserApi
      */
-    public async apiSysUserExtOrgListUserIdGet(userId: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysUserExtOrg>> {
-        return SysUserApiFp(this.configuration).apiSysUserExtOrgListUserIdGet(userId, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysUserGrantRolePost(body?: UserRoleInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysUserApiFp(this.configuration).apiSysUserGrantRolePost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 授权用户角色
-     * @param {UserRoleInput} [body] 
+     * @summary 获取用户扩展机构集合
+     * @param {number} userId 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysUserApi
      */
-    public async apiSysUserGrantRolePost(body?: UserRoleInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysUserApiFp(this.configuration).apiSysUserGrantRolePost(body, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysUserOwnExtOrgListUserIdGet(userId: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysUserExtOrg>> {
+        return SysUserApiFp(this.configuration).apiSysUserOwnExtOrgListUserIdGet(userId, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 获取用户拥有角色
+     * @summary 获取用户拥有角色集合
      * @param {number} userId 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
@@ -1000,17 +1011,6 @@ export class SysUserApi extends BaseAPI {
     public async apiSysUserResetPwdPost(body?: ResetPwdUserInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultInt32>> {
         return SysUserApiFp(this.configuration).apiSysUserResetPwdPost(body, options).then((request) => request(this.axios, this.basePath));
     }
-    /**
-     * 
-     * @summary 更新用户基本信息
-     * @param {SysUser} [body] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysUserApi
-     */
-    public async apiSysUserSetBaseInfoPost(body?: SysUser, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultInt32>> {
-        return SysUserApiFp(this.configuration).apiSysUserSetBaseInfoPost(body, options).then((request) => request(this.axios, this.basePath));
-    }
     /**
      * 
      * @summary 设置用户状态

Web/src/api-services/apis/sys-wechat-pay-api.ts

@@ -29,13 +29,13 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
     return {
         /**
          * 
-         * @summary 生成JSAPI调起支付所需参数
-         * @param {WechatPayParaInput} [body] 
+         * @summary 微信支付统一下单获取Id(服务商模式)
+         * @param {WechatPayTransactionInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysWechatPayGenerateParametersForJsapiPayPost: async (body?: WechatPayParaInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/sysWechatPay/generateParametersForJsapiPay`;
+        apiSysWechatPayCreatePayPartnerTransactionPost: async (body?: WechatPayTransactionInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysWechatPay/createPayPartnerTransaction`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -70,12 +70,13 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
         },
         /**
          * 
-         * @summary 微信支付成功回调(商户直连)
+         * @summary 微信支付统一下单获取Id(商户直连)
+         * @param {WechatPayTransactionInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysWechatPayPayCallBackPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/sysWechatPay/payCallBack`;
+        apiSysWechatPayCreatePayTransactionPost: async (body?: WechatPayTransactionInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysWechatPay/createPayTransaction`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -88,6 +89,8 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
 
             // authentication Bearer required
 
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
                 query.set(key, localVarQueryParameter[key]);
@@ -98,6 +101,8 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
             localVarUrlObj.search = (new URLSearchParams(query)).toString();
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
 
             return {
                 url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
@@ -106,30 +111,27 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
         },
         /**
          * 
-         * @summary 获取支付订单详情
-         * @param {string} tradeId 
+         * @summary 生成JSAPI调起支付所需参数
+         * @param {WechatPayParaInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysWechatPayPayInfoTradeIdGet: async (tradeId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'tradeId' is not null or undefined
-            if (tradeId === null || tradeId === undefined) {
-                throw new RequiredError('tradeId','Required parameter tradeId was null or undefined when calling apiSysWechatPayPayInfoTradeIdGet.');
-            }
-            const localVarPath = `/api/sysWechatPay/payInfo/{tradeId}`
-                .replace(`{${"tradeId"}}`, encodeURIComponent(String(tradeId)));
+        apiSysWechatPayGenerateParametersForJsapiPayPost: async (body?: WechatPayParaInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysWechatPay/generateParametersForJsapiPay`;
             // 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 localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
 
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
                 query.set(key, localVarQueryParameter[key]);
@@ -140,6 +142,8 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
             localVarUrlObj.search = (new URLSearchParams(query)).toString();
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
 
             return {
                 url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
@@ -148,12 +152,12 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
         },
         /**
          * 
-         * @summary 微信支付成功回调(服务商模式)
+         * @summary 微信支付成功回调(商户直连)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysWechatPayPayPartnerCallBackPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/sysWechatPay/payPartnerCallBack`;
+        apiSysWechatPayPayCallBackPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysWechatPay/payCallBack`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -184,27 +188,30 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
         },
         /**
          * 
-         * @summary 微信支付统一下单获取Id(服务商模式)
-         * @param {WechatPayTransactionInput} [body] 
+         * @summary 获取支付订单详情
+         * @param {string} tradeId 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysWechatPayPayPartnerTransactionPost: async (body?: WechatPayTransactionInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/sysWechatPay/payPartnerTransaction`;
+        apiSysWechatPayPayInfoTradeIdGet: async (tradeId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'tradeId' is not null or undefined
+            if (tradeId === null || tradeId === undefined) {
+                throw new RequiredError('tradeId','Required parameter tradeId was null or undefined when calling apiSysWechatPayPayInfoTradeIdGet.');
+            }
+            const localVarPath = `/api/sysWechatPay/payInfo/{tradeId}`
+                .replace(`{${"tradeId"}}`, encodeURIComponent(String(tradeId)));
             // 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: 'POST', ...baseOptions, ...options};
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
             // authentication Bearer required
 
-            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
-
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
                 query.set(key, localVarQueryParameter[key]);
@@ -215,8 +222,6 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
             localVarUrlObj.search = (new URLSearchParams(query)).toString();
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
 
             return {
                 url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
@@ -225,13 +230,12 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
         },
         /**
          * 
-         * @summary 微信支付统一下单获取Id(商户直连)
-         * @param {WechatPayTransactionInput} [body] 
+         * @summary 微信支付成功回调(服务商模式)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysWechatPayPayTransactionPost: async (body?: WechatPayTransactionInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/sysWechatPay/payTransaction`;
+        apiSysWechatPayPayPartnerCallBackPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysWechatPay/payPartnerCallBack`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -244,8 +248,6 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
 
             // authentication Bearer required
 
-            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
-
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
                 query.set(key, localVarQueryParameter[key]);
@@ -256,8 +258,6 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
             localVarUrlObj.search = (new URLSearchParams(query)).toString();
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
 
             return {
                 url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
@@ -273,6 +273,34 @@ export const SysWechatPayApiAxiosParamCreator = function (configuration?: Config
  */
 export const SysWechatPayApiFp = function(configuration?: Configuration) {
     return {
+        /**
+         * 
+         * @summary 微信支付统一下单获取Id(服务商模式)
+         * @param {WechatPayTransactionInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysWechatPayCreatePayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
+            const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayCreatePayPartnerTransactionPost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 微信支付统一下单获取Id(商户直连)
+         * @param {WechatPayTransactionInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysWechatPayCreatePayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
+            const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayCreatePayTransactionPost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 生成JSAPI调起支付所需参数
@@ -327,6 +355,15 @@ export const SysWechatPayApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+    }
+};
+
+/**
+ * SysWechatPayApi - factory interface
+ * @export
+ */
+export const SysWechatPayApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
+    return {
         /**
          * 
          * @summary 微信支付统一下单获取Id(服务商模式)
@@ -334,12 +371,8 @@ export const SysWechatPayApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
-            const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayPayPartnerTransactionPost(body, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
+        async apiSysWechatPayCreatePayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
+            return SysWechatPayApiFp(configuration).apiSysWechatPayCreatePayPartnerTransactionPost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -348,22 +381,9 @@ export const SysWechatPayApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
-            const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayPayTransactionPost(body, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
+        async apiSysWechatPayCreatePayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
+            return SysWechatPayApiFp(configuration).apiSysWechatPayCreatePayTransactionPost(body, options).then((request) => request(axios, basePath));
         },
-    }
-};
-
-/**
- * SysWechatPayApi - factory interface
- * @export
- */
-export const SysWechatPayApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
-    return {
         /**
          * 
          * @summary 生成JSAPI调起支付所需参数
@@ -402,26 +422,6 @@ export const SysWechatPayApiFactory = function (configuration?: Configuration, b
         async apiSysWechatPayPayPartnerCallBackPost(options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
             return SysWechatPayApiFp(configuration).apiSysWechatPayPayPartnerCallBackPost(options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @summary 微信支付统一下单获取Id(服务商模式)
-         * @param {WechatPayTransactionInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
-            return SysWechatPayApiFp(configuration).apiSysWechatPayPayPartnerTransactionPost(body, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary 微信支付统一下单获取Id(商户直连)
-         * @param {WechatPayTransactionInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
-            return SysWechatPayApiFp(configuration).apiSysWechatPayPayTransactionPost(body, options).then((request) => request(axios, basePath));
-        },
     };
 };
 
@@ -434,66 +434,66 @@ export const SysWechatPayApiFactory = function (configuration?: Configuration, b
 export class SysWechatPayApi extends BaseAPI {
     /**
      * 
-     * @summary 生成JSAPI调起支付所需参数
-     * @param {WechatPayParaInput} [body] 
+     * @summary 微信支付统一下单获取Id(服务商模式)
+     * @param {WechatPayTransactionInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysWechatPayApi
      */
-    public async apiSysWechatPayGenerateParametersForJsapiPayPost(body?: WechatPayParaInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
-        return SysWechatPayApiFp(this.configuration).apiSysWechatPayGenerateParametersForJsapiPayPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysWechatPayCreatePayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
+        return SysWechatPayApiFp(this.configuration).apiSysWechatPayCreatePayPartnerTransactionPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 微信支付成功回调(商户直连)
+     * @summary 微信支付统一下单获取Id(商户直连)
+     * @param {WechatPayTransactionInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysWechatPayApi
      */
-    public async apiSysWechatPayPayCallBackPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultWechatPayOutput>> {
-        return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayCallBackPost(options).then((request) => request(this.axios, this.basePath));
+    public async apiSysWechatPayCreatePayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
+        return SysWechatPayApiFp(this.configuration).apiSysWechatPayCreatePayTransactionPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 获取支付订单详情
-     * @param {string} tradeId 
+     * @summary 生成JSAPI调起支付所需参数
+     * @param {WechatPayParaInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysWechatPayApi
      */
-    public async apiSysWechatPayPayInfoTradeIdGet(tradeId: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysWechatPay>> {
-        return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayInfoTradeIdGet(tradeId, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysWechatPayGenerateParametersForJsapiPayPost(body?: WechatPayParaInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
+        return SysWechatPayApiFp(this.configuration).apiSysWechatPayGenerateParametersForJsapiPayPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 微信支付成功回调(服务商模式)
+     * @summary 微信支付成功回调(商户直连)
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysWechatPayApi
      */
-    public async apiSysWechatPayPayPartnerCallBackPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayPartnerCallBackPost(options).then((request) => request(this.axios, this.basePath));
+    public async apiSysWechatPayPayCallBackPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultWechatPayOutput>> {
+        return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayCallBackPost(options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 微信支付统一下单获取Id(服务商模式)
-     * @param {WechatPayTransactionInput} [body] 
+     * @summary 获取支付订单详情
+     * @param {string} tradeId 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysWechatPayApi
      */
-    public async apiSysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
-        return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayPartnerTransactionPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysWechatPayPayInfoTradeIdGet(tradeId: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysWechatPay>> {
+        return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayInfoTradeIdGet(tradeId, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 微信支付统一下单获取Id(商户直连)
-     * @param {WechatPayTransactionInput} [body] 
+     * @summary 微信支付成功回调(服务商模式)
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysWechatPayApi
      */
-    public async apiSysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
-        return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayTransactionPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysWechatPayPayPartnerCallBackPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysWechatPayApiFp(this.configuration).apiSysWechatPayPayPartnerCallBackPost(options).then((request) => request(this.axios, this.basePath));
     }
 }

Web/src/api-services/models/index.ts

@@ -191,7 +191,6 @@ export * from './tenant-input';
 export * from './tenant-output';
 export * from './tenant-type-enum';
 export * from './tenant-user-input';
-export * from './time-span';
 export * from './trigger-status';
 export * from './update-code-gen-input';
 export * from './update-config-input';

Web/src/api-services/models/time-span.ts

@@ -1,86 +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.
- */
-/**
- * 
- * @export
- * @interface TimeSpan
- */
-export interface TimeSpan {
-    /**
-     * 
-     * @type {number}
-     * @memberof TimeSpan
-     */
-    ticks?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof TimeSpan
-     */
-    days?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof TimeSpan
-     */
-    hours?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof TimeSpan
-     */
-    milliseconds?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof TimeSpan
-     */
-    minutes?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof TimeSpan
-     */
-    seconds?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof TimeSpan
-     */
-    totalDays?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof TimeSpan
-     */
-    totalHours?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof TimeSpan
-     */
-    totalMilliseconds?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof TimeSpan
-     */
-    totalMinutes?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof TimeSpan
-     */
-    totalSeconds?: number;
-}

Web/src/views/system/codeGen/component/editCodeGenDialog.vue

@@ -130,7 +130,7 @@ onMounted(async () => {
 	let resMenu = await getAPI(SysMenuApi).apiSysMenuListGet();
 	state.menuData = resMenu.data.result ?? [];
 
-	let resDicData = await getAPI(SysDictDataApi).apiSysDictDataDictDataListCodeGet('code_gen_create_type');
+	let resDicData = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('code_gen_create_type');
 	state.codeGenTypeList = resDicData.data.result;
 });
 

Web/src/views/system/codeGen/component/genConfigDialog.vue

@@ -89,14 +89,14 @@ const state = reactive({
 });
 
 onMounted(async () => {
-	let res = await getAPI(SysDictDataApi).apiSysDictDataDictDataListCodeGet('code_gen_effect_type');
+	let res = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('code_gen_effect_type');
 	state.effectTypeList = res.data.result;
 
 	res = await getAPI(SysDictTypeApi).apiSysDictTypeListGet();
 	state.dictTypeCodeList = res.data.result;
 	state.dictDataAll = res.data.result;
 
-	res = await getAPI(SysDictDataApi).apiSysDictDataDictDataListCodeGet('code_gen_query_type');
+	res = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('code_gen_query_type');
 	state.queryTypeList = res.data.result;
 
 	res = await getAPI(SysConstApi).apiSysConstListGet();

Web/src/views/system/database/component/genEntity.vue

@@ -61,7 +61,7 @@ const state = reactive({
 });
 
 onMounted(async () => {
-	let resDicData = await getAPI(SysDictDataApi).apiSysDictDataDictDataListCodeGet('code_gen_base_class');
+	let resDicData = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('code_gen_base_class');
 	state.codeGenBaseClassName = resDicData.data.result;
 });
 

Web/src/views/system/user/component/editUser.vue

@@ -272,7 +272,7 @@ const openDialog = async (row: any) => {
 	if (JSON.stringify(row) !== '{}') {
 		var resRole = await getAPI(SysUserApi).apiSysUserOwnRoleListUserIdGet(row.id);
 		state.ruleForm.roleIdList = resRole.data.result;
-		var resExtOrg = await getAPI(SysUserApi).apiSysUserExtOrgListUserIdGet(row.id);
+		var resExtOrg = await getAPI(SysUserApi).apiSysUserOwnExtOrgListUserIdGet(row.id);
 		state.ruleForm.extOrgIdList = resExtOrg.data.result;
 		state.isShowDialog = true;
 	} else state.isShowDialog = true;

Web/src/views/system/user/component/userCenter.vue

@@ -265,7 +265,7 @@ const uploadAvatarFile = async (file: any) => {
 	uploadAvatarRef.value?.clearFiles();
 };
 
-// 密码提交
+// 修改个人信息
 const submitUserBase = () => {
 	ruleFormBaseRef.value.validate(async (valid: boolean) => {
 		if (!valid) return;
@@ -274,7 +274,7 @@ const submitUserBase = () => {
 			cancelButtonText: '取消',
 			type: 'warning',
 		}).then(async () => {
-			await getAPI(SysUserApi).apiSysUserSetBaseInfoPost(state.ruleFormBase);
+			await getAPI(SysUserApi).apiSysUserBaseInfoPut(state.ruleFormBase);
 		});
 	});
 };
@@ -325,6 +325,9 @@ const mouseEnterAvatar = () => {
 const mouseLeaveAvatar = () => {
 	state.avatarLoading = false;
 };
+
+// 导出对象
+defineExpose({ uploadAvatarFile, handleChangeSignFile });
 </script>
 
 <style lang="scss" scoped>