From ac8cc4c1dd43ae51e32ce57804b434bfadbc094f Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Tue, 4 Mar 2025 01:40:57 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Auth/SysLdapService.cs | 58 ++++++++-------- .../apis/sys-code-gen-config-api.ts | 30 ++++++-- .../api-services/apis/sys-wechat-pay-api.ts | 8 +-- .../api-services/models/add-code-gen-input.ts | 16 +++++ .../admin-netresult-wechat-pay-para-output.ts | 69 +++++++++++++++++++ Web/src/api-services/models/index.ts | 1 + .../models/page-code-gen-input.ts | 8 +++ Web/src/api-services/models/sys-code-gen.ts | 16 +++++ .../models/update-code-gen-input.ts | 16 +++++ 9 files changed, 182 insertions(+), 40 deletions(-) create mode 100644 Web/src/api-services/models/admin-netresult-wechat-pay-para-output.ts diff --git a/Admin.NET/Admin.NET.Core/Service/Auth/SysLdapService.cs b/Admin.NET/Admin.NET.Core/Service/Auth/SysLdapService.cs index 298d56d4..482c9280 100644 --- a/Admin.NET/Admin.NET.Core/Service/Auth/SysLdapService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Auth/SysLdapService.cs @@ -118,15 +118,15 @@ public class SysLdapService : IDynamicApiController, ITransient var ldapConn = new LdapConnection(); try { - ldapConn.Connect(sysLdap.Host, sysLdap.Port); + await ldapConn.ConnectAsync(sysLdap.Host, sysLdap.Port); string bindPass = CryptogramUtil.Decrypt(sysLdap.BindPass); - ldapConn.Bind(sysLdap.Version, sysLdap.BindDn, bindPass); - var ldapSearchResults = ldapConn.Search(sysLdap.BaseDn, LdapConnection.ScopeSub, sysLdap.AuthFilter.Replace("%s", account), null, false); + await ldapConn.BindAsync(sysLdap.Version, sysLdap.BindDn, bindPass); + var ldapSearchResults = await ldapConn.SearchAsync(sysLdap.BaseDn, LdapConnection.ScopeSub, sysLdap.AuthFilter.Replace("%s", account), null, false); string dn = string.Empty; - while (ldapSearchResults.HasMore()) + while (await ldapSearchResults.HasMoreAsync()) { - var ldapEntry = ldapSearchResults.Next(); - var sAmAccountName = ldapEntry.GetAttribute(sysLdap.BindAttrAccount)?.StringValue; + var ldapEntry = await ldapSearchResults.NextAsync(); + var sAmAccountName = ldapEntry.GetAttributeSet().GetAttribute(sysLdap.BindAttrAccount)?.StringValue; if (string.IsNullOrEmpty(sAmAccountName)) continue; dn = ldapEntry.Dn; break; @@ -134,7 +134,7 @@ public class SysLdapService : IDynamicApiController, ITransient if (string.IsNullOrEmpty(dn)) throw Oops.Oh(ErrorCodeEnum.D1002); // var attr = new LdapAttribute("userPassword", password); - ldapConn.Bind(dn, password); + await ldapConn.BindAsync(dn, password); } catch (LdapException e) { @@ -189,17 +189,17 @@ public class SysLdapService : IDynamicApiController, ITransient var ldapConn = new LdapConnection(); try { - ldapConn.Connect(sysLdap.Host, sysLdap.Port); + await ldapConn.ConnectAsync(sysLdap.Host, sysLdap.Port); string bindPass = CryptogramUtil.Decrypt(sysLdap.BindPass); - ldapConn.Bind(sysLdap.Version, sysLdap.BindDn, bindPass); - var ldapSearchResults = ldapConn.Search(sysLdap.BaseDn, LdapConnection.ScopeOne, "(objectClass=*)", null, false); + await ldapConn.BindAsync(sysLdap.Version, sysLdap.BindDn, bindPass); + var ldapSearchResults = await ldapConn.SearchAsync(sysLdap.BaseDn, LdapConnection.ScopeOne, "(objectClass=*)", null, false); var userLdapList = new List(); - while (ldapSearchResults.HasMore()) + while (await ldapSearchResults.HasMoreAsync()) { LdapEntry ldapEntry; try { - ldapEntry = ldapSearchResults.Next(); + ldapEntry = await ldapSearchResults.NextAsync(); if (ldapEntry == null) continue; } catch (LdapException) @@ -211,7 +211,7 @@ public class SysLdapService : IDynamicApiController, ITransient var deptCode = GetDepartmentCode(attrs, sysLdap.BindAttrCode); if (attrs.Count == 0 || attrs.ContainsKey("OU")) { - SearchDnLdapUser(ldapConn, sysLdap, userLdapList, ldapEntry.Dn, deptCode); + await SearchDnLdapUser(ldapConn, sysLdap, userLdapList, ldapEntry.Dn, deptCode); } else { @@ -290,15 +290,15 @@ public class SysLdapService : IDynamicApiController, ITransient /// /// /// - private static void SearchDnLdapUser(LdapConnection ldapConn, SysLdap sysLdap, List userLdapList, string baseDn, string deptCode) + private static async Task SearchDnLdapUser(LdapConnection ldapConn, SysLdap sysLdap, List userLdapList, string baseDn, string deptCode) { - var ldapSearchResults = ldapConn.Search(baseDn, LdapConnection.ScopeOne, "(objectClass=*)", null, false); - while (ldapSearchResults.HasMore()) + var ldapSearchResults = await ldapConn.SearchAsync(baseDn, LdapConnection.ScopeOne, "(objectClass=*)", null, false); + while (await ldapSearchResults.HasMoreAsync()) { LdapEntry ldapEntry; try { - ldapEntry = ldapSearchResults.Next(); + ldapEntry = await ldapSearchResults.NextAsync(); if (ldapEntry == null) continue; } catch (LdapException) @@ -310,7 +310,7 @@ public class SysLdapService : IDynamicApiController, ITransient deptCode = GetDepartmentCode(attrs, sysLdap.BindAttrCode); if (attrs.Count == 0 || attrs.ContainsKey("OU")) - SearchDnLdapUser(ldapConn, sysLdap, userLdapList, ldapEntry.Dn, deptCode); + await SearchDnLdapUser(ldapConn, sysLdap, userLdapList, ldapEntry.Dn, deptCode); else { var sysUserLdap = CreateSysUserLdap(attrs, sysLdap.BindAttrAccount, sysLdap.BindAttrEmployeeId, deptCode); @@ -334,17 +334,17 @@ public class SysLdapService : IDynamicApiController, ITransient var ldapConn = new LdapConnection(); try { - ldapConn.Connect(sysLdap.Host, sysLdap.Port); + await ldapConn.ConnectAsync(sysLdap.Host, sysLdap.Port); string bindPass = CryptogramUtil.Decrypt(sysLdap.BindPass); - ldapConn.Bind(sysLdap.Version, sysLdap.BindDn, bindPass); - var ldapSearchResults = ldapConn.Search(sysLdap.BaseDn, LdapConnection.ScopeOne, "(objectClass=*)", null, false); + await ldapConn.BindAsync(sysLdap.Version, sysLdap.BindDn, bindPass); + var ldapSearchResults = await ldapConn.SearchAsync(sysLdap.BaseDn, LdapConnection.ScopeOne, "(objectClass=*)", null, false); var orgList = new List(); - while (ldapSearchResults.HasMore()) + while (await ldapSearchResults.HasMoreAsync()) { LdapEntry ldapEntry; try { - ldapEntry = ldapSearchResults.Next(); + ldapEntry = await ldapSearchResults.NextAsync(); if (ldapEntry == null) continue; } catch (LdapException) @@ -358,7 +358,7 @@ public class SysLdapService : IDynamicApiController, ITransient var sysOrg = CreateSysOrg(attrs, sysLdap, orgList, new SysOrg { Id = 0, Level = 0 }); orgList.Add(sysOrg); - SearchDnLdapDept(ldapConn, sysLdap, orgList, ldapEntry.Dn, sysOrg); + await SearchDnLdapDept(ldapConn, sysLdap, orgList, ldapEntry.Dn, sysOrg); } if (orgList.Count == 0) @@ -388,15 +388,15 @@ public class SysLdapService : IDynamicApiController, ITransient /// /// /// - private static void SearchDnLdapDept(LdapConnection ldapConn, SysLdap sysLdap, List listOrgs, string baseDn, SysOrg org) + private static async Task SearchDnLdapDept(LdapConnection ldapConn, SysLdap sysLdap, List listOrgs, string baseDn, SysOrg org) { - var ldapSearchResults = ldapConn.Search(baseDn, LdapConnection.ScopeOne, "(objectClass=*)", null, false); - while (ldapSearchResults.HasMore()) + var ldapSearchResults = await ldapConn.SearchAsync(baseDn, LdapConnection.ScopeOne, "(objectClass=*)", null, false); + while (await ldapSearchResults.HasMoreAsync()) { LdapEntry ldapEntry; try { - ldapEntry = ldapSearchResults.Next(); + ldapEntry = await ldapSearchResults.NextAsync(); if (ldapEntry == null) continue; } catch (LdapException) @@ -410,7 +410,7 @@ public class SysLdapService : IDynamicApiController, ITransient var sysOrg = CreateSysOrg(attrs, sysLdap, listOrgs, org); listOrgs.Add(sysOrg); - SearchDnLdapDept(ldapConn, sysLdap, listOrgs, ldapEntry.Dn, sysOrg); + await SearchDnLdapDept(ldapConn, sysLdap, listOrgs, ldapEntry.Dn, sysOrg); } } diff --git a/Web/src/api-services/apis/sys-code-gen-config-api.ts b/Web/src/api-services/apis/sys-code-gen-config-api.ts index 93e9e172..89b92b5e 100644 --- a/Web/src/api-services/apis/sys-code-gen-config-api.ts +++ b/Web/src/api-services/apis/sys-code-gen-config-api.ts @@ -106,6 +106,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co * @param {string} [bottomKey] 下表关联字段 * @param {string} [bottomPrimaryKey] 下表关联主表字段 * @param {string} [template] 模板 + * @param {string} [tabType] 表类型 * @param {string} [className] 类名 * @param {string} [tablePrefix] 是否移除表前缀 * @param {string} [configId] 库定位器名 @@ -113,6 +114,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co * @param {string} [dbType] 数据库类型 * @param {string} [connectionString] 数据库链接 * @param {string} [treeName] 树控件名称 + * @param {string} [treeKey] 树控件key * @param {string} [tableComment] 功能名（数据库表名称） * @param {string} [menuApplication] 菜单应用分类（应用编码） * @param {number} [menuPid] 菜单父级 @@ -136,7 +138,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co * @param {*} [options] Override http request option. * @throws {RequiredError} */ - apiSysCodeGenConfigColumnListGet: async (tableName: string, busName: string, nameSpace: string, authorName: string, generateType: string, generateMenu: boolean, isApiService?: boolean, codeGenTemplateIds?: Array, leftTab?: string, leftKey?: string, leftPrimaryKey?: string, leftName?: string, bottomTab?: string, bottomKey?: string, bottomPrimaryKey?: string, template?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, treeName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, menuIcon?: string, pagePath?: string, printType?: string, printName?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options: AxiosRequestConfig = {}): Promise => { + apiSysCodeGenConfigColumnListGet: async (tableName: string, busName: string, nameSpace: string, authorName: string, generateType: string, generateMenu: boolean, isApiService?: boolean, codeGenTemplateIds?: Array, leftTab?: string, leftKey?: string, leftPrimaryKey?: string, leftName?: string, bottomTab?: string, bottomKey?: string, bottomPrimaryKey?: string, template?: string, tabType?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, treeName?: string, treeKey?: string, tableComment?: string, menuApplication?: string, menuPid?: number, menuIcon?: string, pagePath?: string, printType?: string, printName?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'tableName' is not null or undefined if (tableName === null || tableName === undefined) { throw new RequiredError('tableName','Required parameter tableName was null or undefined when calling apiSysCodeGenConfigColumnListGet.'); @@ -245,6 +247,10 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co localVarQueryParameter['Template'] = template; } + if (tabType !== undefined) { + localVarQueryParameter['TabType'] = tabType; + } + if (className !== undefined) { localVarQueryParameter['ClassName'] = className; } @@ -273,6 +279,10 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co localVarQueryParameter['TreeName'] = treeName; } + if (treeKey !== undefined) { + localVarQueryParameter['TreeKey'] = treeKey; + } + if (tableComment !== undefined) { localVarQueryParameter['TableComment'] = tableComment; } @@ -1005,6 +1015,7 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) { * @param {string} [bottomKey] 下表关联字段 * @param {string} [bottomPrimaryKey] 下表关联主表字段 * @param {string} [template] 模板 + * @param {string} [tabType] 表类型 * @param {string} [className] 类名 * @param {string} [tablePrefix] 是否移除表前缀 * @param {string} [configId] 库定位器名 @@ -1012,6 +1023,7 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) { * @param {string} [dbType] 数据库类型 * @param {string} [connectionString] 数据库链接 * @param {string} [treeName] 树控件名称 + * @param {string} [treeKey] 树控件key * @param {string} [tableComment] 功能名（数据库表名称） * @param {string} [menuApplication] 菜单应用分类（应用编码） * @param {number} [menuPid] 菜单父级 @@ -1035,8 +1047,8 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async apiSysCodeGenConfigColumnListGet(tableName: string, busName: string, nameSpace: string, authorName: string, generateType: string, generateMenu: boolean, isApiService?: boolean, codeGenTemplateIds?: Array, leftTab?: string, leftKey?: string, leftPrimaryKey?: string, leftName?: string, bottomTab?: string, bottomKey?: string, bottomPrimaryKey?: string, template?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, treeName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, menuIcon?: string, pagePath?: string, printType?: string, printName?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { - const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigColumnListGet(tableName, busName, nameSpace, authorName, generateType, generateMenu, isApiService, codeGenTemplateIds, leftTab, leftKey, leftPrimaryKey, leftName, bottomTab, bottomKey, bottomPrimaryKey, template, className, tablePrefix, configId, dbName, dbType, connectionString, treeName, tableComment, menuApplication, menuPid, menuIcon, pagePath, printType, printName, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options); + async apiSysCodeGenConfigColumnListGet(tableName: string, busName: string, nameSpace: string, authorName: string, generateType: string, generateMenu: boolean, isApiService?: boolean, codeGenTemplateIds?: Array, leftTab?: string, leftKey?: string, leftPrimaryKey?: string, leftName?: string, bottomTab?: string, bottomKey?: string, bottomPrimaryKey?: string, template?: string, tabType?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, treeName?: string, treeKey?: string, tableComment?: string, menuApplication?: string, menuPid?: number, menuIcon?: string, pagePath?: string, printType?: string, printName?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { + const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigColumnListGet(tableName, busName, nameSpace, authorName, generateType, generateMenu, isApiService, codeGenTemplateIds, leftTab, leftKey, leftPrimaryKey, leftName, bottomTab, bottomKey, bottomPrimaryKey, template, tabType, className, tablePrefix, configId, dbName, dbType, connectionString, treeName, treeKey, tableComment, menuApplication, menuPid, menuIcon, pagePath, printType, printName, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options); return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; return axios.request(axiosRequestArgs); @@ -1217,6 +1229,7 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio * @param {string} [bottomKey] 下表关联字段 * @param {string} [bottomPrimaryKey] 下表关联主表字段 * @param {string} [template] 模板 + * @param {string} [tabType] 表类型 * @param {string} [className] 类名 * @param {string} [tablePrefix] 是否移除表前缀 * @param {string} [configId] 库定位器名 @@ -1224,6 +1237,7 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio * @param {string} [dbType] 数据库类型 * @param {string} [connectionString] 数据库链接 * @param {string} [treeName] 树控件名称 + * @param {string} [treeKey] 树控件key * @param {string} [tableComment] 功能名（数据库表名称） * @param {string} [menuApplication] 菜单应用分类（应用编码） * @param {number} [menuPid] 菜单父级 @@ -1247,8 +1261,8 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async apiSysCodeGenConfigColumnListGet(tableName: string, busName: string, nameSpace: string, authorName: string, generateType: string, generateMenu: boolean, isApiService?: boolean, codeGenTemplateIds?: Array, leftTab?: string, leftKey?: string, leftPrimaryKey?: string, leftName?: string, bottomTab?: string, bottomKey?: string, bottomPrimaryKey?: string, template?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, treeName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, menuIcon?: string, pagePath?: string, printType?: string, printName?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig): Promise> { - return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigColumnListGet(tableName, busName, nameSpace, authorName, generateType, generateMenu, isApiService, codeGenTemplateIds, leftTab, leftKey, leftPrimaryKey, leftName, bottomTab, bottomKey, bottomPrimaryKey, template, className, tablePrefix, configId, dbName, dbType, connectionString, treeName, tableComment, menuApplication, menuPid, menuIcon, pagePath, printType, printName, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options).then((request) => request(axios, basePath)); + async apiSysCodeGenConfigColumnListGet(tableName: string, busName: string, nameSpace: string, authorName: string, generateType: string, generateMenu: boolean, isApiService?: boolean, codeGenTemplateIds?: Array, leftTab?: string, leftKey?: string, leftPrimaryKey?: string, leftName?: string, bottomTab?: string, bottomKey?: string, bottomPrimaryKey?: string, template?: string, tabType?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, treeName?: string, treeKey?: string, tableComment?: string, menuApplication?: string, menuPid?: number, menuIcon?: string, pagePath?: string, printType?: string, printName?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig): Promise> { + return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigColumnListGet(tableName, busName, nameSpace, authorName, generateType, generateMenu, isApiService, codeGenTemplateIds, leftTab, leftKey, leftPrimaryKey, leftName, bottomTab, bottomKey, bottomPrimaryKey, template, tabType, className, tablePrefix, configId, dbName, dbType, connectionString, treeName, treeKey, tableComment, menuApplication, menuPid, menuIcon, pagePath, printType, printName, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options).then((request) => request(axios, basePath)); }, /** * @@ -1411,6 +1425,7 @@ export class SysCodeGenConfigApi extends BaseAPI { * @param {string} [bottomKey] 下表关联字段 * @param {string} [bottomPrimaryKey] 下表关联主表字段 * @param {string} [template] 模板 + * @param {string} [tabType] 表类型 * @param {string} [className] 类名 * @param {string} [tablePrefix] 是否移除表前缀 * @param {string} [configId] 库定位器名 @@ -1418,6 +1433,7 @@ export class SysCodeGenConfigApi extends BaseAPI { * @param {string} [dbType] 数据库类型 * @param {string} [connectionString] 数据库链接 * @param {string} [treeName] 树控件名称 + * @param {string} [treeKey] 树控件key * @param {string} [tableComment] 功能名（数据库表名称） * @param {string} [menuApplication] 菜单应用分类（应用编码） * @param {number} [menuPid] 菜单父级 @@ -1442,8 +1458,8 @@ export class SysCodeGenConfigApi extends BaseAPI { * @throws {RequiredError} * @memberof SysCodeGenConfigApi */ - public async apiSysCodeGenConfigColumnListGet(tableName: string, busName: string, nameSpace: string, authorName: string, generateType: string, generateMenu: boolean, isApiService?: boolean, codeGenTemplateIds?: Array, leftTab?: string, leftKey?: string, leftPrimaryKey?: string, leftName?: string, bottomTab?: string, bottomKey?: string, bottomPrimaryKey?: string, template?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, treeName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, menuIcon?: string, pagePath?: string, printType?: string, printName?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig) : Promise> { - return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigColumnListGet(tableName, busName, nameSpace, authorName, generateType, generateMenu, isApiService, codeGenTemplateIds, leftTab, leftKey, leftPrimaryKey, leftName, bottomTab, bottomKey, bottomPrimaryKey, template, className, tablePrefix, configId, dbName, dbType, connectionString, treeName, tableComment, menuApplication, menuPid, menuIcon, pagePath, printType, printName, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options).then((request) => request(this.axios, this.basePath)); + public async apiSysCodeGenConfigColumnListGet(tableName: string, busName: string, nameSpace: string, authorName: string, generateType: string, generateMenu: boolean, isApiService?: boolean, codeGenTemplateIds?: Array, leftTab?: string, leftKey?: string, leftPrimaryKey?: string, leftName?: string, bottomTab?: string, bottomKey?: string, bottomPrimaryKey?: string, template?: string, tabType?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, treeName?: string, treeKey?: string, tableComment?: string, menuApplication?: string, menuPid?: number, menuIcon?: string, pagePath?: string, printType?: string, printName?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig) : Promise> { + return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigColumnListGet(tableName, busName, nameSpace, authorName, generateType, generateMenu, isApiService, codeGenTemplateIds, leftTab, leftKey, leftPrimaryKey, leftName, bottomTab, bottomKey, bottomPrimaryKey, template, tabType, className, tablePrefix, configId, dbName, dbType, connectionString, treeName, treeKey, tableComment, menuApplication, menuPid, menuIcon, pagePath, printType, printName, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options).then((request) => request(this.axios, this.basePath)); } /** * diff --git a/Web/src/api-services/apis/sys-wechat-pay-api.ts b/Web/src/api-services/apis/sys-wechat-pay-api.ts index 73579174..cb1b44db 100644 --- a/Web/src/api-services/apis/sys-wechat-pay-api.ts +++ b/Web/src/api-services/apis/sys-wechat-pay-api.ts @@ -21,10 +21,10 @@ import { AdminNETResultCreatePayTransactionNativeOutput } from '../models'; import { AdminNETResultCreatePayTransactionOutput } from '../models'; import { AdminNETResultGetRefundDomesticRefundByOutRefundNumberResponse } from '../models'; import { AdminNETResultListSysWechatRefund } from '../models'; -import { AdminNETResultObject } from '../models'; import { AdminNETResultSqlSugarPagedListSysWechatPay } from '../models'; import { AdminNETResultSysWechatPay } from '../models'; import { AdminNETResultWechatPayOutput } from '../models'; +import { AdminNETResultWechatPayParaOutput } from '../models'; import { PageSysWechatPayInput } from '../models'; import { RefundRequestInput } from '../models'; import { WechatPayParaInput } from '../models'; @@ -766,7 +766,7 @@ export const SysWechatPayApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async apiSysWechatPayGenerateParametersForJsapiPayPost(body?: WechatPayParaInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { + async apiSysWechatPayGenerateParametersForJsapiPayPost(body?: WechatPayParaInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise>> { const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).apiSysWechatPayGenerateParametersForJsapiPayPost(body, options); return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => { const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url}; @@ -983,7 +983,7 @@ export const SysWechatPayApiFactory = function (configuration?: Configuration, b * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async apiSysWechatPayGenerateParametersForJsapiPayPost(body?: WechatPayParaInput, options?: AxiosRequestConfig): Promise> { + async apiSysWechatPayGenerateParametersForJsapiPayPost(body?: WechatPayParaInput, options?: AxiosRequestConfig): Promise> { return SysWechatPayApiFp(configuration).apiSysWechatPayGenerateParametersForJsapiPayPost(body, options).then((request) => request(axios, basePath)); }, /** @@ -1142,7 +1142,7 @@ export class SysWechatPayApi extends BaseAPI { * @throws {RequiredError} * @memberof SysWechatPayApi */ - public async apiSysWechatPayGenerateParametersForJsapiPayPost(body?: WechatPayParaInput, options?: AxiosRequestConfig) : Promise> { + public async apiSysWechatPayGenerateParametersForJsapiPayPost(body?: WechatPayParaInput, options?: AxiosRequestConfig) : Promise> { return SysWechatPayApiFp(this.configuration).apiSysWechatPayGenerateParametersForJsapiPayPost(body, options).then((request) => request(this.axios, this.basePath)); } /** diff --git a/Web/src/api-services/models/add-code-gen-input.ts b/Web/src/api-services/models/add-code-gen-input.ts index 554c6e5c..a26ae712 100644 --- a/Web/src/api-services/models/add-code-gen-input.ts +++ b/Web/src/api-services/models/add-code-gen-input.ts @@ -138,6 +138,14 @@ export interface AddCodeGenInput { */ treeName?: string | null; + /** + * 树控件key + * + * @type {string} + * @memberof AddCodeGenInput + */ + treeKey?: string | null; + /** * 功能名（数据库表名称） * @@ -321,4 +329,12 @@ export interface AddCodeGenInput { * @memberof AddCodeGenInput */ template?: string | null; + + /** + * 表类型 + * + * @type {string} + * @memberof AddCodeGenInput + */ + tabType?: string | null; } diff --git a/Web/src/api-services/models/admin-netresult-wechat-pay-para-output.ts b/Web/src/api-services/models/admin-netresult-wechat-pay-para-output.ts new file mode 100644 index 00000000..6a4de420 --- /dev/null +++ b/Web/src/api-services/models/admin-netresult-wechat-pay-para-output.ts @@ -0,0 +1,69 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Admin.NET 通用权限开发平台 + * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { WechatPayParaOutput } from './wechat-pay-para-output'; + /** + * 全局返回结果 + * + * @export + * @interface AdminNETResultWechatPayParaOutput + */ +export interface AdminNETResultWechatPayParaOutput { + + /** + * 状态码 + * + * @type {number} + * @memberof AdminNETResultWechatPayParaOutput + */ + code?: number; + + /** + * 类型success、warning、error + * + * @type {string} + * @memberof AdminNETResultWechatPayParaOutput + */ + type?: string | null; + + /** + * 错误信息 + * + * @type {string} + * @memberof AdminNETResultWechatPayParaOutput + */ + message?: string | null; + + /** + * @type {WechatPayParaOutput} + * @memberof AdminNETResultWechatPayParaOutput + */ + result?: WechatPayParaOutput; + + /** + * 附加数据 + * + * @type {any} + * @memberof AdminNETResultWechatPayParaOutput + */ + extras?: any | null; + + /** + * 时间 + * + * @type {Date} + * @memberof AdminNETResultWechatPayParaOutput + */ + time?: Date; +} diff --git a/Web/src/api-services/models/index.ts b/Web/src/api-services/models/index.ts index 9d15ee18..87428d25 100644 --- a/Web/src/api-services/models/index.ts +++ b/Web/src/api-services/models/index.ts @@ -131,6 +131,7 @@ export * from './admin-netresult-sys-user'; export * from './admin-netresult-sys-wechat-pay'; export * from './admin-netresult-visual-db-table'; export * from './admin-netresult-wechat-pay-output'; +export * from './admin-netresult-wechat-pay-para-output'; export * from './admin-netresult-wx-open-id-output'; export * from './admin-netresult-wx-phone-output'; export * from './alipay-pre-create-input'; diff --git a/Web/src/api-services/models/page-code-gen-input.ts b/Web/src/api-services/models/page-code-gen-input.ts index e9edd7e3..146ec9bb 100644 --- a/Web/src/api-services/models/page-code-gen-input.ts +++ b/Web/src/api-services/models/page-code-gen-input.ts @@ -162,6 +162,14 @@ export interface PageCodeGenInput { */ treeName?: string | null; + /** + * 树控件key + * + * @type {string} + * @memberof PageCodeGenInput + */ + treeKey?: string | null; + /** * 命名空间 * diff --git a/Web/src/api-services/models/sys-code-gen.ts b/Web/src/api-services/models/sys-code-gen.ts index 0a3f8375..60c4ddb3 100644 --- a/Web/src/api-services/models/sys-code-gen.ts +++ b/Web/src/api-services/models/sys-code-gen.ts @@ -294,6 +294,22 @@ export interface SysCodeGen { */ template?: string | null; + /** + * 表类型 + * + * @type {string} + * @memberof SysCodeGen + */ + tabType?: string | null; + + /** + * 树控件PidKey字段 + * + * @type {string} + * @memberof SysCodeGen + */ + treeKey?: string | null; + /** * 是否使用 Api Service * diff --git a/Web/src/api-services/models/update-code-gen-input.ts b/Web/src/api-services/models/update-code-gen-input.ts index 23799e83..06eeaa67 100644 --- a/Web/src/api-services/models/update-code-gen-input.ts +++ b/Web/src/api-services/models/update-code-gen-input.ts @@ -138,6 +138,14 @@ export interface UpdateCodeGenInput { */ treeName?: string | null; + /** + * 树控件key + * + * @type {string} + * @memberof UpdateCodeGenInput + */ + treeKey?: string | null; + /** * 功能名（数据库表名称） * @@ -322,6 +330,14 @@ export interface UpdateCodeGenInput { */ template?: string | null; + /** + * 表类型 + * + * @type {string} + * @memberof UpdateCodeGenInput + */ + tabType?: string | null; + /** * 代码生成器Id *