Bladeren bron

更新前端接口文件

zuohuaijun 3 jaren geleden
bovenliggende
commit
427de1df6c
34 gewijzigde bestanden met toevoegingen van 401 en 395 verwijderingen
  1. 8 0
      Admin.NET/Admin.NET.Application/Configuration/Database.json
  2. 1 1
      Admin.NET/Admin.NET.Core/Extension/ObjectExtension.cs
  3. 0 2
      Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs
  4. 3 3
      Web/src/api-services/api.ts
  5. 56 56
      Web/src/api-services/apis/sys-wechat-api.ts
  6. 95 95
      Web/src/api-services/apis/sys-wechat-pay-api.ts
  7. 60 60
      Web/src/api-services/apis/sys-wechat-user-api.ts
  8. 1 1
      Web/src/api-services/models/add-job-detail-input.ts
  9. 1 1
      Web/src/api-services/models/add-job-trigger-input.ts
  10. 2 2
      Web/src/api-services/models/add-notice-input.ts
  11. 11 11
      Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-wechat-user.ts
  12. 11 11
      Web/src/api-services/models/admin-result-sys-wechat-pay.ts
  13. 11 11
      Web/src/api-services/models/admin-result-wechat-pay-output.ts
  14. 3 3
      Web/src/api-services/models/delete-wechat-user-input.ts
  15. 12 12
      Web/src/api-services/models/index.ts
  16. 12 12
      Web/src/api-services/models/sql-sugar-paged-list-sys-wechat-user.ts
  17. 2 2
      Web/src/api-services/models/sys-job-cluster.ts
  18. 2 2
      Web/src/api-services/models/sys-job-detail.ts
  19. 3 3
      Web/src/api-services/models/sys-job-trigger.ts
  20. 1 1
      Web/src/api-services/models/sys-notice-user.ts
  21. 2 2
      Web/src/api-services/models/sys-notice.ts
  22. 1 1
      Web/src/api-services/models/sys-online-user.ts
  23. 40 40
      Web/src/api-services/models/sys-wechat-pay.ts
  24. 26 26
      Web/src/api-services/models/sys-wechat-user.ts
  25. 1 1
      Web/src/api-services/models/update-job-detail-input.ts
  26. 1 1
      Web/src/api-services/models/update-job-trigger-input.ts
  27. 2 2
      Web/src/api-services/models/update-notice-input.ts
  28. 3 3
      Web/src/api-services/models/wechat-oauth2-input.ts
  29. 6 6
      Web/src/api-services/models/wechat-pay-output.ts
  30. 3 3
      Web/src/api-services/models/wechat-pay-para-input.ts
  31. 7 7
      Web/src/api-services/models/wechat-pay-transaction-input.ts
  32. 3 3
      Web/src/api-services/models/wechat-user-login.ts
  33. 5 5
      Web/src/views/system/weChatUser/component/editWeChatUser.vue
  34. 6 6
      Web/src/views/system/weChatUser/index.vue

+ 8 - 0
Admin.NET/Admin.NET.Application/Configuration/Database.json

@@ -10,6 +10,14 @@
                 "EnableInitDb": true, // 启用库表初始化
                 "EnableDiffLog": false, // 启用库表差异日志
                 "EnableUnderLine": true // 启用驼峰转下划线
+            },
+            {
+                "ConfigId": "test",
+                "DbType": "Sqlite",
+                "ConnectionString": "DataSource=./test.db",
+                "EnableInitDb": true, // 启用库表初始化
+                "EnableDiffLog": false, // 启用库表差异日志
+                "EnableUnderLine": true // 启用驼峰转下划线
             }
         ]
     }

+ 1 - 1
Admin.NET/Admin.NET.Core/Extension/ObjectExtension.cs

@@ -64,7 +64,7 @@ public static partial class ObjectExtension
         DataTable result = new();
         if (list.Count > 0)
         {
-            // result.TableName = list[0].GetType().Name; // 表名赋值          
+            // result.TableName = list[0].GetType().Name; // 表名赋值
             PropertyInfo[] propertys = list[0].GetType().GetProperties();
             foreach (PropertyInfo pi in propertys)
             {

+ 0 - 2
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -1,5 +1,3 @@
-using System.Linq;
-
 namespace Admin.NET.Core.Service;
 
 /// <summary>

+ 3 - 3
Web/src/api-services/api.ts

@@ -36,7 +36,7 @@ export * from './apis/sys-role-api';
 export * from './apis/sys-server-api';
 export * from './apis/sys-tenant-api';
 export * from './apis/sys-user-api';
-export * from './apis/we-chat-api';
-export * from './apis/we-chat-pay-api';
-export * from './apis/we-chat-user-api';
+export * from './apis/sys-wechat-api';
+export * from './apis/sys-wechat-pay-api';
+export * from './apis/sys-wechat-user-api';
 

+ 56 - 56
Web/src/api-services/apis/we-chat-api.ts → Web/src/api-services/apis/sys-wechat-api.ts

@@ -20,13 +20,13 @@ import { AdminResultObject } from '../models';
 import { AdminResultString } from '../models';
 import { GenAuthUrlInput } from '../models';
 import { SignatureInput } from '../models';
-import { WeChatOAuth2Input } from '../models';
-import { WeChatUserLogin } from '../models';
+import { WechatOAuth2Input } from '../models';
+import { WechatUserLogin } from '../models';
 /**
- * WeChatApi - axios parameter creator
+ * SysWechatApi - axios parameter creator
  * @export
  */
-export const WeChatApiAxiosParamCreator = function (configuration?: Configuration) {
+export const SysWechatApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
         /**
          * 
@@ -35,8 +35,8 @@ export const WeChatApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        weChatGenAuthUrlPost: async (body?: GenAuthUrlInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/weChat/genAuthUrl`;
+        sysWechatGenAuthUrlPost: async (body?: GenAuthUrlInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechat/genAuthUrl`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -76,8 +76,8 @@ export const WeChatApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        weChatGenConfigParaPost: async (body?: SignatureInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/weChat/genConfigPara`;
+        sysWechatGenConfigParaPost: async (body?: SignatureInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechat/genConfigPara`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -113,12 +113,12 @@ export const WeChatApiAxiosParamCreator = function (configuration?: Configuratio
         /**
          * 
          * @summary 微信用户登录
-         * @param {WeChatUserLogin} [body] 
+         * @param {WechatUserLogin} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        weChatOpenIdLoginPost: async (body?: WeChatUserLogin, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/weChat/openIdLogin`;
+        sysWechatOpenIdLoginPost: async (body?: WechatUserLogin, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechat/openIdLogin`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -154,16 +154,16 @@ export const WeChatApiAxiosParamCreator = function (configuration?: Configuratio
         /**
          * 
          * @summary 授权登录(Code换取OpenId)
-         * @param {WeChatOAuth2Input} body 
+         * @param {WechatOAuth2Input} body 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        weChatSnsOAuth2Post: async (body: WeChatOAuth2Input, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        sysWechatSnsOAuth2Post: async (body: WechatOAuth2Input, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'body' is not null or undefined
             if (body === null || body === undefined) {
-                throw new RequiredError('body','Required parameter body was null or undefined when calling weChatSnsOAuth2Post.');
+                throw new RequiredError('body','Required parameter body was null or undefined when calling sysWechatSnsOAuth2Post.');
             }
-            const localVarPath = `/weChat/snsOAuth2`;
+            const localVarPath = `/sysWechat/snsOAuth2`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -200,10 +200,10 @@ export const WeChatApiAxiosParamCreator = function (configuration?: Configuratio
 };
 
 /**
- * WeChatApi - functional programming interface
+ * SysWechatApi - functional programming interface
  * @export
  */
-export const WeChatApiFp = function(configuration?: Configuration) {
+export const SysWechatApiFp = function(configuration?: Configuration) {
     return {
         /**
          * 
@@ -212,8 +212,8 @@ export const WeChatApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatGenAuthUrlPost(body?: GenAuthUrlInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultString>>> {
-            const localVarAxiosArgs = await WeChatApiAxiosParamCreator(configuration).weChatGenAuthUrlPost(body, options);
+        async sysWechatGenAuthUrlPost(body?: GenAuthUrlInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultString>>> {
+            const localVarAxiosArgs = await SysWechatApiAxiosParamCreator(configuration).sysWechatGenAuthUrlPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -226,8 +226,8 @@ export const WeChatApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatGenConfigParaPost(body?: SignatureInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
-            const localVarAxiosArgs = await WeChatApiAxiosParamCreator(configuration).weChatGenConfigParaPost(body, options);
+        async sysWechatGenConfigParaPost(body?: SignatureInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
+            const localVarAxiosArgs = await SysWechatApiAxiosParamCreator(configuration).sysWechatGenConfigParaPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -236,12 +236,12 @@ export const WeChatApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary 微信用户登录
-         * @param {WeChatUserLogin} [body] 
+         * @param {WechatUserLogin} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatOpenIdLoginPost(body?: WeChatUserLogin, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
-            const localVarAxiosArgs = await WeChatApiAxiosParamCreator(configuration).weChatOpenIdLoginPost(body, options);
+        async sysWechatOpenIdLoginPost(body?: WechatUserLogin, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
+            const localVarAxiosArgs = await SysWechatApiAxiosParamCreator(configuration).sysWechatOpenIdLoginPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -250,12 +250,12 @@ export const WeChatApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary 授权登录(Code换取OpenId)
-         * @param {WeChatOAuth2Input} body 
+         * @param {WechatOAuth2Input} body 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatSnsOAuth2Post(body: WeChatOAuth2Input, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultString>>> {
-            const localVarAxiosArgs = await WeChatApiAxiosParamCreator(configuration).weChatSnsOAuth2Post(body, options);
+        async sysWechatSnsOAuth2Post(body: WechatOAuth2Input, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultString>>> {
+            const localVarAxiosArgs = await SysWechatApiAxiosParamCreator(configuration).sysWechatSnsOAuth2Post(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -265,10 +265,10 @@ export const WeChatApiFp = function(configuration?: Configuration) {
 };
 
 /**
- * WeChatApi - factory interface
+ * SysWechatApi - factory interface
  * @export
  */
-export const WeChatApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
+export const SysWechatApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     return {
         /**
          * 
@@ -277,8 +277,8 @@ export const WeChatApiFactory = function (configuration?: Configuration, basePat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatGenAuthUrlPost(body?: GenAuthUrlInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultString>> {
-            return WeChatApiFp(configuration).weChatGenAuthUrlPost(body, options).then((request) => request(axios, basePath));
+        async sysWechatGenAuthUrlPost(body?: GenAuthUrlInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultString>> {
+            return SysWechatApiFp(configuration).sysWechatGenAuthUrlPost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -287,49 +287,49 @@ export const WeChatApiFactory = function (configuration?: Configuration, basePat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatGenConfigParaPost(body?: SignatureInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
-            return WeChatApiFp(configuration).weChatGenConfigParaPost(body, options).then((request) => request(axios, basePath));
+        async sysWechatGenConfigParaPost(body?: SignatureInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
+            return SysWechatApiFp(configuration).sysWechatGenConfigParaPost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary 微信用户登录
-         * @param {WeChatUserLogin} [body] 
+         * @param {WechatUserLogin} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatOpenIdLoginPost(body?: WeChatUserLogin, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
-            return WeChatApiFp(configuration).weChatOpenIdLoginPost(body, options).then((request) => request(axios, basePath));
+        async sysWechatOpenIdLoginPost(body?: WechatUserLogin, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
+            return SysWechatApiFp(configuration).sysWechatOpenIdLoginPost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary 授权登录(Code换取OpenId)
-         * @param {WeChatOAuth2Input} body 
+         * @param {WechatOAuth2Input} body 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatSnsOAuth2Post(body: WeChatOAuth2Input, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultString>> {
-            return WeChatApiFp(configuration).weChatSnsOAuth2Post(body, options).then((request) => request(axios, basePath));
+        async sysWechatSnsOAuth2Post(body: WechatOAuth2Input, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultString>> {
+            return SysWechatApiFp(configuration).sysWechatSnsOAuth2Post(body, options).then((request) => request(axios, basePath));
         },
     };
 };
 
 /**
- * WeChatApi - object-oriented interface
+ * SysWechatApi - object-oriented interface
  * @export
- * @class WeChatApi
+ * @class SysWechatApi
  * @extends {BaseAPI}
  */
-export class WeChatApi extends BaseAPI {
+export class SysWechatApi extends BaseAPI {
     /**
      * 
      * @summary 生成网页授权Url
      * @param {GenAuthUrlInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatApi
+     * @memberof SysWechatApi
      */
-    public async weChatGenAuthUrlPost(body?: GenAuthUrlInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultString>> {
-        return WeChatApiFp(this.configuration).weChatGenAuthUrlPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatGenAuthUrlPost(body?: GenAuthUrlInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultString>> {
+        return SysWechatApiFp(this.configuration).sysWechatGenAuthUrlPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -337,31 +337,31 @@ export class WeChatApi extends BaseAPI {
      * @param {SignatureInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatApi
+     * @memberof SysWechatApi
      */
-    public async weChatGenConfigParaPost(body?: SignatureInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
-        return WeChatApiFp(this.configuration).weChatGenConfigParaPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatGenConfigParaPost(body?: SignatureInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
+        return SysWechatApiFp(this.configuration).sysWechatGenConfigParaPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
      * @summary 微信用户登录
-     * @param {WeChatUserLogin} [body] 
+     * @param {WechatUserLogin} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatApi
+     * @memberof SysWechatApi
      */
-    public async weChatOpenIdLoginPost(body?: WeChatUserLogin, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
-        return WeChatApiFp(this.configuration).weChatOpenIdLoginPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatOpenIdLoginPost(body?: WechatUserLogin, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
+        return SysWechatApiFp(this.configuration).sysWechatOpenIdLoginPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
      * @summary 授权登录(Code换取OpenId)
-     * @param {WeChatOAuth2Input} body 
+     * @param {WechatOAuth2Input} body 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatApi
+     * @memberof SysWechatApi
      */
-    public async weChatSnsOAuth2Post(body: WeChatOAuth2Input, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultString>> {
-        return WeChatApiFp(this.configuration).weChatSnsOAuth2Post(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatSnsOAuth2Post(body: WechatOAuth2Input, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultString>> {
+        return SysWechatApiFp(this.configuration).sysWechatSnsOAuth2Post(body, options).then((request) => request(this.axios, this.basePath));
     }
 }

+ 95 - 95
Web/src/api-services/apis/we-chat-pay-api.ts → Web/src/api-services/apis/sys-wechat-pay-api.ts

@@ -17,24 +17,25 @@ import { Configuration } from '../configuration';
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
 import { AdminResultObject } from '../models';
-import { AdminResultWeChatPay } from '../models';
-import { AdminResultWeChatPayOutput } from '../models';
-import { WeChatPayParaInput } from '../models';
-import { WeChatPayTransactionInput } from '../models';
+import { AdminResultSysWechatPay } from '../models';
+import { AdminResultWechatPayOutput } from '../models';
+import { WechatPayParaInput } from '../models';
+import { WechatPayTransactionInput } from '../models';
 /**
- * WeChatPayApi - axios parameter creator
+ * SysWechatPayApi - axios parameter creator
  * @export
  */
-export const WeChatPayApiAxiosParamCreator = function (configuration?: Configuration) {
+export const SysWechatPayApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
         /**
          * 
-         * @summary 微信支付成功回调(商户直连)
+         * @summary 生成JSAPI调起支付所需参数
+         * @param {WechatPayParaInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        notifyWeChatPayPayCallBackPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/notify/weChatPay/payCallBack`;
+        sysWechatPayGenPayParaPost: async (body?: WechatPayParaInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechatPay/genPayPara`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -47,6 +48,8 @@ export const WeChatPayApiAxiosParamCreator = function (configuration?: Configura
 
             // 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]);
@@ -57,6 +60,8 @@ export const WeChatPayApiAxiosParamCreator = function (configuration?: Configura
             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,
@@ -65,12 +70,12 @@ export const WeChatPayApiAxiosParamCreator = function (configuration?: Configura
         },
         /**
          * 
-         * @summary 微信支付成功回调(服务商模式)
+         * @summary 微信支付成功回调(商户直连)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        notifyWeChatPayPayPartnerCallbackPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/notify/weChatPay/payPartnerCallback`;
+        sysWechatPayNotifyPayCallBackPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechatPay/notify/payCallBack`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -101,13 +106,12 @@ export const WeChatPayApiAxiosParamCreator = function (configuration?: Configura
         },
         /**
          * 
-         * @summary 生成JSAPI调起支付所需参数
-         * @param {WeChatPayParaInput} [body] 
+         * @summary 微信支付成功回调(服务商模式)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        weChatPayGenPayParaPost: async (body?: WeChatPayParaInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/weChatPay/genPayPara`;
+        sysWechatPayNotifyPayPartnerCallbackPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechatPay/notify/payPartnerCallback`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -120,8 +124,6 @@ export const WeChatPayApiAxiosParamCreator = function (configuration?: Configura
 
             // 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]);
@@ -132,8 +134,6 @@ export const WeChatPayApiAxiosParamCreator = function (configuration?: Configura
             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,
@@ -147,8 +147,8 @@ export const WeChatPayApiAxiosParamCreator = function (configuration?: Configura
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        weChatPayPayInfoGet: async (tradeId?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/weChatPay/payInfo`;
+        sysWechatPayPayInfoGet: async (tradeId?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechatPay/payInfo`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -184,12 +184,12 @@ export const WeChatPayApiAxiosParamCreator = function (configuration?: Configura
         /**
          * 
          * @summary 微信支付统一下单获取Id(服务商模式)
-         * @param {WeChatPayTransactionInput} [body] 
+         * @param {WechatPayTransactionInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        weChatPayPayPartnerTransactionPost: async (body?: WeChatPayTransactionInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/weChatPay/payPartnerTransaction`;
+        sysWechatPayPayPartnerTransactionPost: async (body?: WechatPayTransactionInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechatPay/payPartnerTransaction`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -225,12 +225,12 @@ export const WeChatPayApiAxiosParamCreator = function (configuration?: Configura
         /**
          * 
          * @summary 微信支付统一下单获取Id(商户直连)
-         * @param {WeChatPayTransactionInput} [body] 
+         * @param {WechatPayTransactionInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        weChatPayPayTransactionPost: async (body?: WeChatPayTransactionInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/weChatPay/payTransaction`;
+        sysWechatPayPayTransactionPost: async (body?: WechatPayTransactionInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechatPay/payTransaction`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -267,19 +267,20 @@ export const WeChatPayApiAxiosParamCreator = function (configuration?: Configura
 };
 
 /**
- * WeChatPayApi - functional programming interface
+ * SysWechatPayApi - functional programming interface
  * @export
  */
-export const WeChatPayApiFp = function(configuration?: Configuration) {
+export const SysWechatPayApiFp = function(configuration?: Configuration) {
     return {
         /**
          * 
-         * @summary 微信支付成功回调(商户直连)
+         * @summary 生成JSAPI调起支付所需参数
+         * @param {WechatPayParaInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async notifyWeChatPayPayCallBackPost(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultWeChatPayOutput>>> {
-            const localVarAxiosArgs = await WeChatPayApiAxiosParamCreator(configuration).notifyWeChatPayPayCallBackPost(options);
+        async sysWechatPayGenPayParaPost(body?: WechatPayParaInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
+            const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).sysWechatPayGenPayParaPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -287,12 +288,12 @@ export const WeChatPayApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 微信支付成功回调(服务商模式)
+         * @summary 微信支付成功回调(商户直连)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async notifyWeChatPayPayPartnerCallbackPost(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await WeChatPayApiAxiosParamCreator(configuration).notifyWeChatPayPayPartnerCallbackPost(options);
+        async sysWechatPayNotifyPayCallBackPost(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultWechatPayOutput>>> {
+            const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).sysWechatPayNotifyPayCallBackPost(options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -300,13 +301,12 @@ export const WeChatPayApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 生成JSAPI调起支付所需参数
-         * @param {WeChatPayParaInput} [body] 
+         * @summary 微信支付成功回调(服务商模式)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatPayGenPayParaPost(body?: WeChatPayParaInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
-            const localVarAxiosArgs = await WeChatPayApiAxiosParamCreator(configuration).weChatPayGenPayParaPost(body, options);
+        async sysWechatPayNotifyPayPartnerCallbackPost(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).sysWechatPayNotifyPayPartnerCallbackPost(options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -319,8 +319,8 @@ export const WeChatPayApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatPayPayInfoGet(tradeId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultWeChatPay>>> {
-            const localVarAxiosArgs = await WeChatPayApiAxiosParamCreator(configuration).weChatPayPayInfoGet(tradeId, options);
+        async sysWechatPayPayInfoGet(tradeId?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysWechatPay>>> {
+            const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).sysWechatPayPayInfoGet(tradeId, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -329,12 +329,12 @@ export const WeChatPayApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary 微信支付统一下单获取Id(服务商模式)
-         * @param {WeChatPayTransactionInput} [body] 
+         * @param {WechatPayTransactionInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatPayPayPartnerTransactionPost(body?: WeChatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
-            const localVarAxiosArgs = await WeChatPayApiAxiosParamCreator(configuration).weChatPayPayPartnerTransactionPost(body, options);
+        async sysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
+            const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).sysWechatPayPayPartnerTransactionPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -343,12 +343,12 @@ export const WeChatPayApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary 微信支付统一下单获取Id(商户直连)
-         * @param {WeChatPayTransactionInput} [body] 
+         * @param {WechatPayTransactionInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatPayPayTransactionPost(body?: WeChatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
-            const localVarAxiosArgs = await WeChatPayApiAxiosParamCreator(configuration).weChatPayPayTransactionPost(body, options);
+        async sysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultObject>>> {
+            const localVarAxiosArgs = await SysWechatPayApiAxiosParamCreator(configuration).sysWechatPayPayTransactionPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -358,38 +358,38 @@ export const WeChatPayApiFp = function(configuration?: Configuration) {
 };
 
 /**
- * WeChatPayApi - factory interface
+ * SysWechatPayApi - factory interface
  * @export
  */
-export const WeChatPayApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
+export const SysWechatPayApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     return {
         /**
          * 
-         * @summary 微信支付成功回调(商户直连)
+         * @summary 生成JSAPI调起支付所需参数
+         * @param {WechatPayParaInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async notifyWeChatPayPayCallBackPost(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultWeChatPayOutput>> {
-            return WeChatPayApiFp(configuration).notifyWeChatPayPayCallBackPost(options).then((request) => request(axios, basePath));
+        async sysWechatPayGenPayParaPost(body?: WechatPayParaInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
+            return SysWechatPayApiFp(configuration).sysWechatPayGenPayParaPost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @summary 微信支付成功回调(服务商模式)
+         * @summary 微信支付成功回调(商户直连)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async notifyWeChatPayPayPartnerCallbackPost(options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return WeChatPayApiFp(configuration).notifyWeChatPayPayPartnerCallbackPost(options).then((request) => request(axios, basePath));
+        async sysWechatPayNotifyPayCallBackPost(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultWechatPayOutput>> {
+            return SysWechatPayApiFp(configuration).sysWechatPayNotifyPayCallBackPost(options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @summary 生成JSAPI调起支付所需参数
-         * @param {WeChatPayParaInput} [body] 
+         * @summary 微信支付成功回调(服务商模式)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatPayGenPayParaPost(body?: WeChatPayParaInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
-            return WeChatPayApiFp(configuration).weChatPayGenPayParaPost(body, options).then((request) => request(axios, basePath));
+        async sysWechatPayNotifyPayPartnerCallbackPost(options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysWechatPayApiFp(configuration).sysWechatPayNotifyPayPartnerCallbackPost(options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -398,69 +398,69 @@ export const WeChatPayApiFactory = function (configuration?: Configuration, base
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatPayPayInfoGet(tradeId?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultWeChatPay>> {
-            return WeChatPayApiFp(configuration).weChatPayPayInfoGet(tradeId, options).then((request) => request(axios, basePath));
+        async sysWechatPayPayInfoGet(tradeId?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysWechatPay>> {
+            return SysWechatPayApiFp(configuration).sysWechatPayPayInfoGet(tradeId, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary 微信支付统一下单获取Id(服务商模式)
-         * @param {WeChatPayTransactionInput} [body] 
+         * @param {WechatPayTransactionInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatPayPayPartnerTransactionPost(body?: WeChatPayTransactionInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
-            return WeChatPayApiFp(configuration).weChatPayPayPartnerTransactionPost(body, options).then((request) => request(axios, basePath));
+        async sysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
+            return SysWechatPayApiFp(configuration).sysWechatPayPayPartnerTransactionPost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary 微信支付统一下单获取Id(商户直连)
-         * @param {WeChatPayTransactionInput} [body] 
+         * @param {WechatPayTransactionInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatPayPayTransactionPost(body?: WeChatPayTransactionInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
-            return WeChatPayApiFp(configuration).weChatPayPayTransactionPost(body, options).then((request) => request(axios, basePath));
+        async sysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultObject>> {
+            return SysWechatPayApiFp(configuration).sysWechatPayPayTransactionPost(body, options).then((request) => request(axios, basePath));
         },
     };
 };
 
 /**
- * WeChatPayApi - object-oriented interface
+ * SysWechatPayApi - object-oriented interface
  * @export
- * @class WeChatPayApi
+ * @class SysWechatPayApi
  * @extends {BaseAPI}
  */
-export class WeChatPayApi extends BaseAPI {
+export class SysWechatPayApi extends BaseAPI {
     /**
      * 
-     * @summary 微信支付成功回调(商户直连)
+     * @summary 生成JSAPI调起支付所需参数
+     * @param {WechatPayParaInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatPayApi
+     * @memberof SysWechatPayApi
      */
-    public async notifyWeChatPayPayCallBackPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultWeChatPayOutput>> {
-        return WeChatPayApiFp(this.configuration).notifyWeChatPayPayCallBackPost(options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatPayGenPayParaPost(body?: WechatPayParaInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
+        return SysWechatPayApiFp(this.configuration).sysWechatPayGenPayParaPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 微信支付成功回调(服务商模式)
+     * @summary 微信支付成功回调(商户直连)
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatPayApi
+     * @memberof SysWechatPayApi
      */
-    public async notifyWeChatPayPayPartnerCallbackPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return WeChatPayApiFp(this.configuration).notifyWeChatPayPayPartnerCallbackPost(options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatPayNotifyPayCallBackPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultWechatPayOutput>> {
+        return SysWechatPayApiFp(this.configuration).sysWechatPayNotifyPayCallBackPost(options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 生成JSAPI调起支付所需参数
-     * @param {WeChatPayParaInput} [body] 
+     * @summary 微信支付成功回调(服务商模式)
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatPayApi
+     * @memberof SysWechatPayApi
      */
-    public async weChatPayGenPayParaPost(body?: WeChatPayParaInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
-        return WeChatPayApiFp(this.configuration).weChatPayGenPayParaPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatPayNotifyPayPartnerCallbackPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysWechatPayApiFp(this.configuration).sysWechatPayNotifyPayPartnerCallbackPost(options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -468,31 +468,31 @@ export class WeChatPayApi extends BaseAPI {
      * @param {string} [tradeId] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatPayApi
+     * @memberof SysWechatPayApi
      */
-    public async weChatPayPayInfoGet(tradeId?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultWeChatPay>> {
-        return WeChatPayApiFp(this.configuration).weChatPayPayInfoGet(tradeId, options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatPayPayInfoGet(tradeId?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysWechatPay>> {
+        return SysWechatPayApiFp(this.configuration).sysWechatPayPayInfoGet(tradeId, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
      * @summary 微信支付统一下单获取Id(服务商模式)
-     * @param {WeChatPayTransactionInput} [body] 
+     * @param {WechatPayTransactionInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatPayApi
+     * @memberof SysWechatPayApi
      */
-    public async weChatPayPayPartnerTransactionPost(body?: WeChatPayTransactionInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
-        return WeChatPayApiFp(this.configuration).weChatPayPayPartnerTransactionPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatPayPayPartnerTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
+        return SysWechatPayApiFp(this.configuration).sysWechatPayPayPartnerTransactionPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
      * @summary 微信支付统一下单获取Id(商户直连)
-     * @param {WeChatPayTransactionInput} [body] 
+     * @param {WechatPayTransactionInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatPayApi
+     * @memberof SysWechatPayApi
      */
-    public async weChatPayPayTransactionPost(body?: WeChatPayTransactionInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
-        return WeChatPayApiFp(this.configuration).weChatPayPayTransactionPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatPayPayTransactionPost(body?: WechatPayTransactionInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultObject>> {
+        return SysWechatPayApiFp(this.configuration).sysWechatPayPayTransactionPost(body, options).then((request) => request(this.axios, this.basePath));
     }
 }

+ 60 - 60
Web/src/api-services/apis/we-chat-user-api.ts → Web/src/api-services/apis/sys-wechat-user-api.ts

@@ -16,24 +16,24 @@ import { Configuration } from '../configuration';
 // Some imports not used depending on template conditions
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
-import { AdminResultSqlSugarPagedListWeChatUser } from '../models';
-import { DeleteWeChatUserInput } from '../models';
-import { WeChatUser } from '../models';
+import { AdminResultSqlSugarPagedListSysWechatUser } from '../models';
+import { DeleteWechatUserInput } from '../models';
+import { SysWechatUser } from '../models';
 /**
- * WeChatUserApi - axios parameter creator
+ * SysWechatUserApi - axios parameter creator
  * @export
  */
-export const WeChatUserApiAxiosParamCreator = function (configuration?: Configuration) {
+export const SysWechatUserApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
         /**
          * 
          * @summary 增加微信用户
-         * @param {WeChatUser} [body] 
+         * @param {SysWechatUser} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        weChatUserAddPost: async (body?: WeChatUser, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/weChatUser/add`;
+        sysWechatUserAddPost: async (body?: SysWechatUser, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechatUser/add`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -69,12 +69,12 @@ export const WeChatUserApiAxiosParamCreator = function (configuration?: Configur
         /**
          * 
          * @summary 删除微信用户
-         * @param {DeleteWeChatUserInput} [body] 
+         * @param {DeleteWechatUserInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        weChatUserDeletePost: async (body?: DeleteWeChatUserInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/weChatUser/delete`;
+        sysWechatUserDeletePost: async (body?: DeleteWechatUserInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechatUser/delete`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -120,8 +120,8 @@ export const WeChatUserApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        weChatUserPageGet: async (nickName?: string, mobile?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/weChatUser/page`;
+        sysWechatUserPageGet: async (nickName?: string, mobile?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechatUser/page`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -181,12 +181,12 @@ export const WeChatUserApiAxiosParamCreator = function (configuration?: Configur
         /**
          * 
          * @summary 更新微信用户
-         * @param {WeChatUser} [body] 
+         * @param {SysWechatUser} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        weChatUserUpdatePost: async (body?: WeChatUser, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/weChatUser/update`;
+        sysWechatUserUpdatePost: async (body?: SysWechatUser, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/sysWechatUser/update`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -223,20 +223,20 @@ export const WeChatUserApiAxiosParamCreator = function (configuration?: Configur
 };
 
 /**
- * WeChatUserApi - functional programming interface
+ * SysWechatUserApi - functional programming interface
  * @export
  */
-export const WeChatUserApiFp = function(configuration?: Configuration) {
+export const SysWechatUserApiFp = function(configuration?: Configuration) {
     return {
         /**
          * 
          * @summary 增加微信用户
-         * @param {WeChatUser} [body] 
+         * @param {SysWechatUser} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatUserAddPost(body?: WeChatUser, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await WeChatUserApiAxiosParamCreator(configuration).weChatUserAddPost(body, options);
+        async sysWechatUserAddPost(body?: SysWechatUser, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysWechatUserApiAxiosParamCreator(configuration).sysWechatUserAddPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -245,12 +245,12 @@ export const WeChatUserApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary 删除微信用户
-         * @param {DeleteWeChatUserInput} [body] 
+         * @param {DeleteWechatUserInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatUserDeletePost(body?: DeleteWeChatUserInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await WeChatUserApiAxiosParamCreator(configuration).weChatUserDeletePost(body, options);
+        async sysWechatUserDeletePost(body?: DeleteWechatUserInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysWechatUserApiAxiosParamCreator(configuration).sysWechatUserDeletePost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -269,8 +269,8 @@ export const WeChatUserApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatUserPageGet(nickName?: string, mobile?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSqlSugarPagedListWeChatUser>>> {
-            const localVarAxiosArgs = await WeChatUserApiAxiosParamCreator(configuration).weChatUserPageGet(nickName, mobile, page, pageSize, field, order, descStr, options);
+        async sysWechatUserPageGet(nickName?: string, mobile?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSqlSugarPagedListSysWechatUser>>> {
+            const localVarAxiosArgs = await SysWechatUserApiAxiosParamCreator(configuration).sysWechatUserPageGet(nickName, mobile, page, pageSize, field, order, descStr, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -279,12 +279,12 @@ export const WeChatUserApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary 更新微信用户
-         * @param {WeChatUser} [body] 
+         * @param {SysWechatUser} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatUserUpdatePost(body?: WeChatUser, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await WeChatUserApiAxiosParamCreator(configuration).weChatUserUpdatePost(body, options);
+        async sysWechatUserUpdatePost(body?: SysWechatUser, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysWechatUserApiAxiosParamCreator(configuration).sysWechatUserUpdatePost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -294,30 +294,30 @@ export const WeChatUserApiFp = function(configuration?: Configuration) {
 };
 
 /**
- * WeChatUserApi - factory interface
+ * SysWechatUserApi - factory interface
  * @export
  */
-export const WeChatUserApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
+export const SysWechatUserApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     return {
         /**
          * 
          * @summary 增加微信用户
-         * @param {WeChatUser} [body] 
+         * @param {SysWechatUser} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatUserAddPost(body?: WeChatUser, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return WeChatUserApiFp(configuration).weChatUserAddPost(body, options).then((request) => request(axios, basePath));
+        async sysWechatUserAddPost(body?: SysWechatUser, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysWechatUserApiFp(configuration).sysWechatUserAddPost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary 删除微信用户
-         * @param {DeleteWeChatUserInput} [body] 
+         * @param {DeleteWechatUserInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatUserDeletePost(body?: DeleteWeChatUserInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return WeChatUserApiFp(configuration).weChatUserDeletePost(body, options).then((request) => request(axios, basePath));
+        async sysWechatUserDeletePost(body?: DeleteWechatUserInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysWechatUserApiFp(configuration).sysWechatUserDeletePost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -332,50 +332,50 @@ export const WeChatUserApiFactory = function (configuration?: Configuration, bas
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatUserPageGet(nickName?: string, mobile?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSqlSugarPagedListWeChatUser>> {
-            return WeChatUserApiFp(configuration).weChatUserPageGet(nickName, mobile, page, pageSize, field, order, descStr, options).then((request) => request(axios, basePath));
+        async sysWechatUserPageGet(nickName?: string, mobile?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSqlSugarPagedListSysWechatUser>> {
+            return SysWechatUserApiFp(configuration).sysWechatUserPageGet(nickName, mobile, page, pageSize, field, order, descStr, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary 更新微信用户
-         * @param {WeChatUser} [body] 
+         * @param {SysWechatUser} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async weChatUserUpdatePost(body?: WeChatUser, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return WeChatUserApiFp(configuration).weChatUserUpdatePost(body, options).then((request) => request(axios, basePath));
+        async sysWechatUserUpdatePost(body?: SysWechatUser, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysWechatUserApiFp(configuration).sysWechatUserUpdatePost(body, options).then((request) => request(axios, basePath));
         },
     };
 };
 
 /**
- * WeChatUserApi - object-oriented interface
+ * SysWechatUserApi - object-oriented interface
  * @export
- * @class WeChatUserApi
+ * @class SysWechatUserApi
  * @extends {BaseAPI}
  */
-export class WeChatUserApi extends BaseAPI {
+export class SysWechatUserApi extends BaseAPI {
     /**
      * 
      * @summary 增加微信用户
-     * @param {WeChatUser} [body] 
+     * @param {SysWechatUser} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatUserApi
+     * @memberof SysWechatUserApi
      */
-    public async weChatUserAddPost(body?: WeChatUser, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return WeChatUserApiFp(this.configuration).weChatUserAddPost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatUserAddPost(body?: SysWechatUser, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysWechatUserApiFp(this.configuration).sysWechatUserAddPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
      * @summary 删除微信用户
-     * @param {DeleteWeChatUserInput} [body] 
+     * @param {DeleteWechatUserInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatUserApi
+     * @memberof SysWechatUserApi
      */
-    public async weChatUserDeletePost(body?: DeleteWeChatUserInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return WeChatUserApiFp(this.configuration).weChatUserDeletePost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatUserDeletePost(body?: DeleteWechatUserInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysWechatUserApiFp(this.configuration).sysWechatUserDeletePost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -389,20 +389,20 @@ export class WeChatUserApi extends BaseAPI {
      * @param {string} [descStr] 降序排序
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatUserApi
+     * @memberof SysWechatUserApi
      */
-    public async weChatUserPageGet(nickName?: string, mobile?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSqlSugarPagedListWeChatUser>> {
-        return WeChatUserApiFp(this.configuration).weChatUserPageGet(nickName, mobile, page, pageSize, field, order, descStr, options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatUserPageGet(nickName?: string, mobile?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSqlSugarPagedListSysWechatUser>> {
+        return SysWechatUserApiFp(this.configuration).sysWechatUserPageGet(nickName, mobile, page, pageSize, field, order, descStr, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
      * @summary 更新微信用户
-     * @param {WeChatUser} [body] 
+     * @param {SysWechatUser} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof WeChatUserApi
+     * @memberof SysWechatUserApi
      */
-    public async weChatUserUpdatePost(body?: WeChatUser, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return WeChatUserApiFp(this.configuration).weChatUserUpdatePost(body, options).then((request) => request(this.axios, this.basePath));
+    public async sysWechatUserUpdatePost(body?: SysWechatUser, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysWechatUserApiFp(this.configuration).sysWechatUserUpdatePost(body, options).then((request) => request(this.axios, this.basePath));
     }
 }

+ 1 - 1
Web/src/api-services/models/add-job-detail-input.ts

@@ -18,7 +18,7 @@
  */
 export interface AddJobDetailInput {
     /**
-     * Id
+     * 雪花Id
      * @type {number}
      * @memberof AddJobDetailInput
      */

+ 1 - 1
Web/src/api-services/models/add-job-trigger-input.ts

@@ -19,7 +19,7 @@ import { TriggerStatus } from './trigger-status';
  */
 export interface AddJobTriggerInput {
     /**
-     * Id
+     * 雪花Id
      * @type {number}
      * @memberof AddJobTriggerInput
      */

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

@@ -102,13 +102,13 @@ export interface AddNoticeInput {
      * @type {Date}
      * @memberof AddNoticeInput
      */
-    publicTime?: Date;
+    publicTime?: Date | null;
     /**
      * 撤回时间
      * @type {Date}
      * @memberof AddNoticeInput
      */
-    cancelTime?: Date;
+    cancelTime?: Date | null;
     /**
      * 
      * @type {NoticeStatusEnum}

+ 11 - 11
Web/src/api-services/models/admin-result-sql-sugar-paged-list-we-chat-user.ts → Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-wechat-user.ts

@@ -11,47 +11,47 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { SqlSugarPagedListWeChatUser } from './sql-sugar-paged-list-we-chat-user';
+import { SqlSugarPagedListSysWechatUser } from './sql-sugar-paged-list-sys-wechat-user';
 /**
  * 全局返回结果
  * @export
- * @interface AdminResultSqlSugarPagedListWeChatUser
+ * @interface AdminResultSqlSugarPagedListSysWechatUser
  */
-export interface AdminResultSqlSugarPagedListWeChatUser {
+export interface AdminResultSqlSugarPagedListSysWechatUser {
     /**
      * 状态码
      * @type {number}
-     * @memberof AdminResultSqlSugarPagedListWeChatUser
+     * @memberof AdminResultSqlSugarPagedListSysWechatUser
      */
     code?: number;
     /**
      * 类型success、warning、error
      * @type {string}
-     * @memberof AdminResultSqlSugarPagedListWeChatUser
+     * @memberof AdminResultSqlSugarPagedListSysWechatUser
      */
     type?: string | null;
     /**
      * 错误信息
      * @type {string}
-     * @memberof AdminResultSqlSugarPagedListWeChatUser
+     * @memberof AdminResultSqlSugarPagedListSysWechatUser
      */
     message?: string | null;
     /**
      * 
-     * @type {SqlSugarPagedListWeChatUser}
-     * @memberof AdminResultSqlSugarPagedListWeChatUser
+     * @type {SqlSugarPagedListSysWechatUser}
+     * @memberof AdminResultSqlSugarPagedListSysWechatUser
      */
-    result?: SqlSugarPagedListWeChatUser;
+    result?: SqlSugarPagedListSysWechatUser;
     /**
      * 附加数据
      * @type {any}
-     * @memberof AdminResultSqlSugarPagedListWeChatUser
+     * @memberof AdminResultSqlSugarPagedListSysWechatUser
      */
     extras?: any | null;
     /**
      * 时间
      * @type {Date}
-     * @memberof AdminResultSqlSugarPagedListWeChatUser
+     * @memberof AdminResultSqlSugarPagedListSysWechatUser
      */
     time?: Date;
 }

+ 11 - 11
Web/src/api-services/models/admin-result-we-chat-pay.ts → Web/src/api-services/models/admin-result-sys-wechat-pay.ts

@@ -11,47 +11,47 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { WeChatPay } from './we-chat-pay';
+import { SysWechatPay } from './sys-wechat-pay';
 /**
  * 全局返回结果
  * @export
- * @interface AdminResultWeChatPay
+ * @interface AdminResultSysWechatPay
  */
-export interface AdminResultWeChatPay {
+export interface AdminResultSysWechatPay {
     /**
      * 状态码
      * @type {number}
-     * @memberof AdminResultWeChatPay
+     * @memberof AdminResultSysWechatPay
      */
     code?: number;
     /**
      * 类型success、warning、error
      * @type {string}
-     * @memberof AdminResultWeChatPay
+     * @memberof AdminResultSysWechatPay
      */
     type?: string | null;
     /**
      * 错误信息
      * @type {string}
-     * @memberof AdminResultWeChatPay
+     * @memberof AdminResultSysWechatPay
      */
     message?: string | null;
     /**
      * 
-     * @type {WeChatPay}
-     * @memberof AdminResultWeChatPay
+     * @type {SysWechatPay}
+     * @memberof AdminResultSysWechatPay
      */
-    result?: WeChatPay;
+    result?: SysWechatPay;
     /**
      * 附加数据
      * @type {any}
-     * @memberof AdminResultWeChatPay
+     * @memberof AdminResultSysWechatPay
      */
     extras?: any | null;
     /**
      * 时间
      * @type {Date}
-     * @memberof AdminResultWeChatPay
+     * @memberof AdminResultSysWechatPay
      */
     time?: Date;
 }

+ 11 - 11
Web/src/api-services/models/admin-result-we-chat-pay-output.ts → Web/src/api-services/models/admin-result-wechat-pay-output.ts

@@ -11,47 +11,47 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { WeChatPayOutput } from './we-chat-pay-output';
+import { WechatPayOutput } from './wechat-pay-output';
 /**
  * 全局返回结果
  * @export
- * @interface AdminResultWeChatPayOutput
+ * @interface AdminResultWechatPayOutput
  */
-export interface AdminResultWeChatPayOutput {
+export interface AdminResultWechatPayOutput {
     /**
      * 状态码
      * @type {number}
-     * @memberof AdminResultWeChatPayOutput
+     * @memberof AdminResultWechatPayOutput
      */
     code?: number;
     /**
      * 类型success、warning、error
      * @type {string}
-     * @memberof AdminResultWeChatPayOutput
+     * @memberof AdminResultWechatPayOutput
      */
     type?: string | null;
     /**
      * 错误信息
      * @type {string}
-     * @memberof AdminResultWeChatPayOutput
+     * @memberof AdminResultWechatPayOutput
      */
     message?: string | null;
     /**
      * 
-     * @type {WeChatPayOutput}
-     * @memberof AdminResultWeChatPayOutput
+     * @type {WechatPayOutput}
+     * @memberof AdminResultWechatPayOutput
      */
-    result?: WeChatPayOutput;
+    result?: WechatPayOutput;
     /**
      * 附加数据
      * @type {any}
-     * @memberof AdminResultWeChatPayOutput
+     * @memberof AdminResultWechatPayOutput
      */
     extras?: any | null;
     /**
      * 时间
      * @type {Date}
-     * @memberof AdminResultWeChatPayOutput
+     * @memberof AdminResultWechatPayOutput
      */
     time?: Date;
 }

+ 3 - 3
Web/src/api-services/models/delete-we-chat-user-input.ts → Web/src/api-services/models/delete-wechat-user-input.ts

@@ -14,13 +14,13 @@
 /**
  * 
  * @export
- * @interface DeleteWeChatUserInput
+ * @interface DeleteWechatUserInput
  */
-export interface DeleteWeChatUserInput {
+export interface DeleteWechatUserInput {
     /**
      * 主键Id
      * @type {number}
-     * @memberof DeleteWeChatUserInput
+     * @memberof DeleteWechatUserInput
      */
     id: number;
 }

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

@@ -61,8 +61,8 @@ export * from './admin-result-sql-sugar-paged-list-sys-online-user';
 export * from './admin-result-sql-sugar-paged-list-sys-region';
 export * from './admin-result-sql-sugar-paged-list-sys-role';
 export * from './admin-result-sql-sugar-paged-list-sys-user';
+export * from './admin-result-sql-sugar-paged-list-sys-wechat-user';
 export * from './admin-result-sql-sugar-paged-list-tenant-output';
-export * from './admin-result-sql-sugar-paged-list-we-chat-user';
 export * from './admin-result-string';
 export * from './admin-result-sys-code-gen';
 export * from './admin-result-sys-code-gen-config';
@@ -70,8 +70,8 @@ export * from './admin-result-sys-config';
 export * from './admin-result-sys-dict-data';
 export * from './admin-result-sys-dict-type';
 export * from './admin-result-sys-user';
-export * from './admin-result-we-chat-pay';
-export * from './admin-result-we-chat-pay-output';
+export * from './admin-result-sys-wechat-pay';
+export * from './admin-result-wechat-pay-output';
 export * from './card-type-enum';
 export * from './change-pwd-input';
 export * from './cluster-status';
@@ -105,7 +105,7 @@ export * from './delete-region-input';
 export * from './delete-role-input';
 export * from './delete-tenant-input';
 export * from './delete-user-input';
-export * from './delete-we-chat-user-input';
+export * from './delete-wechat-user-input';
 export * from './dict-data-input';
 export * from './dict-type-input';
 export * from './file-input';
@@ -152,8 +152,8 @@ export * from './sql-sugar-paged-list-sys-online-user';
 export * from './sql-sugar-paged-list-sys-region';
 export * from './sql-sugar-paged-list-sys-role';
 export * from './sql-sugar-paged-list-sys-user';
+export * from './sql-sugar-paged-list-sys-wechat-user';
 export * from './sql-sugar-paged-list-tenant-output';
-export * from './sql-sugar-paged-list-we-chat-user';
 export * from './status-enum';
 export * from './swagger-submit-url-body';
 export * from './sys-code-gen';
@@ -184,6 +184,8 @@ export * from './sys-region';
 export * from './sys-role';
 export * from './sys-user';
 export * from './sys-user-ext-org';
+export * from './sys-wechat-pay';
+export * from './sys-wechat-user';
 export * from './table-output';
 export * from './tenant-input';
 export * from './tenant-output';
@@ -209,11 +211,9 @@ export * from './update-tenant-input';
 export * from './update-user-input';
 export * from './user-input';
 export * from './user-role-input';
-export * from './we-chat-oauth2-input';
-export * from './we-chat-pay';
-export * from './we-chat-pay-output';
-export * from './we-chat-pay-para-input';
-export * from './we-chat-pay-transaction-input';
-export * from './we-chat-user';
-export * from './we-chat-user-login';
+export * from './wechat-oauth2-input';
+export * from './wechat-pay-output';
+export * from './wechat-pay-para-input';
+export * from './wechat-pay-transaction-input';
+export * from './wechat-user-login';
 export * from './yes-no-enum';

+ 12 - 12
Web/src/api-services/models/sql-sugar-paged-list-we-chat-user.ts → Web/src/api-services/models/sql-sugar-paged-list-sys-wechat-user.ts

@@ -11,53 +11,53 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { WeChatUser } from './we-chat-user';
+import { SysWechatUser } from './sys-wechat-user';
 /**
  * 分页泛型集合
  * @export
- * @interface SqlSugarPagedListWeChatUser
+ * @interface SqlSugarPagedListSysWechatUser
  */
-export interface SqlSugarPagedListWeChatUser {
+export interface SqlSugarPagedListSysWechatUser {
     /**
      * 页码
      * @type {number}
-     * @memberof SqlSugarPagedListWeChatUser
+     * @memberof SqlSugarPagedListSysWechatUser
      */
     page?: number;
     /**
      * 页容量
      * @type {number}
-     * @memberof SqlSugarPagedListWeChatUser
+     * @memberof SqlSugarPagedListSysWechatUser
      */
     pageSize?: number;
     /**
      * 总条数
      * @type {number}
-     * @memberof SqlSugarPagedListWeChatUser
+     * @memberof SqlSugarPagedListSysWechatUser
      */
     total?: number;
     /**
      * 总页数
      * @type {number}
-     * @memberof SqlSugarPagedListWeChatUser
+     * @memberof SqlSugarPagedListSysWechatUser
      */
     totalPages?: number;
     /**
      * 当前页集合
-     * @type {Array<WeChatUser>}
-     * @memberof SqlSugarPagedListWeChatUser
+     * @type {Array<SysWechatUser>}
+     * @memberof SqlSugarPagedListSysWechatUser
      */
-    items?: Array<WeChatUser> | null;
+    items?: Array<SysWechatUser> | null;
     /**
      * 是否有上一页
      * @type {boolean}
-     * @memberof SqlSugarPagedListWeChatUser
+     * @memberof SqlSugarPagedListSysWechatUser
      */
     hasPrevPage?: boolean;
     /**
      * 是否有下一页
      * @type {boolean}
-     * @memberof SqlSugarPagedListWeChatUser
+     * @memberof SqlSugarPagedListSysWechatUser
      */
     hasNextPage?: boolean;
 }

+ 2 - 2
Web/src/api-services/models/sys-job-cluster.ts

@@ -19,7 +19,7 @@ import { ClusterStatus } from './cluster-status';
  */
 export interface SysJobCluster {
     /**
-     * Id
+     * 雪花Id
      * @type {number}
      * @memberof SysJobCluster
      */
@@ -29,7 +29,7 @@ export interface SysJobCluster {
      * @type {string}
      * @memberof SysJobCluster
      */
-    clusterId?: string | null;
+    clusterId: string;
     /**
      * 描述信息
      * @type {string}

+ 2 - 2
Web/src/api-services/models/sys-job-detail.ts

@@ -18,7 +18,7 @@
  */
 export interface SysJobDetail {
     /**
-     * Id
+     * 雪花Id
      * @type {number}
      * @memberof SysJobDetail
      */
@@ -28,7 +28,7 @@ export interface SysJobDetail {
      * @type {string}
      * @memberof SysJobDetail
      */
-    jobId?: string | null;
+    jobId: string;
     /**
      * 组名称
      * @type {string}

+ 3 - 3
Web/src/api-services/models/sys-job-trigger.ts

@@ -19,7 +19,7 @@ import { TriggerStatus } from './trigger-status';
  */
 export interface SysJobTrigger {
     /**
-     * Id
+     * 雪花Id
      * @type {number}
      * @memberof SysJobTrigger
      */
@@ -29,13 +29,13 @@ export interface SysJobTrigger {
      * @type {string}
      * @memberof SysJobTrigger
      */
-    triggerId?: string | null;
+    triggerId: string;
     /**
      * 作业Id
      * @type {string}
      * @memberof SysJobTrigger
      */
-    jobId?: string | null;
+    jobId: string;
     /**
      * 触发器类型FullName
      * @type {string}

+ 1 - 1
Web/src/api-services/models/sys-notice-user.ts

@@ -42,7 +42,7 @@ export interface SysNoticeUser {
      * @type {Date}
      * @memberof SysNoticeUser
      */
-    readTime?: Date;
+    readTime?: Date | null;
     /**
      * 
      * @type {NoticeUserStatusEnum}

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

@@ -102,13 +102,13 @@ export interface SysNotice {
      * @type {Date}
      * @memberof SysNotice
      */
-    publicTime?: Date;
+    publicTime?: Date | null;
     /**
      * 撤回时间
      * @type {Date}
      * @memberof SysNotice
      */
-    cancelTime?: Date;
+    cancelTime?: Date | null;
     /**
      * 
      * @type {NoticeStatusEnum}

+ 1 - 1
Web/src/api-services/models/sys-online-user.ts

@@ -58,7 +58,7 @@ export interface SysOnlineUser {
      * @type {Date}
      * @memberof SysOnlineUser
      */
-    time?: Date;
+    time?: Date | null;
     /**
      * 连接IP
      * @type {string}

+ 40 - 40
Web/src/api-services/models/we-chat-pay.ts → Web/src/api-services/models/sys-wechat-pay.ts

@@ -11,191 +11,191 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { WeChatUser } from './we-chat-user';
+import { SysWechatUser } from './sys-wechat-user';
 /**
- * 微信支付表
+ * 系统微信支付表
  * @export
- * @interface WeChatPay
+ * @interface SysWechatPay
  */
-export interface WeChatPay {
+export interface SysWechatPay {
     /**
      * 雪花Id
      * @type {number}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     id?: number;
     /**
      * 创建时间
      * @type {Date}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     createTime?: Date | null;
     /**
      * 更新时间
      * @type {Date}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     updateTime?: Date | null;
     /**
      * 创建者Id
      * @type {number}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     createUserId?: number | null;
     /**
      * 修改者Id
      * @type {number}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     updateUserId?: number | null;
     /**
      * 软删除
      * @type {boolean}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     isDelete?: boolean;
     /**
      * 微信商户号
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
-    merchantId?: string | null;
+    merchantId: string;
     /**
      * 服务商AppId
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
-    appId?: string | null;
+    appId: string;
     /**
      * 商户订单号
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
-    outTradeNumber?: string | null;
+    outTradeNumber: string;
     /**
      * 支付订单号
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
-    transactionId?: string | null;
+    transactionId: string;
     /**
      * 交易类型
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     tradeType?: string | null;
     /**
      * 交易状态
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     tradeState?: string | null;
     /**
      * 交易状态描述
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     tradeStateDescription?: string | null;
     /**
      * 付款银行类型
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     bankType?: string | null;
     /**
      * 订单总金额
      * @type {number}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     total?: number;
     /**
      * 用户支付金额
      * @type {number}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     payerTotal?: number | null;
     /**
      * 支付完成时间
      * @type {Date}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     successTime?: Date | null;
     /**
      * 交易结束时间
      * @type {Date}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     expireTime?: Date | null;
     /**
      * 商品描述
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     description?: string | null;
     /**
      * 场景信息
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     scene?: string | null;
     /**
      * 附加数据
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     attachment?: string | null;
     /**
      * 优惠标记
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     goodsTag?: string | null;
     /**
      * 结算信息
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     settlement?: string | null;
     /**
      * 回调通知地址
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     notifyUrl?: string | null;
     /**
      * 备注
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     remark?: string | null;
     /**
      * 微信OpenId标识
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     openId?: string | null;
     /**
      * 
-     * @type {WeChatUser}
-     * @memberof WeChatPay
+     * @type {SysWechatUser}
+     * @memberof SysWechatPay
      */
-    weChatUser?: WeChatUser;
+    sysWechatUser?: SysWechatUser;
     /**
      * 子商户号
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     subMerchantId?: string | null;
     /**
      * 子商户AppId
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     subAppId?: string | null;
     /**
      * 子商户唯一标识
      * @type {string}
-     * @memberof WeChatPay
+     * @memberof SysWechatPay
      */
     subOpenId?: string | null;
 }

+ 26 - 26
Web/src/api-services/models/we-chat-user.ts → Web/src/api-services/models/sys-wechat-user.ts

@@ -14,147 +14,147 @@
 import { PlatformTypeEnum } from './platform-type-enum';
 import { SysUser } from './sys-user';
 /**
- * 微信用户表
+ * 系统微信用户表
  * @export
- * @interface WeChatUser
+ * @interface SysWechatUser
  */
-export interface WeChatUser {
+export interface SysWechatUser {
     /**
      * 雪花Id
      * @type {number}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     id?: number;
     /**
      * 创建时间
      * @type {Date}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     createTime?: Date | null;
     /**
      * 更新时间
      * @type {Date}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     updateTime?: Date | null;
     /**
      * 创建者Id
      * @type {number}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     createUserId?: number | null;
     /**
      * 修改者Id
      * @type {number}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     updateUserId?: number | null;
     /**
      * 软删除
      * @type {boolean}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     isDelete?: boolean;
     /**
      * 系统用户Id
      * @type {number}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     userId?: number;
     /**
      * 
      * @type {SysUser}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     sysUser?: SysUser;
     /**
      * 
      * @type {PlatformTypeEnum}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     platformType?: PlatformTypeEnum;
     /**
      * OpenId
      * @type {string}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     openId: string;
     /**
      * 缓存key
      * @type {string}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     sessionKey?: string | null;
     /**
      * UnionId
      * @type {string}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     unionId?: string | null;
     /**
      * 昵称
      * @type {string}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     nickName?: string | null;
     /**
      * 头像
      * @type {string}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     avatar?: string | null;
     /**
      * 手机号码
      * @type {string}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     mobile?: string | null;
     /**
      * 性别
      * @type {number}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     sex?: number | null;
     /**
      * 语言
      * @type {string}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     language?: string | null;
     /**
      * 城市
      * @type {string}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     city?: string | null;
     /**
      * 省
      * @type {string}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     province?: string | null;
     /**
      * 国家
      * @type {string}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     country?: string | null;
     /**
      * AccessToken
      * @type {string}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     accessToken?: string | null;
     /**
      * RefreshToken
      * @type {string}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     refreshToken?: string | null;
     /**
      * 过期时间
      * @type {number}
-     * @memberof WeChatUser
+     * @memberof SysWechatUser
      */
     expiresIn?: number | null;
 }

+ 1 - 1
Web/src/api-services/models/update-job-detail-input.ts

@@ -18,7 +18,7 @@
  */
 export interface UpdateJobDetailInput {
     /**
-     * Id
+     * 雪花Id
      * @type {number}
      * @memberof UpdateJobDetailInput
      */

+ 1 - 1
Web/src/api-services/models/update-job-trigger-input.ts

@@ -19,7 +19,7 @@ import { TriggerStatus } from './trigger-status';
  */
 export interface UpdateJobTriggerInput {
     /**
-     * Id
+     * 雪花Id
      * @type {number}
      * @memberof UpdateJobTriggerInput
      */

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

@@ -102,13 +102,13 @@ export interface UpdateNoticeInput {
      * @type {Date}
      * @memberof UpdateNoticeInput
      */
-    publicTime?: Date;
+    publicTime?: Date | null;
     /**
      * 撤回时间
      * @type {Date}
      * @memberof UpdateNoticeInput
      */
-    cancelTime?: Date;
+    cancelTime?: Date | null;
     /**
      * 
      * @type {NoticeStatusEnum}

+ 3 - 3
Web/src/api-services/models/we-chat-oauth2-input.ts → Web/src/api-services/models/wechat-oauth2-input.ts

@@ -14,13 +14,13 @@
 /**
  * 
  * @export
- * @interface WeChatOAuth2Input
+ * @interface WechatOAuth2Input
  */
-export interface WeChatOAuth2Input {
+export interface WechatOAuth2Input {
     /**
      * Code
      * @type {string}
-     * @memberof WeChatOAuth2Input
+     * @memberof WechatOAuth2Input
      */
     code: string;
 }

+ 6 - 6
Web/src/api-services/models/we-chat-pay-output.ts → Web/src/api-services/models/wechat-pay-output.ts

@@ -14,31 +14,31 @@
 /**
  * 
  * @export
- * @interface WeChatPayOutput
+ * @interface WechatPayOutput
  */
-export interface WeChatPayOutput {
+export interface WechatPayOutput {
     /**
      * OpenId
      * @type {string}
-     * @memberof WeChatPayOutput
+     * @memberof WechatPayOutput
      */
     openId?: string | null;
     /**
      * 订单金额
      * @type {number}
-     * @memberof WeChatPayOutput
+     * @memberof WechatPayOutput
      */
     total?: number;
     /**
      * 附加数据
      * @type {string}
-     * @memberof WeChatPayOutput
+     * @memberof WechatPayOutput
      */
     attachment?: string | null;
     /**
      * 优惠标记
      * @type {string}
-     * @memberof WeChatPayOutput
+     * @memberof WechatPayOutput
      */
     goodsTag?: string | null;
 }

+ 3 - 3
Web/src/api-services/models/we-chat-pay-para-input.ts → Web/src/api-services/models/wechat-pay-para-input.ts

@@ -14,13 +14,13 @@
 /**
  * 
  * @export
- * @interface WeChatPayParaInput
+ * @interface WechatPayParaInput
  */
-export interface WeChatPayParaInput {
+export interface WechatPayParaInput {
     /**
      * 订单Id
      * @type {string}
-     * @memberof WeChatPayParaInput
+     * @memberof WechatPayParaInput
      */
     prepayId?: string | null;
 }

+ 7 - 7
Web/src/api-services/models/we-chat-pay-transaction-input.ts → Web/src/api-services/models/wechat-pay-transaction-input.ts

@@ -14,37 +14,37 @@
 /**
  * 
  * @export
- * @interface WeChatPayTransactionInput
+ * @interface WechatPayTransactionInput
  */
-export interface WeChatPayTransactionInput {
+export interface WechatPayTransactionInput {
     /**
      * OpenId
      * @type {string}
-     * @memberof WeChatPayTransactionInput
+     * @memberof WechatPayTransactionInput
      */
     openId?: string | null;
     /**
      * 订单金额
      * @type {number}
-     * @memberof WeChatPayTransactionInput
+     * @memberof WechatPayTransactionInput
      */
     total?: number;
     /**
      * 商品描述
      * @type {string}
-     * @memberof WeChatPayTransactionInput
+     * @memberof WechatPayTransactionInput
      */
     description?: string | null;
     /**
      * 附加数据
      * @type {string}
-     * @memberof WeChatPayTransactionInput
+     * @memberof WechatPayTransactionInput
      */
     attachment?: string | null;
     /**
      * 优惠标记
      * @type {string}
-     * @memberof WeChatPayTransactionInput
+     * @memberof WechatPayTransactionInput
      */
     goodsTag?: string | null;
 }

+ 3 - 3
Web/src/api-services/models/we-chat-user-login.ts → Web/src/api-services/models/wechat-user-login.ts

@@ -14,13 +14,13 @@
 /**
  * 
  * @export
- * @interface WeChatUserLogin
+ * @interface WechatUserLogin
  */
-export interface WeChatUserLogin {
+export interface WechatUserLogin {
     /**
      * OpenId
      * @type {string}
-     * @memberof WeChatUserLogin
+     * @memberof WechatUserLogin
      */
     openId: string;
 }

+ 5 - 5
Web/src/views/system/weChatUser/component/editWeChatUser.vue

@@ -31,8 +31,8 @@ import { reactive, toRefs, defineComponent, ref } from 'vue';
 import mittBus from '/@/utils/mitt';
 
 import { getAPI } from '/@/utils/axios-utils';
-import { WeChatUserApi } from '/@/api-services/api';
-import { WeChatUser } from '/@/api-services/models';
+import { SysWechatUserApi } from '/@/api-services/api';
+import { SysWechatUser } from '/@/api-services/models';
 
 export default defineComponent({
 	name: 'sysEditWeChatUser',
@@ -47,7 +47,7 @@ export default defineComponent({
 		const ruleFormRef = ref();
 		const state = reactive({
 			isShowDialog: false,
-			ruleForm: {} as WeChatUser,
+			ruleForm: {} as SysWechatUser,
 		});
 		// 打开弹窗
 		const openDialog = (row: any) => {
@@ -68,9 +68,9 @@ export default defineComponent({
 			ruleFormRef.value.validate(async (valid: boolean) => {
 				if (!valid) return;
 				if (state.ruleForm.id != undefined && state.ruleForm.id > 0) {
-					await getAPI(WeChatUserApi).weChatUserUpdatePost(state.ruleForm);
+					await getAPI(SysWechatUserApi).sysWechatUserUpdatePost(state.ruleForm);
 				} else {
-					await getAPI(WeChatUserApi).weChatUserAddPost(state.ruleForm);
+					await getAPI(SysWechatUserApi).sysWechatUserAddPost(state.ruleForm);
 				}
 				closeDialog();
 			});

+ 6 - 6
Web/src/views/system/weChatUser/index.vue

@@ -33,7 +33,7 @@
 				<el-table-column prop="nickName" label="昵称" show-overflow-tooltip />
 				<el-table-column prop="avatar" label="头像" width="70" align="center">
 					<template #default="scope">
-						<el-avatar :src="scope.row.avatar" :size="24"  style="vertical-align: middle;"/>
+						<el-avatar :src="scope.row.avatar" :size="24" style="vertical-align: middle" />
 					</template>
 				</el-table-column>
 				<el-table-column prop="mobile" label="手机号码" show-overflow-tooltip />
@@ -76,8 +76,8 @@ import mittBus from '/@/utils/mitt';
 import EditWeChatUser from '/@/views/system/weChatUser/component/editWeChatUser.vue';
 
 import { getAPI } from '/@/utils/axios-utils';
-import { WeChatUserApi } from '/@/api-services/api';
-import { WeChatUser } from '/@/api-services/models';
+import { SysWechatUserApi } from '/@/api-services/api';
+import { SysWechatUser } from '/@/api-services/models';
 
 export default defineComponent({
 	name: 'weChatUser',
@@ -86,7 +86,7 @@ export default defineComponent({
 		const editWeChatUserRef = ref();
 		const state = reactive({
 			loading: false,
-			weChatUserData: [] as Array<WeChatUser>,
+			weChatUserData: [] as Array<SysWechatUser>,
 			queryParams: {
 				nickName: undefined,
 				mobile: undefined,
@@ -111,7 +111,7 @@ export default defineComponent({
 		// 查询操作
 		const handleQuery = async () => {
 			state.loading = true;
-			var res = await getAPI(WeChatUserApi).weChatUserPageGet(state.queryParams.nickName, state.queryParams.mobile, state.tableParams.page, state.tableParams.pageSize);
+			var res = await getAPI(SysWechatUserApi).sysWechatUserPageGet(state.queryParams.nickName, state.queryParams.mobile, state.tableParams.page, state.tableParams.pageSize);
 			state.weChatUserData = res.data.result?.items ?? [];
 			state.tableParams.total = res.data.result?.total;
 			state.loading = false;
@@ -135,7 +135,7 @@ export default defineComponent({
 				type: 'warning',
 			})
 				.then(async () => {
-					await getAPI(WeChatUserApi).weChatUserDeletePost({ id: row.id });
+					await getAPI(SysWechatUserApi).sysWechatUserDeletePost({ id: row.id });
 					handleQuery();
 					ElMessage.success('删除成功');
 				})