diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/controller-generator.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/controller-generator.js index 25c17d55..94e58bbe 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/controller-generator.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/controller-generator.js @@ -678,36 +678,39 @@ ${methodBody} /** * 智能映射Service参数到Controller参数源 + * + * ✅ 策略: + * - GET请求:所有参数从query获取(除了路径参数) + * - POST/PUT请求:DTO/Param从body获取 */ mapServiceParametersToController(serviceParams, method) { const controllerParams = []; + const httpMethod = method.httpMethod.toLowerCase(); + const isGetRequest = httpMethod === 'get'; + const isPostOrPut = httpMethod === 'post' || httpMethod === 'put'; for (const param of serviceParams) { const paramType = param.type; const paramName = param.name; - // 根据参数类型和位置决定参数来源 - if (this.isIdParameter(paramName, paramType)) { - // ID参数:从路径参数获取 + // ID参数:优先从路径参数获取 + if (this.isIdParameter(paramName, paramType) && method.path && method.path.includes(`{${paramName}}`)) { controllerParams.push(paramName); - } else if (this.isBodyParameter(paramType)) { - // DTO/Param/Body参数:从body获取 + } + // GET请求:所有非路径参数都从query获取 + else if (isGetRequest) { + controllerParams.push('query'); + } + // POST/PUT请求:DTO/Param从body获取 + else if (isPostOrPut && this.isBodyParameter(paramType)) { controllerParams.push('body'); - } else if (this.isPageParameter(paramType)) { - // 分页参数:从query获取 - controllerParams.push('query'); - } else if (this.isSearchParameter(paramType)) { - // 搜索参数:从query获取 - controllerParams.push('query'); - } else if (this.isPrimitiveParameter(paramType)) { - // 基本类型:优先从路径参数,其次从query - if (method.path && method.path.includes(`{${paramName}}`)) { - controllerParams.push(paramName); - } else { - controllerParams.push('query'); - } - } else { - // 默认从query获取 + } + // 基本类型:优先从路径参数 + else if (this.isPrimitiveParameter(paramType) && method.path && method.path.includes(`{${paramName}}`)) { + controllerParams.push(paramName); + } + // 默认从query获取 + else { controllerParams.push('query'); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-develop.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-develop.controller.ts index 81300eed..faba2c99 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-develop.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-develop.controller.ts @@ -19,7 +19,7 @@ export class AddonDevelopController { @ApiOperation({ summary: '/build/{key}' }) @ApiResponse({ status: 200, description: '成功' }) async postBuildkey(@Body() body: Record, @Param('key') key: string): Promise> { - const result = await this.addonDevelopBuildServiceImplService.build(body, key); + const result = await this.addonDevelopBuildServiceImplService.build(query); return Result.success(result); } @@ -27,7 +27,7 @@ export class AddonDevelopController { @ApiOperation({ summary: '' }) @ApiResponse({ status: 200, description: '成功' }) async get(@Query() query: Record): Promise> { - const result = await this.addonDevelopServiceImplService.list(query); + const result = await this.addonDevelopServiceImplService.list(body); return Result.success(result); } @@ -35,7 +35,7 @@ export class AddonDevelopController { @ApiOperation({ summary: '/{key}' }) @ApiResponse({ status: 200, description: '成功' }) async getKey(@Param('key') key: string, @Query() query: Record): Promise> { - const result = await this.addonDevelopServiceImplService.info(key, query); + const result = await this.addonDevelopServiceImplService.info(key); return Result.success(result); } @@ -43,7 +43,7 @@ export class AddonDevelopController { @ApiOperation({ summary: '/{key}' }) @ApiResponse({ status: 200, description: '成功' }) async postKey(@Body() body: Record, @Param('key') key: string): Promise> { - const result = await this.addonDevelopServiceImplService.add(body, key); + const result = await this.addonDevelopServiceImplService.add(body); return Result.success(result); } @@ -51,7 +51,7 @@ export class AddonDevelopController { @ApiOperation({ summary: '/{key}' }) @ApiResponse({ status: 200, description: '成功' }) async putKey(@Body() body: Record, @Param('key') key: string): Promise> { - const result = await this.addonDevelopServiceImplService.edit(body, key); + const result = await this.addonDevelopServiceImplService.edit(body); return Result.success(result); } @@ -67,7 +67,7 @@ export class AddonDevelopController { @ApiOperation({ summary: '/check/{key}' }) @ApiResponse({ status: 200, description: '成功' }) async getCheckkey(@Param('key') key: string, @Query() query: Record): Promise> { - const result = await this.niucloudServiceImplService.checkKey(key, query); + const result = await this.niucloudServiceImplService.checkKey(key); return Result.success(result); } @@ -83,7 +83,7 @@ export class AddonDevelopController { @ApiOperation({ summary: '/download/{key}' }) @ApiResponse({ status: 200, description: '成功' }) async postDownloadkey(@Body() body: Record, @Param('key') key: string): Promise> { - const result = await this.addonDevelopBuildServiceImplService.download(body, key); + const result = await this.addonDevelopBuildServiceImplService.download(key); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-log.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-log.controller.ts index 40666864..2f996aff 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-log.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-log.controller.ts @@ -23,7 +23,7 @@ export class AddonLogController { @ApiOperation({ summary: '/detail' }) @ApiResponse({ status: 200, description: '成功' }) async getDetail(@Query() query: Record): Promise> { - const result = await this.addonLogServiceImplService.detail(query); + const result = await this.addonLogServiceImplService.detail(id); return Result.success(result); } @@ -39,7 +39,7 @@ export class AddonLogController { @ApiOperation({ summary: '/del' }) @ApiResponse({ status: 200, description: '成功' }) async postDel(@Body() body: Record): Promise> { - const result = await this.addonLogServiceImplService.del(body); + const result = await this.addonLogServiceImplService.del(id); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon.controller.ts index c615d825..d80b6ade 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon.controller.ts @@ -23,7 +23,7 @@ export class AddonController { @ApiOperation({ summary: '/addon/list' }) @ApiResponse({ status: 200, description: '成功' }) async getAddonlist(@Query() query: Record): Promise> { - const result = await this.addonServiceImplService.list(query); + const result = await this.addonServiceImplService.list(body, body); return Result.success(result); } @@ -32,7 +32,7 @@ export class AddonController { @ApiResponse({ status: 200, description: '成功' }) @Public() async getAddonlistinstall(@Query() query: Record): Promise> { - const result = await this.addonServiceImplService.info(query); + const result = await this.addonServiceImplService.info(id); return Result.success(result); } @@ -40,7 +40,7 @@ export class AddonController { @ApiOperation({ summary: '/addon/:id' }) @ApiResponse({ status: 200, description: '成功' }) async getAddonid(@Query() query: Record): Promise> { - const result = await this.addonServiceImplService.info(query); + const result = await this.addonServiceImplService.info(id); return Result.success(result); } @@ -56,7 +56,7 @@ export class AddonController { @ApiOperation({ summary: '/addon/del' }) @ApiResponse({ status: 200, description: '成功' }) async postAddondel(@Body() body: Record): Promise> { - const result = await this.addonServiceImplService.del(body); + const result = await this.addonServiceImplService.del(id); return Result.success(result); } @@ -64,7 +64,7 @@ export class AddonController { @ApiOperation({ summary: '/addon/install/{addon}' }) @ApiResponse({ status: 200, description: '成功' }) async postAddoninstalladdon(@Body() body: Record, @Param('addon') addon: string): Promise> { - const result = await this.addonServiceImplService.install(body, addon); + const result = await this.addonServiceImplService.install(addon, query); return Result.success(result); } @@ -72,7 +72,7 @@ export class AddonController { @ApiOperation({ summary: '/addon/cloudinstall/{addon}' }) @ApiResponse({ status: 200, description: '成功' }) async postAddoncloudinstalladdon(@Body() body: Record, @Param('addon') addon: string): Promise> { - const result = await this.addonServiceImplService.install(body, addon); + const result = await this.addonServiceImplService.install(addon, query); return Result.success(result); } @@ -80,7 +80,7 @@ export class AddonController { @ApiOperation({ summary: '/addon/cloudinstall/{addon}' }) @ApiResponse({ status: 200, description: '成功' }) async getAddoncloudinstalladdon(@Param('addon') addon: string, @Query() query: Record): Promise> { - const result = await this.addonServiceImplService.cloudInstallLog(addon, query); + const result = await this.addonServiceImplService.cloudInstallLog(addon); return Result.success(result); } @@ -88,7 +88,7 @@ export class AddonController { @ApiOperation({ summary: '/addon/install/check/{addon}' }) @ApiResponse({ status: 200, description: '成功' }) async getAddoninstallcheckaddon(@Param('addon') addon: string, @Query() query: Record): Promise> { - const result = await this.addonServiceImplService.installCheck(addon, query); + const result = await this.addonServiceImplService.installCheck(addon); return Result.success(result); } @@ -112,7 +112,7 @@ export class AddonController { @ApiOperation({ summary: '/addon/uninstall/{addon}' }) @ApiResponse({ status: 200, description: '成功' }) async postAddonuninstalladdon(@Body() body: Record, @Param('addon') addon: string): Promise> { - const result = await this.addonServiceImplService.uninstall(body, addon); + const result = await this.addonServiceImplService.uninstall(addon); return Result.success(result); } @@ -120,7 +120,7 @@ export class AddonController { @ApiOperation({ summary: '/addon/uninstall/check/{addon}' }) @ApiResponse({ status: 200, description: '成功' }) async getAddonuninstallcheckaddon(@Param('addon') addon: string, @Query() query: Record): Promise> { - const result = await this.addonServiceImplService.uninstallCheck(addon, query); + const result = await this.addonServiceImplService.uninstallCheck(addon); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/backup.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/backup.controller.ts index 5717b61a..96b6ee77 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/backup.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/backup.controller.ts @@ -31,7 +31,7 @@ export class BackupController { @ApiOperation({ summary: '/remark' }) @ApiResponse({ status: 200, description: '成功' }) async putRemark(@Body() body: Record): Promise> { - const result = await this.sysBackupRecordsServiceImplService.edit(body); + const result = await this.sysBackupRecordsServiceImplService.edit(id, body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/upgrade.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/upgrade.controller.ts index a0bb5440..e481e45c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/upgrade.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/upgrade.controller.ts @@ -97,7 +97,7 @@ export class UpgradeController { @ApiOperation({ summary: '/clear' }) @ApiResponse({ status: 200, description: '成功' }) async postClear(@Body() body: Record): Promise> { - const result = await this.upgradeServiceImplService.clearUpgradeTask(body); + const result = await this.upgradeServiceImplService.clearUpgradeTask(query); return Result.success(result); } @@ -105,7 +105,7 @@ export class UpgradeController { @ApiOperation({ summary: '/operate/{operate}' }) @ApiResponse({ status: 200, description: '成功' }) async postOperateoperate(@Body() body: Record, @Param('operate') operate: string): Promise> { - const result = await this.upgradeServiceImplService.operate(body, operate); + const result = await this.upgradeServiceImplService.operate(operate); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/auth/auth.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/auth/auth.controller.ts index 2d11fe1c..6e4b71b6 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/auth/auth.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/auth/auth.controller.ts @@ -29,7 +29,7 @@ export class AuthController { @ApiOperation({ summary: '/site' }) @ApiResponse({ status: 200, description: '成功' }) async getSite(@Query() query: Record): Promise> { - const result = await this.siteServiceImplService.info(query); + const result = await this.siteServiceImplService.info(id); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/channel/app.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/channel/app.controller.ts index eb3715e4..308c17d3 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/channel/app.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/channel/app.controller.ts @@ -31,7 +31,7 @@ export class AppController { @ApiOperation({ summary: '/version' }) @ApiResponse({ status: 200, description: '成功' }) async getVersion(@Query() query: Record): Promise> { - const result = await this.adminAppServiceImplService.getVersionPage(query); + const result = await this.adminAppServiceImplService.getVersionPage(body, body); return Result.success(result); } @@ -39,7 +39,7 @@ export class AppController { @ApiOperation({ summary: '/version/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getVersionid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.adminAppServiceImplService.getVersionInfo(id, query); + const result = await this.adminAppServiceImplService.getVersionInfo(id); return Result.success(result); } @@ -55,7 +55,7 @@ export class AppController { @ApiOperation({ summary: '/version/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putVersionid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.adminAppServiceImplService.editVersion(body, id); + const result = await this.adminAppServiceImplService.editVersion(id, body); return Result.success(result); } @@ -79,7 +79,7 @@ export class AppController { @ApiOperation({ summary: '/build/log/{key}' }) @ApiResponse({ status: 200, description: '成功' }) async getBuildlogkey(@Param('key') key: string, @Query() query: Record): Promise> { - const result = await this.adminAppServiceImplService.getBuildLog(key, query); + const result = await this.adminAppServiceImplService.getBuildLog(key); return Result.success(result); } @@ -87,7 +87,7 @@ export class AppController { @ApiOperation({ summary: '/version/{id}/release' }) @ApiResponse({ status: 200, description: '成功' }) async putVersionidrelease(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.adminAppServiceImplService.release(body, id); + const result = await this.adminAppServiceImplService.release(id); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/channel/h5.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/channel/h5.controller.ts index e770ed23..f8ece298 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/channel/h5.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/channel/h5.controller.ts @@ -15,7 +15,7 @@ export class H5Controller { @ApiOperation({ summary: '/config' }) @ApiResponse({ status: 200, description: '成功' }) async getConfig(@Query() query: Record): Promise> { - const result = await this.coreH5ServiceImplService.getH5(query); + const result = await this.coreH5ServiceImplService.getH5(siteId); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/channel/pc.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/channel/pc.controller.ts index 8ac31d69..d75a71ea 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/channel/pc.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/channel/pc.controller.ts @@ -15,7 +15,7 @@ export class PcController { @ApiOperation({ summary: '/config' }) @ApiResponse({ status: 200, description: '成功' }) async getConfig(@Query() query: Record): Promise> { - const result = await this.corePcServiceImplService.getPc(query); + const result = await this.corePcServiceImplService.getPc(siteId); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/dict/dict.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/dict/dict.controller.ts index 270be966..f33c9a26 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/dict/dict.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/dict/dict.controller.ts @@ -15,7 +15,7 @@ export class DictController { @ApiOperation({ summary: '/dict' }) @ApiResponse({ status: 200, description: '成功' }) async getDict(@Query() query: Record): Promise> { - const result = await this.dictServiceImplService.info(query); + const result = await this.dictServiceImplService.info(id); return Result.success(result); } @@ -23,7 +23,7 @@ export class DictController { @ApiOperation({ summary: '/dict/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getDictid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.dictServiceImplService.info(id, query); + const result = await this.dictServiceImplService.info(id); return Result.success(result); } @@ -31,7 +31,7 @@ export class DictController { @ApiOperation({ summary: 'dictionary/type/{type}' }) @ApiResponse({ status: 200, description: '成功' }) async getDictionarytypetype(@Param('type') type: string, @Query() query: Record): Promise> { - const result = await this.dictServiceImplService.info(type, query); + const result = await this.dictServiceImplService.info(id); return Result.success(result); } @@ -47,7 +47,7 @@ export class DictController { @ApiOperation({ summary: '/dict/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putDictid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.dictServiceImplService.edit(body, id); + const result = await this.dictServiceImplService.edit(id, body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy-form.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy-form.controller.ts index db7c4fd4..4bd4d53a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy-form.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy-form.controller.ts @@ -17,7 +17,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form' }) @ApiResponse({ status: 200, description: '成功' }) async getForm(@Query() query: Record): Promise> { - const result = await this.diyFormServiceImplService.getPage(query); + const result = await this.diyFormServiceImplService.getPage(body, body); return Result.success(result); } @@ -25,7 +25,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getFormid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.diyFormServiceImplService.getInfo(id, query); + const result = await this.diyFormServiceImplService.getInfo(id); return Result.success(result); } @@ -41,7 +41,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putFormid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.diyFormServiceImplService.edit(body, id); + const result = await this.diyFormServiceImplService.edit(id, body); return Result.success(result); } @@ -49,7 +49,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/delete' }) @ApiResponse({ status: 200, description: '成功' }) async putFormdelete(@Body() body: Record): Promise> { - const result = await this.diyFormServiceImplService.del(body); + const result = await this.diyFormServiceImplService.del(query); return Result.success(result); } @@ -57,7 +57,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/list' }) @ApiResponse({ status: 200, description: '成功' }) async getFormlist(@Query() query: Record): Promise> { - const result = await this.diyFormServiceImplService.getList(query); + const result = await this.diyFormServiceImplService.getList(body); return Result.success(result); } @@ -65,7 +65,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/init' }) @ApiResponse({ status: 200, description: '成功' }) async getForminit(@Query() query: Record): Promise> { - const result = await this.diyFormServiceImplService.getInit(query); + const result = await this.diyFormServiceImplService.getInit(body); return Result.success(result); } @@ -73,7 +73,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/template' }) @ApiResponse({ status: 200, description: '成功' }) async getFormtemplate(@Query() query: Record): Promise> { - const result = await this.diyFormServiceImplService.modifyShare(query); + const result = await this.diyFormServiceImplService.modifyShare(formId, query); return Result.success(result); } @@ -81,7 +81,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/share' }) @ApiResponse({ status: 200, description: '成功' }) async putFormshare(@Body() body: Record): Promise> { - const result = await this.diyFormServiceImplService.modifyShare(body); + const result = await this.diyFormServiceImplService.modifyShare(formId, query); return Result.success(result); } @@ -89,7 +89,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/copy' }) @ApiResponse({ status: 200, description: '成功' }) async postFormcopy(@Body() body: Record): Promise> { - const result = await this.diyFormServiceImplService.copy(body); + const result = await this.diyFormServiceImplService.copy(formId); return Result.success(result); } @@ -113,7 +113,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/records' }) @ApiResponse({ status: 200, description: '成功' }) async getFormrecords(@Query() query: Record): Promise> { - const result = await this.diyFormServiceImplService.getRecordPages(query); + const result = await this.diyFormServiceImplService.getRecordPages(body, body); return Result.success(result); } @@ -121,7 +121,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/records/{records_id}' }) @ApiResponse({ status: 200, description: '成功' }) async getFormrecordsrecordsid(@Param('records_id') records_id: string, @Query() query: Record): Promise> { - const result = await this.diyFormServiceImplService.getRecordInfo(records_id, query); + const result = await this.diyFormServiceImplService.getRecordInfo(recordId); return Result.success(result); } @@ -129,7 +129,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/records/delete' }) @ApiResponse({ status: 200, description: '成功' }) async deleteFormrecordsdelete(): Promise> { - const result = await this.diyFormServiceImplService.delRecord(); + const result = await this.diyFormServiceImplService.delRecord(formId, recordId); return Result.success(result); } @@ -137,7 +137,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/fields/list' }) @ApiResponse({ status: 200, description: '成功' }) async getFormfieldslist(@Query() query: Record): Promise> { - const result = await this.diyFormServiceImplService.getFieldsList(query); + const result = await this.diyFormServiceImplService.getFieldsList(body); return Result.success(result); } @@ -145,7 +145,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/write/{form_id}' }) @ApiResponse({ status: 200, description: '成功' }) async getFormwriteformid(@Param('form_id') form_id: string, @Query() query: Record): Promise> { - const result = await this.diyFormConfigServiceImplService.getWriteConfig(form_id, query); + const result = await this.diyFormConfigServiceImplService.getWriteConfig(formId); return Result.success(result); } @@ -161,7 +161,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/submit/{form_id}' }) @ApiResponse({ status: 200, description: '成功' }) async getFormsubmitformid(@Param('form_id') form_id: string, @Query() query: Record): Promise> { - const result = await this.diyFormConfigServiceImplService.getSubmitConfig(form_id, query); + const result = await this.diyFormConfigServiceImplService.getSubmitConfig(formId); return Result.success(result); } @@ -177,7 +177,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/records/member/stat' }) @ApiResponse({ status: 200, description: '成功' }) async getFormrecordsmemberstat(@Query() query: Record): Promise> { - const result = await this.diyFormRecordsServiceImplService.getPage(query); + const result = await this.diyFormRecordsServiceImplService.getPage(body, body); return Result.success(result); } @@ -185,7 +185,7 @@ export class DiyFormController { @ApiOperation({ summary: '/form/records/field/stat' }) @ApiResponse({ status: 200, description: '成功' }) async getFormrecordsfieldstat(@Query() query: Record): Promise> { - const result = await this.diyFormRecordsServiceImplService.getFieldStatList(query); + const result = await this.diyFormRecordsServiceImplService.getFieldStatList(body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy-route.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy-route.controller.ts index 48f5a78d..ddff540b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy-route.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy-route.controller.ts @@ -17,7 +17,7 @@ export class DiyRouteController { @ApiOperation({ summary: '' }) @ApiResponse({ status: 200, description: '成功' }) async get(@Query() query: Record): Promise> { - const result = await this.diyRouteServiceImplService.list(query); + const result = await this.diyRouteServiceImplService.list(body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy-theme.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy-theme.controller.ts index 5dc37fdd..cccf64ac 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy-theme.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy-theme.controller.ts @@ -31,7 +31,7 @@ export class DiyThemeController { @ApiOperation({ summary: '/color' }) @ApiResponse({ status: 200, description: '成功' }) async getColor(@Query() query: Record): Promise> { - const result = await this.diyThemeServiceImplService.getDefaultThemeColor(query); + const result = await this.diyThemeServiceImplService.getDefaultThemeColor(body); return Result.success(result); } @@ -47,7 +47,7 @@ export class DiyThemeController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putId(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.diyThemeServiceImplService.editDiyTheme(body, id); + const result = await this.diyThemeServiceImplService.editDiyTheme(id, body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy.controller.ts index abe3263f..cb924b5a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/diy/diy.controller.ts @@ -17,7 +17,7 @@ export class DiyController { @ApiOperation({ summary: '/diy' }) @ApiResponse({ status: 200, description: '成功' }) async getDiy(@Query() query: Record): Promise> { - const result = await this.diyServiceImplService.list(query); + const result = await this.diyServiceImplService.list(body, body); return Result.success(result); } @@ -25,7 +25,7 @@ export class DiyController { @ApiOperation({ summary: '/list' }) @ApiResponse({ status: 200, description: '成功' }) async getList(@Query() query: Record): Promise> { - const result = await this.diyServiceImplService.allList(query); + const result = await this.diyServiceImplService.allList(body); return Result.success(result); } @@ -49,7 +49,7 @@ export class DiyController { @ApiOperation({ summary: '/diy/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putDiyid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.diyServiceImplService.edit(body, id); + const result = await this.diyServiceImplService.edit(id, body); return Result.success(result); } @@ -65,7 +65,7 @@ export class DiyController { @ApiOperation({ summary: '/init' }) @ApiResponse({ status: 200, description: '成功' }) async getInit(@Query() query: Record): Promise> { - const result = await this.diyServiceImplService.getPageInit(query); + const result = await this.diyServiceImplService.getPageInit(body); return Result.success(result); } @@ -89,7 +89,7 @@ export class DiyController { @ApiOperation({ summary: '/use/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putUseid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.diyServiceImplService.setUse(body, id); + const result = await this.diyServiceImplService.setUse(id); return Result.success(result); } @@ -97,7 +97,7 @@ export class DiyController { @ApiOperation({ summary: '/template' }) @ApiResponse({ status: 200, description: '成功' }) async getTemplate(@Query() query: Record): Promise> { - const result = await this.diyServiceImplService.getTemplate(query); + const result = await this.diyServiceImplService.getTemplate(body); return Result.success(result); } @@ -121,7 +121,7 @@ export class DiyController { @ApiOperation({ summary: '/decorate' }) @ApiResponse({ status: 200, description: '成功' }) async getDecorate(@Query() query: Record): Promise> { - const result = await this.diyServiceImplService.getDecoratePage(query); + const result = await this.diyServiceImplService.getDecoratePage(body); return Result.success(result); } @@ -129,7 +129,7 @@ export class DiyController { @ApiOperation({ summary: '/carousel_search' }) @ApiResponse({ status: 200, description: '成功' }) async getCarouselsearch(@Query() query: Record): Promise> { - const result = await this.diyServiceImplService.getPageByCarouselSearch(query); + const result = await this.diyServiceImplService.getPageByCarouselSearch(body); return Result.success(result); } @@ -137,7 +137,7 @@ export class DiyController { @ApiOperation({ summary: '/copy' }) @ApiResponse({ status: 200, description: '成功' }) async postCopy(@Body() body: Record): Promise> { - const result = await this.diyServiceImplService.copy(body); + const result = await this.diyServiceImplService.copy(id); return Result.success(result); } @@ -145,7 +145,7 @@ export class DiyController { @ApiOperation({ summary: '/page_link' }) @ApiResponse({ status: 200, description: '成功' }) async getPagelink(@Query() query: Record): Promise> { - const result = await this.diyServiceImplService.getPageLink(query); + const result = await this.diyServiceImplService.getPageLink(body); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/generator/generate.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/generator/generate.controller.ts index 16cbd148..4d33fa11 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/generator/generate.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/generator/generate.controller.ts @@ -21,7 +21,7 @@ export class GenerateController { @ApiOperation({ summary: '/generator/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getGeneratorid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.generateServiceImplService.getInfo(id, query); + const result = await this.generateServiceImplService.getInfo(id); return Result.success(result); } @@ -29,7 +29,7 @@ export class GenerateController { @ApiOperation({ summary: '/generator' }) @ApiResponse({ status: 200, description: '成功' }) async postGenerator(@Body() body: Record): Promise> { - const result = await this.generateServiceImplService.edit(body); + const result = await this.generateServiceImplService.edit(id, body); return Result.success(result); } @@ -37,7 +37,7 @@ export class GenerateController { @ApiOperation({ summary: '/generator/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putGeneratorid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.generateServiceImplService.edit(body, id); + const result = await this.generateServiceImplService.edit(id, body); return Result.success(result); } @@ -61,7 +61,7 @@ export class GenerateController { @ApiOperation({ summary: '/table' }) @ApiResponse({ status: 200, description: '成功' }) async getTable(@Query() query: Record): Promise> { - const result = await this.generateServiceImplService.preview(query); + const result = await this.generateServiceImplService.preview(id); return Result.success(result); } @@ -69,7 +69,7 @@ export class GenerateController { @ApiOperation({ summary: '/preview/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getPreviewid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.generateServiceImplService.preview(id, query); + const result = await this.generateServiceImplService.preview(id); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/home/site.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/home/site.controller.ts index ebe5e8c4..949d4a86 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/home/site.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/home/site.controller.ts @@ -23,7 +23,7 @@ export class SiteController { @ApiOperation({ summary: '/site/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getSiteid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.authSiteServiceImplService.info(id, query); + const result = await this.authSiteServiceImplService.info(id); return Result.success(result); } @@ -31,7 +31,7 @@ export class SiteController { @ApiOperation({ summary: '/site/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putSiteid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.authSiteServiceImplService.edit(body, id); + const result = await this.authSiteServiceImplService.edit(id, body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/login/captcha.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/login/captcha.controller.ts index d34a4fa7..959cdb46 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/login/captcha.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/login/captcha.controller.ts @@ -22,7 +22,7 @@ export class CaptchaController { @ApiOperation({ summary: '/check' }) @ApiResponse({ status: 200, description: '成功' }) async getCheck(@Query() query: Record): Promise> { - const result = await this.coreCaptchaImgServiceImplService.check(query); + const result = await this.coreCaptchaImgServiceImplService.check(body); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/login/login.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/login/login.controller.ts index 101adcfc..d23b9102 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/login/login.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/login/login.controller.ts @@ -16,7 +16,7 @@ export class LoginController { @ApiOperation({ summary: '/{appType}' }) @ApiResponse({ status: 200, description: '成功' }) async getAppType(@Param('appType') appType: string, @Query() query: Record): Promise> { - const result = await this.loginServiceImplService.login(appType, query); + const result = await this.loginServiceImplService.login(body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-account.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-account.controller.ts index edb77802..f4f6aabd 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-account.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-account.controller.ts @@ -23,7 +23,7 @@ export class MemberAccountController { @ApiOperation({ summary: '/point' }) @ApiResponse({ status: 200, description: '成功' }) async getPoint(@Query() query: Record): Promise> { - const result = await this.memberAccountServiceImplService.list(query); + const result = await this.memberAccountServiceImplService.list(body, body); return Result.success(result); } @@ -31,7 +31,7 @@ export class MemberAccountController { @ApiOperation({ summary: '/balance' }) @ApiResponse({ status: 200, description: '成功' }) async getBalance(@Query() query: Record): Promise> { - const result = await this.memberAccountServiceImplService.list(query); + const result = await this.memberAccountServiceImplService.list(body, body); return Result.success(result); } @@ -39,7 +39,7 @@ export class MemberAccountController { @ApiOperation({ summary: '/money' }) @ApiResponse({ status: 200, description: '成功' }) async getMoney(@Query() query: Record): Promise> { - const result = await this.memberAccountServiceImplService.list(query); + const result = await this.memberAccountServiceImplService.list(body, body); return Result.success(result); } @@ -47,7 +47,7 @@ export class MemberAccountController { @ApiOperation({ summary: '/growth' }) @ApiResponse({ status: 200, description: '成功' }) async getGrowth(@Query() query: Record): Promise> { - const result = await this.memberAccountServiceImplService.list(query); + const result = await this.memberAccountServiceImplService.list(body, body); return Result.success(result); } @@ -55,7 +55,7 @@ export class MemberAccountController { @ApiOperation({ summary: '/commission' }) @ApiResponse({ status: 200, description: '成功' }) async getCommission(@Query() query: Record): Promise> { - const result = await this.memberAccountServiceImplService.list(query); + const result = await this.memberAccountServiceImplService.list(body, body); return Result.success(result); } @@ -79,7 +79,7 @@ export class MemberAccountController { @ApiOperation({ summary: '/sum_commission' }) @ApiResponse({ status: 200, description: '成功' }) async getSumcommission(@Query() query: Record): Promise> { - const result = await this.memberAccountServiceImplService.sumCommission(query); + const result = await this.memberAccountServiceImplService.sumCommission(body); return Result.success(result); } @@ -87,7 +87,7 @@ export class MemberAccountController { @ApiOperation({ summary: '/sum_point' }) @ApiResponse({ status: 200, description: '成功' }) async getSumpoint(@Query() query: Record): Promise> { - const result = await this.memberAccountServiceImplService.sumPoint(query); + const result = await this.memberAccountServiceImplService.sumPoint(body); return Result.success(result); } @@ -95,7 +95,7 @@ export class MemberAccountController { @ApiOperation({ summary: '/sum_balance' }) @ApiResponse({ status: 200, description: '成功' }) async getSumbalance(@Query() query: Record): Promise> { - const result = await this.memberAccountServiceImplService.sumBalance(query); + const result = await this.memberAccountServiceImplService.sumBalance(body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-address.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-address.controller.ts index b0969236..d2883b6c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-address.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-address.controller.ts @@ -15,7 +15,7 @@ export class MemberAddressController { @ApiOperation({ summary: '' }) @ApiResponse({ status: 200, description: '成功' }) async get(@Query() query: Record): Promise> { - const result = await this.memberAddressServiceImplService.list(query); + const result = await this.memberAddressServiceImplService.list(body); return Result.success(result); } @@ -23,7 +23,7 @@ export class MemberAddressController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getId(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.memberAddressServiceImplService.info(id, query); + const result = await this.memberAddressServiceImplService.info(id); return Result.success(result); } @@ -39,7 +39,7 @@ export class MemberAddressController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putId(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.memberAddressServiceImplService.edit(body, id); + const result = await this.memberAddressServiceImplService.edit(id, body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-cash-out.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-cash-out.controller.ts index f35f0462..18597fcf 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-cash-out.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-cash-out.controller.ts @@ -15,7 +15,7 @@ export class MemberCashOutController { @ApiOperation({ summary: '' }) @ApiResponse({ status: 200, description: '成功' }) async get(@Query() query: Record): Promise> { - const result = await this.memberCashOutServiceImplService.pages(query); + const result = await this.memberCashOutServiceImplService.pages(body, body); return Result.success(result); } @@ -23,7 +23,7 @@ export class MemberCashOutController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getId(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.memberCashOutServiceImplService.info(id, query); + const result = await this.memberCashOutServiceImplService.info(id); return Result.success(result); } @@ -39,7 +39,7 @@ export class MemberCashOutController { @ApiOperation({ summary: '/audit/{id}/{action}' }) @ApiResponse({ status: 200, description: '成功' }) async putAuditidaction(@Body() body: Record, @Param() params: Record): Promise> { - const result = await this.memberCashOutServiceImplService.audit(body, params); + const result = await this.memberCashOutServiceImplService.audit(body); return Result.success(result); } @@ -47,7 +47,7 @@ export class MemberCashOutController { @ApiOperation({ summary: '/cancel/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putCancelid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.memberCashOutServiceImplService.cancel(body, id); + const result = await this.memberCashOutServiceImplService.cancel(id); return Result.success(result); } @@ -55,7 +55,7 @@ export class MemberCashOutController { @ApiOperation({ summary: '/remark/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putRemarkid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.memberCashOutServiceImplService.remark(body, id); + const result = await this.memberCashOutServiceImplService.remark(id, body); return Result.success(result); } @@ -71,7 +71,7 @@ export class MemberCashOutController { @ApiOperation({ summary: '/transfer/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putTransferid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.memberCashOutServiceImplService.transfer(body, id); + const result = await this.memberCashOutServiceImplService.transfer(body); return Result.success(result); } @@ -87,7 +87,7 @@ export class MemberCashOutController { @ApiOperation({ summary: '/check/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putCheckid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.memberCashOutServiceImplService.checkTransferStatus(body, id); + const result = await this.memberCashOutServiceImplService.checkTransferStatus(id); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-config.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-config.controller.ts index 45c307b7..8f39ecae 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-config.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-config.controller.ts @@ -71,7 +71,7 @@ export class MemberConfigController { @ApiOperation({ summary: '/growth_rule' }) @ApiResponse({ status: 200, description: '成功' }) async postGrowthrule(@Body() body: Record): Promise> { - const result = await this.memberConfigServiceImplService.setGrowthRuleConfig(body); + const result = await this.memberConfigServiceImplService.setGrowthRuleConfig(query); return Result.success(result); } @@ -87,7 +87,7 @@ export class MemberConfigController { @ApiOperation({ summary: '/point_rule' }) @ApiResponse({ status: 200, description: '成功' }) async postPointrule(@Body() body: Record): Promise> { - const result = await this.memberConfigServiceImplService.setPointRuleConfig(body); + const result = await this.memberConfigServiceImplService.setPointRuleConfig(query); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-label.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-label.controller.ts index 5c5e3d58..27b5be83 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-label.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-label.controller.ts @@ -15,7 +15,7 @@ export class MemberLabelController { @ApiOperation({ summary: '/label' }) @ApiResponse({ status: 200, description: '成功' }) async getLabel(@Query() query: Record): Promise> { - const result = await this.memberLabelServiceImplService.list(query); + const result = await this.memberLabelServiceImplService.list(body, body); return Result.success(result); } @@ -23,7 +23,7 @@ export class MemberLabelController { @ApiOperation({ summary: '/label/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getLabelid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.memberLabelServiceImplService.info(id, query); + const result = await this.memberLabelServiceImplService.info(id); return Result.success(result); } @@ -39,7 +39,7 @@ export class MemberLabelController { @ApiOperation({ summary: '/label/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putLabelid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.memberLabelServiceImplService.edit(body, id); + const result = await this.memberLabelServiceImplService.edit(id, body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-level.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-level.controller.ts index 89e5e954..e9793adb 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-level.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-level.controller.ts @@ -15,7 +15,7 @@ export class MemberLevelController { @ApiOperation({ summary: '' }) @ApiResponse({ status: 200, description: '成功' }) async get(@Query() query: Record): Promise> { - const result = await this.memberLevelServiceImplService.list(query); + const result = await this.memberLevelServiceImplService.list(body, body); return Result.success(result); } @@ -23,7 +23,7 @@ export class MemberLevelController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getId(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.memberLevelServiceImplService.info(id, query); + const result = await this.memberLevelServiceImplService.info(id); return Result.success(result); } @@ -39,7 +39,7 @@ export class MemberLevelController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putId(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.memberLevelServiceImplService.edit(body, id); + const result = await this.memberLevelServiceImplService.edit(id, body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-sign.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-sign.controller.ts index 1cbc0573..31cf9e9f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-sign.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member-sign.controller.ts @@ -15,7 +15,7 @@ export class MemberSignController { @ApiOperation({ summary: '' }) @ApiResponse({ status: 200, description: '成功' }) async get(@Query() query: Record): Promise> { - const result = await this.memberSignServiceImplService.pages(query); + const result = await this.memberSignServiceImplService.pages(body, body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member.controller.ts index c781bb0a..0015e1ea 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/member/member.controller.ts @@ -15,7 +15,7 @@ export class MemberController { @ApiOperation({ summary: '/member' }) @ApiResponse({ status: 200, description: '成功' }) async getMember(@Query() query: Record): Promise> { - const result = await this.memberServiceImplService.all(query); + const result = await this.memberServiceImplService.all(body); return Result.success(result); } @@ -23,7 +23,7 @@ export class MemberController { @ApiOperation({ summary: '/member/list' }) @ApiResponse({ status: 200, description: '成功' }) async getMemberlist(@Query() query: Record): Promise> { - const result = await this.memberServiceImplService.all(query); + const result = await this.memberServiceImplService.all(body); return Result.success(result); } @@ -31,7 +31,7 @@ export class MemberController { @ApiOperation({ summary: '/member/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getMemberid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.memberServiceImplService.info(id, query); + const result = await this.memberServiceImplService.info(id); return Result.success(result); } @@ -47,7 +47,7 @@ export class MemberController { @ApiOperation({ summary: '/member/{member_id}' }) @ApiResponse({ status: 200, description: '成功' }) async putMembermemberid(@Body() body: Record, @Param('member_id') member_id: string): Promise> { - const result = await this.memberServiceImplService.edit(body, member_id); + const result = await this.memberServiceImplService.edit(id, body); return Result.success(result); } @@ -55,7 +55,7 @@ export class MemberController { @ApiOperation({ summary: '/member/modify/{member_id}/{field}' }) @ApiResponse({ status: 200, description: '成功' }) async putMembermodifymemberidfield(@Body() body: Record, @Param() params: Record): Promise> { - const result = await this.memberServiceImplService.modify(body, params); + const result = await this.memberServiceImplService.modify(body); return Result.success(result); } @@ -63,7 +63,7 @@ export class MemberController { @ApiOperation({ summary: '/member/{member_id}' }) @ApiResponse({ status: 200, description: '成功' }) async deleteMembermemberid(@Param('member_id') member_id: string): Promise> { - const result = await this.memberServiceImplService.del(member_id); + const result = await this.memberServiceImplService.del(id); return Result.success(result); } @@ -103,7 +103,7 @@ export class MemberController { @ApiOperation({ summary: '/setstatus/{status}' }) @ApiResponse({ status: 200, description: '成功' }) async putSetstatusstatus(@Body() body: Record, @Param('status') status: string): Promise> { - const result = await this.memberServiceImplService.setStatus(body, status); + const result = await this.memberServiceImplService.setStatus(status, body); return Result.success(result); } @@ -143,7 +143,7 @@ export class MemberController { @ApiOperation({ summary: '/gifts/content' }) @ApiResponse({ status: 200, description: '成功' }) async postGiftscontent(@Body() body: Record): Promise> { - const result = await this.memberServiceImplService.getMemberGiftsContent(body); + const result = await this.memberServiceImplService.getMemberGiftsContent(query); return Result.success(result); } @@ -151,7 +151,7 @@ export class MemberController { @ApiOperation({ summary: '/benefits/content' }) @ApiResponse({ status: 200, description: '成功' }) async postBenefitscontent(@Body() body: Record): Promise> { - const result = await this.memberServiceImplService.getMemberBenefitsContent(body); + const result = await this.memberServiceImplService.getMemberBenefitsContent(query); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/niucloud/cloud.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/niucloud/cloud.controller.ts index 8c8a8ef7..45371175 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/niucloud/cloud.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/niucloud/cloud.controller.ts @@ -23,7 +23,7 @@ export class CloudController { @ApiOperation({ summary: '/build' }) @ApiResponse({ status: 200, description: '成功' }) async postBuild(@Body() body: Record): Promise> { - const result = await this.cloudBuildServiceImplService.build(body); + const result = await this.cloudBuildServiceImplService.build(query); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/niucloud/module.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/niucloud/module.controller.ts index 1dd5512a..9c8e2ec0 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/niucloud/module.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/niucloud/module.controller.ts @@ -47,7 +47,7 @@ export class ModuleController { @ApiOperation({ summary: '/app_version/list' }) @ApiResponse({ status: 200, description: '成功' }) async getAppversionlist(@Query() query: Record): Promise> { - const result = await this.niucloudServiceImplService.getAppVersionList(query); + const result = await this.niucloudServiceImplService.getAppVersionList(body); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/notice/notice-log.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/notice/notice-log.controller.ts index 3e319863..6f404ba9 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/notice/notice-log.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/notice/notice-log.controller.ts @@ -23,7 +23,7 @@ export class NoticeLogController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getId(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.sysNoticeLogServiceImplService.info(id, query); + const result = await this.sysNoticeLogServiceImplService.info(id); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/notice/notice-sms-log.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/notice/notice-sms-log.controller.ts index e0d1efe1..94ee1976 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/notice/notice-sms-log.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/notice/notice-sms-log.controller.ts @@ -23,7 +23,7 @@ export class NoticeSmsLogController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getId(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.sysNoticeSmsLogServiceImplService.info(id, query); + const result = await this.sysNoticeSmsLogServiceImplService.info(id); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/notice/notice.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/notice/notice.controller.ts index 1c6ca827..001ccba8 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/notice/notice.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/notice/notice.controller.ts @@ -23,7 +23,7 @@ export class NoticeController { @ApiOperation({ summary: '/notice/{key}' }) @ApiResponse({ status: 200, description: '成功' }) async getNoticekey(@Param('key') key: string, @Query() query: Record): Promise> { - const result = await this.noticeServiceImplService.getInfo(key, query); + const result = await this.noticeServiceImplService.getInfo(key); return Result.success(result); } @@ -55,7 +55,7 @@ export class NoticeController { @ApiOperation({ summary: '/notice/sms/{sms_type}' }) @ApiResponse({ status: 200, description: '成功' }) async putNoticesmssmstype(@Body() body: Record, @Param('sms_type') sms_type: string): Promise> { - const result = await this.noticeServiceImplService.editMessageStatus(body, sms_type); + const result = await this.noticeServiceImplService.editMessageStatus(body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/pay/pay-channel.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/pay/pay-channel.controller.ts index f9ecee8b..32c6de58 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/pay/pay-channel.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/pay/pay-channel.controller.ts @@ -31,7 +31,7 @@ export class PayChannelController { @ApiOperation({ summary: '/channel/set/all' }) @ApiResponse({ status: 200, description: '成功' }) async postChannelsetall(@Body() body: Record): Promise> { - const result = await this.payChannelServiceImplService.set(body); + const result = await this.payChannelServiceImplService.set(query, query, query); return Result.success(result); } @@ -39,7 +39,7 @@ export class PayChannelController { @ApiOperation({ summary: '/channel/set/{channel}/{type}' }) @ApiResponse({ status: 200, description: '成功' }) async postChannelsetchanneltype(@Body() body: Record, @Param() params: Record): Promise> { - const result = await this.payChannelServiceImplService.set(body, params); + const result = await this.payChannelServiceImplService.set(channel, type, query); return Result.success(result); } @@ -47,7 +47,7 @@ export class PayChannelController { @ApiOperation({ summary: '/channel/lists/{channel}' }) @ApiResponse({ status: 200, description: '成功' }) async getChannellistschannel(@Param('channel') channel: string, @Query() query: Record): Promise> { - const result = await this.payChannelServiceImplService.getListByChannel(channel, query); + const result = await this.payChannelServiceImplService.getListByChannel(channel); return Result.success(result); } @@ -55,7 +55,7 @@ export class PayChannelController { @ApiOperation({ summary: '/channel/set/transfer' }) @ApiResponse({ status: 200, description: '成功' }) async postChannelsettransfer(@Body() body: Record): Promise> { - const result = await this.payChannelServiceImplService.setTransfer(body); + const result = await this.payChannelServiceImplService.setTransfer(query); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/pay/pay-refund.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/pay/pay-refund.controller.ts index 38d7f556..919aff83 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/pay/pay-refund.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/pay/pay-refund.controller.ts @@ -15,7 +15,7 @@ export class PayRefundController { @ApiOperation({ summary: '' }) @ApiResponse({ status: 200, description: '成功' }) async get(@Query() query: Record): Promise> { - const result = await this.payRefundServiceImplService.list(query); + const result = await this.payRefundServiceImplService.list(body, body); return Result.success(result); } @@ -23,7 +23,7 @@ export class PayRefundController { @ApiOperation({ summary: '/{refund_no}' }) @ApiResponse({ status: 200, description: '成功' }) async getRefundno(@Param('refund_no') refund_no: string, @Query() query: Record): Promise> { - const result = await this.payRefundServiceImplService.info(refund_no, query); + const result = await this.payRefundServiceImplService.info(query); return Result.success(result); } @@ -31,7 +31,7 @@ export class PayRefundController { @ApiOperation({ summary: '/type' }) @ApiResponse({ status: 200, description: '成功' }) async getType(@Query() query: Record): Promise> { - const result = await this.payRefundServiceImplService.transfer(query); + const result = await this.payRefundServiceImplService.transfer(body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/pay/pay.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/pay/pay.controller.ts index fa49492a..fdefbfd5 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/pay/pay.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/pay/pay.controller.ts @@ -23,7 +23,7 @@ export class PayController { @ApiOperation({ summary: '/info' }) @ApiResponse({ status: 200, description: '成功' }) async getInfo(@Query() query: Record): Promise> { - const result = await this.payServiceImplService.info(query); + const result = await this.payServiceImplService.info(id); return Result.success(result); } @@ -39,7 +39,7 @@ export class PayController { @ApiOperation({ summary: '/edit' }) @ApiResponse({ status: 200, description: '成功' }) async postEdit(@Body() body: Record): Promise> { - const result = await this.payServiceImplService.edit(body); + const result = await this.payServiceImplService.edit(id, body); return Result.success(result); } @@ -47,7 +47,7 @@ export class PayController { @ApiOperation({ summary: '/del' }) @ApiResponse({ status: 200, description: '成功' }) async postDel(@Body() body: Record): Promise> { - const result = await this.payServiceImplService.del(body); + const result = await this.payServiceImplService.del(id); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/site-account-log.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/site-account-log.controller.ts index 2fc0baed..721f4f02 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/site-account-log.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/site-account-log.controller.ts @@ -23,7 +23,7 @@ export class SiteAccountLogController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getId(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.siteAccountLogServiceImplService.info(id, query); + const result = await this.siteAccountLogServiceImplService.info(id); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/site-group.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/site-group.controller.ts index 0fe1d555..6d08ce50 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/site-group.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/site-group.controller.ts @@ -31,7 +31,7 @@ export class SiteGroupController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getId(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.siteGroupServiceImplService.info(id, query); + const result = await this.siteGroupServiceImplService.info(id); return Result.success(result); } @@ -39,7 +39,7 @@ export class SiteGroupController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putId(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.siteGroupServiceImplService.edit(body, id); + const result = await this.siteGroupServiceImplService.edit(id, body); return Result.success(result); } @@ -63,7 +63,7 @@ export class SiteGroupController { @ApiOperation({ summary: '/user' }) @ApiResponse({ status: 200, description: '成功' }) async getUser(@Query() query: Record): Promise> { - const result = await this.siteGroupServiceImplService.getUserSiteGroupAll(query); + const result = await this.siteGroupServiceImplService.getUserSiteGroupAll(uid); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/site.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/site.controller.ts index 7a8d0c0b..35984f6f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/site.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/site.controller.ts @@ -25,7 +25,7 @@ export class SiteController { @ApiOperation({ summary: '/site/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getSiteid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.siteServiceImplService.info(id, query); + const result = await this.siteServiceImplService.info(id); return Result.success(result); } @@ -41,7 +41,7 @@ export class SiteController { @ApiOperation({ summary: '/site/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putSiteid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.siteServiceImplService.edit(body, id); + const result = await this.siteServiceImplService.edit(id, body); return Result.success(result); } @@ -57,7 +57,7 @@ export class SiteController { @ApiOperation({ summary: '/closesite/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putClosesiteid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.siteServiceImplService.closeSite(body, id); + const result = await this.siteServiceImplService.closeSite(siteId); return Result.success(result); } @@ -65,7 +65,7 @@ export class SiteController { @ApiOperation({ summary: '/opensite/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putOpensiteid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.siteServiceImplService.openSite(body, id); + const result = await this.siteServiceImplService.openSite(siteId); return Result.success(result); } @@ -129,7 +129,7 @@ export class SiteController { @ApiOperation({ summary: '/captcha/create' }) @ApiResponse({ status: 200, description: '成功' }) async getCaptchacreate(@Query() query: Record): Promise> { - const result = await this.siteServiceImplService.siteInit(query); + const result = await this.siteServiceImplService.siteInit(siteId); return Result.success(result); } @@ -137,7 +137,7 @@ export class SiteController { @ApiOperation({ summary: '/init' }) @ApiResponse({ status: 200, description: '成功' }) async postInit(@Body() body: Record): Promise> { - const result = await this.siteServiceImplService.siteInit(body); + const result = await this.siteServiceImplService.siteInit(siteId); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/user-log.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/user-log.controller.ts index eb76e1ee..1d5e4f5d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/user-log.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/user-log.controller.ts @@ -23,7 +23,7 @@ export class UserLogController { @ApiOperation({ summary: '/log/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getLogid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.sysUserLogServiceImplService.info(id, query); + const result = await this.sysUserLogServiceImplService.info(id); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/user.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/user.controller.ts index 5eb9c528..07d5d50e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/user.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/site/user.controller.ts @@ -15,7 +15,7 @@ export class UserController { @ApiOperation({ summary: 'user' }) @ApiResponse({ status: 200, description: '成功' }) async getUser(@Query() query: Record): Promise> { - const result = await this.siteUserServiceImplService.list(query); + const result = await this.siteUserServiceImplService.list(body, body); return Result.success(result); } @@ -31,7 +31,7 @@ export class UserController { @ApiOperation({ summary: 'user/{uid}' }) @ApiResponse({ status: 200, description: '成功' }) async getUseruid(@Param('uid') uid: string, @Query() query: Record): Promise> { - const result = await this.siteUserServiceImplService.getInfo(uid, query); + const result = await this.siteUserServiceImplService.getInfo(uid); return Result.success(result); } @@ -39,7 +39,7 @@ export class UserController { @ApiOperation({ summary: 'user/{uid}' }) @ApiResponse({ status: 200, description: '成功' }) async putUseruid(@Body() body: Record, @Param('uid') uid: string): Promise> { - const result = await this.siteUserServiceImplService.edit(body, uid); + const result = await this.siteUserServiceImplService.edit(uid, body); return Result.success(result); } @@ -47,7 +47,7 @@ export class UserController { @ApiOperation({ summary: 'user/lock/{uid}' }) @ApiResponse({ status: 200, description: '成功' }) async putUserlockuid(@Body() body: Record, @Param('uid') uid: string): Promise> { - const result = await this.siteUserServiceImplService.lock(body, uid); + const result = await this.siteUserServiceImplService.lock(uid); return Result.success(result); } @@ -55,7 +55,7 @@ export class UserController { @ApiOperation({ summary: 'user/unlock/{uid}' }) @ApiResponse({ status: 200, description: '成功' }) async putUserunlockuid(@Body() body: Record, @Param('uid') uid: string): Promise> { - const result = await this.siteUserServiceImplService.unlock(body, uid); + const result = await this.siteUserServiceImplService.unlock(uid); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/stat/stat-hour.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/stat/stat-hour.controller.ts index f07635b1..6cab85d6 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/stat/stat-hour.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/stat/stat-hour.controller.ts @@ -23,7 +23,7 @@ export class StatHourController { @ApiOperation({ summary: '/info' }) @ApiResponse({ status: 200, description: '成功' }) async getInfo(@Query() query: Record): Promise> { - const result = await this.statHourServiceImplService.info(query); + const result = await this.statHourServiceImplService.info(id); return Result.success(result); } @@ -39,7 +39,7 @@ export class StatHourController { @ApiOperation({ summary: '/edit' }) @ApiResponse({ status: 200, description: '成功' }) async postEdit(@Body() body: Record): Promise> { - const result = await this.statHourServiceImplService.edit(body); + const result = await this.statHourServiceImplService.edit(id, body); return Result.success(result); } @@ -47,7 +47,7 @@ export class StatHourController { @ApiOperation({ summary: '/del' }) @ApiResponse({ status: 200, description: '成功' }) async postDel(@Body() body: Record): Promise> { - const result = await this.statHourServiceImplService.del(body); + const result = await this.statHourServiceImplService.del(id); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-agreement.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-agreement.controller.ts index 69cf0155..b4e1263c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-agreement.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-agreement.controller.ts @@ -23,7 +23,7 @@ export class SysAgreementController { @ApiOperation({ summary: '/agreement/{key}' }) @ApiResponse({ status: 200, description: '成功' }) async getAgreementkey(@Param('key') key: string, @Query() query: Record): Promise> { - const result = await this.sysAgreementServiceImplService.getAgreement(key, query); + const result = await this.sysAgreementServiceImplService.getAgreement(key); return Result.success(result); } @@ -31,7 +31,7 @@ export class SysAgreementController { @ApiOperation({ summary: '/agreement/{key}' }) @ApiResponse({ status: 200, description: '成功' }) async putAgreementkey(@Body() body: Record, @Param('key') key: string): Promise> { - const result = await this.sysAgreementServiceImplService.setAgreement(body, key); + const result = await this.sysAgreementServiceImplService.setAgreement(key, query, query); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-area.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-area.controller.ts index 8a2b5e6f..95c885c4 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-area.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-area.controller.ts @@ -15,7 +15,7 @@ export class SysAreaController { @ApiOperation({ summary: '/list_by_pid/{pid}' }) @ApiResponse({ status: 200, description: '成功' }) async getListbypidpid(@Param('pid') pid: string, @Query() query: Record): Promise> { - const result = await this.sysAreaServiceImplService.getListByPid(pid, query); + const result = await this.sysAreaServiceImplService.getListByPid(pid); return Result.success(result); } @@ -23,7 +23,7 @@ export class SysAreaController { @ApiOperation({ summary: '/tree/{level}' }) @ApiResponse({ status: 200, description: '成功' }) async getTreelevel(@Param('level') level: string, @Query() query: Record): Promise> { - const result = await this.sysAreaServiceImplService.getAreaTree(level, query); + const result = await this.sysAreaServiceImplService.getAreaTree(level); return Result.success(result); } @@ -31,7 +31,7 @@ export class SysAreaController { @ApiOperation({ summary: '/code/{code}' }) @ApiResponse({ status: 200, description: '成功' }) async getCodecode(@Param('code') code: string, @Query() query: Record): Promise> { - const result = await this.sysAreaServiceImplService.getAddressInfo(code, query); + const result = await this.sysAreaServiceImplService.getAddressInfo(query); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-attachment.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-attachment.controller.ts index 1082d3c3..cb640c34 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-attachment.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-attachment.controller.ts @@ -15,7 +15,7 @@ export class SysAttachmentController { @ApiOperation({ summary: '/attachment' }) @ApiResponse({ status: 200, description: '成功' }) async getAttachment(@Query() query: Record): Promise> { - const result = await this.sysAttachmentServiceImplService.list(query); + const result = await this.sysAttachmentServiceImplService.list(body, body); return Result.success(result); } @@ -23,7 +23,7 @@ export class SysAttachmentController { @ApiOperation({ summary: '/attachment/del' }) @ApiResponse({ status: 200, description: '成功' }) async deleteAttachmentdel(): Promise> { - const result = await this.sysAttachmentServiceImplService.del(); + const result = await this.sysAttachmentServiceImplService.del(body); return Result.success(result); } @@ -55,7 +55,7 @@ export class SysAttachmentController { @ApiOperation({ summary: '/document/{type}' }) @ApiResponse({ status: 200, description: '成功' }) async postDocumenttype(@Body() body: Record, @Param('type') type: string): Promise> { - const result = await this.sysAttachmentServiceImplService.document(body, type); + const result = await this.sysAttachmentServiceImplService.document(body); return Result.success(result); } @@ -63,7 +63,7 @@ export class SysAttachmentController { @ApiOperation({ summary: '/attachment/category' }) @ApiResponse({ status: 200, description: '成功' }) async getAttachmentcategory(@Query() query: Record): Promise> { - const result = await this.sysAttachmentServiceImplService.getCategoryList(query); + const result = await this.sysAttachmentServiceImplService.getCategoryList(body); return Result.success(result); } @@ -79,7 +79,7 @@ export class SysAttachmentController { @ApiOperation({ summary: '/attachment/category/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putAttachmentcategoryid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.sysAttachmentServiceImplService.editCategory(body, id); + const result = await this.sysAttachmentServiceImplService.editCategory(id, body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-config.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-config.controller.ts index e647eb66..e038835f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-config.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-config.controller.ts @@ -97,7 +97,7 @@ export class SysConfigController { @ApiOperation({ summary: '/config/layout' }) @ApiResponse({ status: 200, description: '成功' }) async putConfiglayout(@Body() body: Record): Promise> { - const result = await this.sysConfigServiceImplService.setLayout(body); + const result = await this.sysConfigServiceImplService.setLayout(query); return Result.success(result); } @@ -113,7 +113,7 @@ export class SysConfigController { @ApiOperation({ summary: '/config/themecolor' }) @ApiResponse({ status: 200, description: '成功' }) async putConfigthemecolor(@Body() body: Record): Promise> { - const result = await this.sysConfigServiceImplService.setThemeColor(body); + const result = await this.sysConfigServiceImplService.setThemeColor(query); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-export.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-export.controller.ts index 7670d38d..8e44cc2f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-export.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-export.controller.ts @@ -31,7 +31,7 @@ export class SysExportController { @ApiOperation({ summary: '/export/type' }) @ApiResponse({ status: 200, description: '成功' }) async getExporttype(@Query() query: Record): Promise> { - const result = await this.sysExportServiceImplService.checkExportData(query); + const result = await this.sysExportServiceImplService.checkExportData(query, query, query); return Result.success(result); } @@ -39,7 +39,7 @@ export class SysExportController { @ApiOperation({ summary: '/export/check/{type}' }) @ApiResponse({ status: 200, description: '成功' }) async getExportchecktype(@Param('type') type: string, @Query() query: Record): Promise> { - const result = await this.sysExportServiceImplService.checkExportData(type, query); + const result = await this.sysExportServiceImplService.checkExportData(type, query, query); return Result.success(result); } @@ -47,7 +47,7 @@ export class SysExportController { @ApiOperation({ summary: '/export/{type}' }) @ApiResponse({ status: 200, description: '成功' }) async getExporttype1(@Param('type') type: string, @Query() query: Record): Promise> { - const result = await this.sysExportServiceImplService.exportData(type, query); + const result = await this.sysExportServiceImplService.exportData(type, query, query); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-menu.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-menu.controller.ts index 637cfdff..07be9f8e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-menu.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-menu.controller.ts @@ -23,7 +23,7 @@ export class SysMenuController { @ApiOperation({ summary: '/menu/{appType}/info/{menuKey}' }) @ApiResponse({ status: 200, description: '成功' }) async getMenuappTypeinfomenuKey(@Param() params: Record, @Query() query: Record): Promise> { - const result = await this.sysMenuServiceImplService.get(params, query); + const result = await this.sysMenuServiceImplService.get(appType, menuKey); return Result.success(result); } @@ -39,7 +39,7 @@ export class SysMenuController { @ApiOperation({ summary: '/menu/{appType}/{menuKey}' }) @ApiResponse({ status: 200, description: '成功' }) async putMenuappTypemenuKey(@Body() body: Record, @Param() params: Record): Promise> { - const result = await this.sysMenuServiceImplService.edit(body, params); + const result = await this.sysMenuServiceImplService.edit(appType, menuKey, body); return Result.success(result); } @@ -47,7 +47,7 @@ export class SysMenuController { @ApiOperation({ summary: '/menu/{appType}/{menuKey}' }) @ApiResponse({ status: 200, description: '成功' }) async deleteMenuappTypemenuKey(@Param() params: Record): Promise> { - const result = await this.sysMenuServiceImplService.del(params); + const result = await this.sysMenuServiceImplService.del(appType, menuKey); return Result.success(result); } @@ -71,7 +71,7 @@ export class SysMenuController { @ApiOperation({ summary: '/menu/dir/{addon}' }) @ApiResponse({ status: 200, description: '成功' }) async getMenudiraddon(@Param('addon') addon: string, @Query() query: Record): Promise> { - const result = await this.sysMenuServiceImplService.getMenuByTypeDir(addon, query); + const result = await this.sysMenuServiceImplService.getMenuByTypeDir(addon); return Result.success(result); } @@ -79,7 +79,7 @@ export class SysMenuController { @ApiOperation({ summary: '/menu/addon_menu/{app_key}' }) @ApiResponse({ status: 200, description: '成功' }) async getMenuaddonmenuappkey(@Param('app_key') app_key: string, @Query() query: Record): Promise> { - const result = await this.sysMenuServiceImplService.getSystemMenu(app_key, query); + const result = await this.sysMenuServiceImplService.getSystemMenu(query, query, query); return Result.success(result); } @@ -87,7 +87,7 @@ export class SysMenuController { @ApiOperation({ summary: '/menu/system_menu' }) @ApiResponse({ status: 200, description: '成功' }) async getMenusystemmenu(@Query() query: Record): Promise> { - const result = await this.sysMenuServiceImplService.getSystemMenu(query); + const result = await this.sysMenuServiceImplService.getSystemMenu(query, query, query); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-notice.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-notice.controller.ts index 81506dbd..cf157b72 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-notice.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-notice.controller.ts @@ -23,7 +23,7 @@ export class SysNoticeController { @ApiOperation({ summary: '/info' }) @ApiResponse({ status: 200, description: '成功' }) async getInfo(@Query() query: Record): Promise> { - const result = await this.sysNoticeServiceImplService.info(query); + const result = await this.sysNoticeServiceImplService.info(id); return Result.success(result); } @@ -39,7 +39,7 @@ export class SysNoticeController { @ApiOperation({ summary: '/edit' }) @ApiResponse({ status: 200, description: '成功' }) async postEdit(@Body() body: Record): Promise> { - const result = await this.sysNoticeServiceImplService.edit(body); + const result = await this.sysNoticeServiceImplService.edit(id, body); return Result.success(result); } @@ -47,7 +47,7 @@ export class SysNoticeController { @ApiOperation({ summary: '/del' }) @ApiResponse({ status: 200, description: '成功' }) async postDel(@Body() body: Record): Promise> { - const result = await this.sysNoticeServiceImplService.del(body); + const result = await this.sysNoticeServiceImplService.del(id); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-poster.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-poster.controller.ts index d0001043..f3f5b9d5 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-poster.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-poster.controller.ts @@ -17,7 +17,7 @@ export class SysPosterController { @ApiOperation({ summary: '' }) @ApiResponse({ status: 200, description: '成功' }) async get(@Query() query: Record): Promise> { - const result = await this.sysPosterServiceImplService.page(query); + const result = await this.sysPosterServiceImplService.page(body, body); return Result.success(result); } @@ -25,7 +25,7 @@ export class SysPosterController { @ApiOperation({ summary: '/list' }) @ApiResponse({ status: 200, description: '成功' }) async getList(@Query() query: Record): Promise> { - const result = await this.sysPosterServiceImplService.list(query); + const result = await this.sysPosterServiceImplService.list(body); return Result.success(result); } @@ -33,7 +33,7 @@ export class SysPosterController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getId(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.sysPosterServiceImplService.info(id, query); + const result = await this.sysPosterServiceImplService.info(id); return Result.success(result); } @@ -49,7 +49,7 @@ export class SysPosterController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putId(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.sysPosterServiceImplService.edit(body, id); + const result = await this.sysPosterServiceImplService.edit(id, body); return Result.success(result); } @@ -73,7 +73,7 @@ export class SysPosterController { @ApiOperation({ summary: '/init' }) @ApiResponse({ status: 200, description: '成功' }) async getInit(@Query() query: Record): Promise> { - const result = await this.sysPosterServiceImplService.init(query); + const result = await this.sysPosterServiceImplService.init(body); return Result.success(result); } @@ -81,7 +81,7 @@ export class SysPosterController { @ApiOperation({ summary: '/template' }) @ApiResponse({ status: 200, description: '成功' }) async getTemplate(@Query() query: Record): Promise> { - const result = await this.sysPosterServiceImplService.template(query); + const result = await this.sysPosterServiceImplService.template(body); return Result.success(result); } @@ -89,7 +89,7 @@ export class SysPosterController { @ApiOperation({ summary: '/status' }) @ApiResponse({ status: 200, description: '成功' }) async putStatus(@Body() body: Record): Promise> { - const result = await this.sysPosterServiceImplService.modifyStatus(body); + const result = await this.sysPosterServiceImplService.modifyStatus(id, query); return Result.success(result); } @@ -97,7 +97,7 @@ export class SysPosterController { @ApiOperation({ summary: '/default' }) @ApiResponse({ status: 200, description: '成功' }) async putDefault(@Body() body: Record): Promise> { - const result = await this.sysPosterServiceImplService.modifyDefault(body); + const result = await this.sysPosterServiceImplService.modifyDefault(id); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-role.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-role.controller.ts index 068ba924..04440386 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-role.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-role.controller.ts @@ -39,7 +39,7 @@ export class SysRoleController { @ApiOperation({ summary: '/role/{roleId}' }) @ApiResponse({ status: 200, description: '成功' }) async getRoleroleId(@Param('roleId') roleId: string, @Query() query: Record): Promise> { - const result = await this.sysRoleServiceImplService.info(roleId, query); + const result = await this.sysRoleServiceImplService.info(id); return Result.success(result); } @@ -47,7 +47,7 @@ export class SysRoleController { @ApiOperation({ summary: '/role/{roleId}' }) @ApiResponse({ status: 200, description: '成功' }) async putRoleroleId(@Body() body: Record, @Param('roleId') roleId: string): Promise> { - const result = await this.sysRoleServiceImplService.edit(body, roleId); + const result = await this.sysRoleServiceImplService.edit(roleId, body); return Result.success(result); } @@ -55,7 +55,7 @@ export class SysRoleController { @ApiOperation({ summary: '/role/{roleId}' }) @ApiResponse({ status: 200, description: '成功' }) async deleteRoleroleId(@Param('roleId') roleId: string): Promise> { - const result = await this.sysRoleServiceImplService.del(roleId); + const result = await this.sysRoleServiceImplService.del(id); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-schedule.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-schedule.controller.ts index 963ac722..55e174a3 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-schedule.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-schedule.controller.ts @@ -23,7 +23,7 @@ export class SysScheduleController { @ApiOperation({ summary: '/info/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getInfoid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.sysScheduleServiceImplService.info(id, query); + const result = await this.sysScheduleServiceImplService.info(id); return Result.success(result); } @@ -31,7 +31,7 @@ export class SysScheduleController { @ApiOperation({ summary: '/modify/status/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putModifystatusid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.sysScheduleServiceImplService.modifyStatus(body, id); + const result = await this.sysScheduleServiceImplService.modifyStatus(body); return Result.success(result); } @@ -47,7 +47,7 @@ export class SysScheduleController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putId(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.sysScheduleServiceImplService.edit(body, id); + const result = await this.sysScheduleServiceImplService.edit(id, body); return Result.success(result); } @@ -95,7 +95,7 @@ export class SysScheduleController { @ApiOperation({ summary: '/log/list' }) @ApiResponse({ status: 200, description: '成功' }) async getLoglist(@Query() query: Record): Promise> { - const result = await this.sysScheduleServiceImplService.logList(query); + const result = await this.sysScheduleServiceImplService.logList(body, body); return Result.success(result); } @@ -103,7 +103,7 @@ export class SysScheduleController { @ApiOperation({ summary: '/do/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putDoid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.sysScheduleServiceImplService.doSchedule(body, id); + const result = await this.sysScheduleServiceImplService.doSchedule(id); return Result.success(result); } @@ -111,7 +111,7 @@ export class SysScheduleController { @ApiOperation({ summary: '/log/delete' }) @ApiResponse({ status: 200, description: '成功' }) async putLogdelete(@Body() body: Record): Promise> { - const result = await this.sysScheduleServiceImplService.delLog(body); + const result = await this.sysScheduleServiceImplService.delLog(query); return Result.success(result); } @@ -119,7 +119,7 @@ export class SysScheduleController { @ApiOperation({ summary: '/log/clear' }) @ApiResponse({ status: 200, description: '成功' }) async putLogclear(@Body() body: Record): Promise> { - const result = await this.sysScheduleServiceImplService.clearLog(body); + const result = await this.sysScheduleServiceImplService.clearLog(scheduleId); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-user-role.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-user-role.controller.ts index 1427fa2a..42df157a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-user-role.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/sys/sys-user-role.controller.ts @@ -23,7 +23,7 @@ export class SysUserRoleController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getId(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.sysUserRoleServiceImplService.info(id, query); + const result = await this.sysUserRoleServiceImplService.info(id); return Result.success(result); } @@ -39,7 +39,7 @@ export class SysUserRoleController { @ApiOperation({ summary: '/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putId(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.sysUserRoleServiceImplService.edit(body, id); + const result = await this.sysUserRoleServiceImplService.edit(body); return Result.success(result); } @@ -47,7 +47,7 @@ export class SysUserRoleController { @ApiOperation({ summary: '/del' }) @ApiResponse({ status: 200, description: '成功' }) async postDel(@Body() body: Record): Promise> { - const result = await this.sysUserRoleServiceImplService.del(body); + const result = await this.sysUserRoleServiceImplService.del(id); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/upload/storage.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/upload/storage.controller.ts index 0c05af9b..2b97d605 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/upload/storage.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/upload/storage.controller.ts @@ -25,7 +25,7 @@ export class StorageController { @ApiOperation({ summary: '/storage/{storageType}' }) @ApiResponse({ status: 200, description: '成功' }) async getStoragestorageType(@Param('storageType') storageType: string, @Query() query: Record): Promise> { - const result = await this.storageConfigServiceImplService.getStorageConfig(storageType, query); + const result = await this.storageConfigServiceImplService.getStorageConfig(storageType); return Result.success(result); } @@ -33,7 +33,7 @@ export class StorageController { @ApiOperation({ summary: '/storage/{storageType}' }) @ApiResponse({ status: 200, description: '成功' }) async putStoragestorageType(@Body() body: Record, @Param('storageType') storageType: string): Promise> { - const result = await this.storageConfigServiceImplService.setStorageConfig(body, storageType); + const result = await this.storageConfigServiceImplService.setStorageConfig(storageType, query); return Result.success(result); } @@ -41,7 +41,7 @@ export class StorageController { @ApiOperation({ summary: '/log/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getLogid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.sysUserLogServiceImplService.info(id, query); + const result = await this.sysUserLogServiceImplService.info(id); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/user/user.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/user/user.controller.ts index 864352fd..9fb74b15 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/user/user.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/user/user.controller.ts @@ -23,7 +23,7 @@ export class UserController { @ApiOperation({ summary: '/user/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getUserid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.sysUserServiceImplService.info(id, query); + const result = await this.sysUserServiceImplService.info(id); return Result.success(result); } @@ -39,7 +39,7 @@ export class UserController { @ApiOperation({ summary: '/user/{uid}' }) @ApiResponse({ status: 200, description: '成功' }) async putUseruid(@Body() body: Record, @Param('uid') uid: string): Promise> { - const result = await this.sysUserServiceImplService.edit(body, uid); + const result = await this.sysUserServiceImplService.edit(uid, body); return Result.success(result); } @@ -55,7 +55,7 @@ export class UserController { @ApiOperation({ summary: '/user/create_site_limit/{uid}' }) @ApiResponse({ status: 200, description: '成功' }) async getUsercreatesitelimituid(@Param('uid') uid: string, @Query() query: Record): Promise> { - const result = await this.sysUserServiceImplService.getUserCreateSiteLimit(uid, query); + const result = await this.sysUserServiceImplService.getUserCreateSiteLimit(uid); return Result.success(result); } @@ -63,7 +63,7 @@ export class UserController { @ApiOperation({ summary: '/user/create_site_limit/info/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getUsercreatesitelimitinfoid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.sysUserServiceImplService.getUserCreateSiteLimitInfo(id, query); + const result = await this.sysUserServiceImplService.getUserCreateSiteLimitInfo(id); return Result.success(result); } @@ -79,7 +79,7 @@ export class UserController { @ApiOperation({ summary: '/user/create_site_limit/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putUsercreatesitelimitid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.sysUserServiceImplService.editUserCreateSiteLimit(body, id); + const result = await this.sysUserServiceImplService.editUserCreateSiteLimit(body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/verify/verifier.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/verify/verifier.controller.ts index 206b0d88..b53bee3b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/verify/verifier.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/verify/verifier.controller.ts @@ -15,7 +15,7 @@ export class VerifierController { @ApiOperation({ summary: '' }) @ApiResponse({ status: 200, description: '成功' }) async get(@Query() query: Record): Promise> { - const result = await this.verifierServiceImplService.list(query); + const result = await this.verifierServiceImplService.list(body, body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/verify/verify.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/verify/verify.controller.ts index 420f9fe2..f25aa4cd 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/verify/verify.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/verify/verify.controller.ts @@ -15,7 +15,7 @@ export class VerifyController { @ApiOperation({ summary: '/record' }) @ApiResponse({ status: 200, description: '成功' }) async getRecord(@Query() query: Record): Promise> { - const result = await this.verifyServiceImplService.list(query); + const result = await this.verifyServiceImplService.list(body, body); return Result.success(result); } @@ -23,7 +23,7 @@ export class VerifyController { @ApiOperation({ summary: '/{verify_code}' }) @ApiResponse({ status: 200, description: '成功' }) async getVerifycode(@Param('verify_code') verify_code: string, @Query() query: Record): Promise> { - const result = await this.verifyServiceImplService.detail(verify_code, query); + const result = await this.verifyServiceImplService.detail(query); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/weapp/config.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/weapp/config.controller.ts index c14ef69d..a292fe06 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/weapp/config.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/weapp/config.controller.ts @@ -47,7 +47,7 @@ export class ConfigController { @ApiOperation({ summary: '/privacysetting' }) @ApiResponse({ status: 200, description: '成功' }) async putPrivacysetting(@Body() body: Record): Promise> { - const result = await this.weappConfigServiceImplService.setPrivacySetting(body); + const result = await this.weappConfigServiceImplService.setPrivacySetting(query); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/weapp/version.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/weapp/version.controller.ts index 7a846c18..f1d955fb 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/weapp/version.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/weapp/version.controller.ts @@ -23,7 +23,7 @@ export class VersionController { @ApiOperation({ summary: '/version' }) @ApiResponse({ status: 200, description: '成功' }) async getVersion(@Query() query: Record): Promise> { - const result = await this.weappVersionServiceImplService.list(query); + const result = await this.weappVersionServiceImplService.list(body); return Result.success(result); } @@ -39,7 +39,7 @@ export class VersionController { @ApiOperation({ summary: '/upload/{key}' }) @ApiResponse({ status: 200, description: '成功' }) async getUploadkey(@Param('key') key: string, @Query() query: Record): Promise> { - const result = await this.weappVersionServiceImplService.getWeappCompileLog(key, query); + const result = await this.weappVersionServiceImplService.getWeappCompileLog(key); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wechat/media.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wechat/media.controller.ts index 88f601d0..e38eee72 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wechat/media.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wechat/media.controller.ts @@ -15,7 +15,7 @@ export class MediaController { @ApiOperation({ summary: '/media' }) @ApiResponse({ status: 200, description: '成功' }) async getMedia(@Query() query: Record): Promise> { - const result = await this.wechatMediaServiceImplService.list(query); + const result = await this.wechatMediaServiceImplService.list(body, body); return Result.success(result); } @@ -23,7 +23,7 @@ export class MediaController { @ApiOperation({ summary: '/media/image' }) @ApiResponse({ status: 200, description: '成功' }) async postMediaimage(@Body() body: Record): Promise> { - const result = await this.wechatMediaServiceImplService.image(body); + const result = await this.wechatMediaServiceImplService.image(query); return Result.success(result); } @@ -31,7 +31,7 @@ export class MediaController { @ApiOperation({ summary: '/media/video' }) @ApiResponse({ status: 200, description: '成功' }) async postMediavideo(@Body() body: Record): Promise> { - const result = await this.wechatMediaServiceImplService.video(body); + const result = await this.wechatMediaServiceImplService.video(query); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wechat/menu.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wechat/menu.controller.ts index 1dd649a4..be8808a7 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wechat/menu.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wechat/menu.controller.ts @@ -23,7 +23,7 @@ export class MenuController { @ApiOperation({ summary: '/menu' }) @ApiResponse({ status: 200, description: '成功' }) async putMenu(@Body() body: Record): Promise> { - const result = await this.wechatMenuServiceImplService.edit(body); + const result = await this.wechatMenuServiceImplService.edit(query); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wechat/reply.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wechat/reply.controller.ts index 42a04a0f..2047ae6d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wechat/reply.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wechat/reply.controller.ts @@ -15,7 +15,7 @@ export class ReplyController { @ApiOperation({ summary: '/keywords' }) @ApiResponse({ status: 200, description: '成功' }) async getKeywords(@Query() query: Record): Promise> { - const result = await this.wechatReplyServiceImplService.getKeywordList(query); + const result = await this.wechatReplyServiceImplService.getKeywordList(body, body); return Result.success(result); } @@ -23,7 +23,7 @@ export class ReplyController { @ApiOperation({ summary: '/keywords/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getKeywordsid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.wechatReplyServiceImplService.getKeywordInfo(id, query); + const result = await this.wechatReplyServiceImplService.getKeywordInfo(id); return Result.success(result); } @@ -39,7 +39,7 @@ export class ReplyController { @ApiOperation({ summary: '/keywords/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async putKeywordsid(@Body() body: Record, @Param('id') id: string): Promise> { - const result = await this.wechatReplyServiceImplService.editKeyword(body, id); + const result = await this.wechatReplyServiceImplService.editKeyword(id, body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wxoplatform/oplatform.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wxoplatform/oplatform.controller.ts index d9ead48f..112c70ed 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wxoplatform/oplatform.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wxoplatform/oplatform.controller.ts @@ -23,7 +23,7 @@ export class OplatformController { @ApiOperation({ summary: '/authorization' }) @ApiResponse({ status: 200, description: '成功' }) async getAuthorization(@Query() query: Record): Promise> { - const result = await this.oplatformServiceImplService.authorization(query); + const result = await this.oplatformServiceImplService.authorization(body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wxoplatform/weapp-version.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wxoplatform/weapp-version.controller.ts index bc72ed50..abdf3251 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wxoplatform/weapp-version.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/wxoplatform/weapp-version.controller.ts @@ -23,7 +23,7 @@ export class WeappVersionController { @ApiOperation({ summary: '/weapp/commit' }) @ApiResponse({ status: 200, description: '成功' }) async getWeappcommit(@Query() query: Record): Promise> { - const result = await this.weappVersionServiceImplService.list(query); + const result = await this.weappVersionServiceImplService.list(body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/channel/app.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/channel/app.controller.ts index 4d2dbe02..7096c1d2 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/channel/app.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/channel/app.controller.ts @@ -21,7 +21,7 @@ export class AppController { @ApiOperation({ summary: '/app/newversion' }) @ApiResponse({ status: 200, description: '成功' }) async getAppnewversion(@Query() query: Record): Promise> { - const result = await this.appServiceImplService.getNewVersion(query); + const result = await this.appServiceImplService.getNewVersion(body); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/login/login.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/login/login.controller.ts index c5fa424d..771e1646 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/login/login.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/login/login.controller.ts @@ -29,7 +29,7 @@ export class LoginController { @ApiOperation({ summary: '/login/mobile' }) @ApiResponse({ status: 200, description: '成功' }) async postLoginmobile(@Body() body: Record): Promise> { - const result = await this.registerServiceImplService.checkLoginConfig(body); + const result = await this.registerServiceImplService.checkLoginConfig(query); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/login/register.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/login/register.controller.ts index 34074733..6b6682c7 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/login/register.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/login/register.controller.ts @@ -17,7 +17,7 @@ export class RegisterController { @ApiOperation({ summary: '/register' }) @ApiResponse({ status: 200, description: '成功' }) async postRegister(@Body() body: Record): Promise> { - const result = await this.registerServiceImplService.checkLoginConfig(body); + const result = await this.registerServiceImplService.checkLoginConfig(query); return Result.success(result); } @@ -25,7 +25,7 @@ export class RegisterController { @ApiOperation({ summary: '/register/mobile' }) @ApiResponse({ status: 200, description: '成功' }) async postRegistermobile(@Body() body: Record): Promise> { - const result = await this.registerServiceImplService.checkLoginConfig(body); + const result = await this.registerServiceImplService.checkLoginConfig(query); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/sys/upload.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/sys/upload.controller.ts index cf473837..85056a6f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/sys/upload.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/sys/upload.controller.ts @@ -39,7 +39,7 @@ export class UploadController { @ApiOperation({ summary: '/image/base64' }) @ApiResponse({ status: 200, description: '成功' }) async postImagebase64(@Body() body: Record): Promise> { - const result = await this.base64ServiceImplService.image(body); + const result = await this.base64ServiceImplService.image(query); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/wechat/wechat.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/wechat/wechat.controller.ts index 82759a50..c513a172 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/wechat/wechat.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/api/wechat/wechat.controller.ts @@ -13,7 +13,7 @@ export class WechatController { @ApiOperation({ summary: '/codeurl' }) @ApiResponse({ status: 200, description: '成功' }) async getCodeurl(@Query() query: Record): Promise> { - const result = await this.wechatServiceImplService.getCodeUrl(query); + const result = await this.wechatServiceImplService.getCodeUrl(query, query); return Result.success(result); } @@ -21,7 +21,7 @@ export class WechatController { @ApiOperation({ summary: '/user' }) @ApiResponse({ status: 200, description: '成功' }) async getUser(@Query() query: Record): Promise> { - const result = await this.wechatServiceImplService.getWechatUser(query); + const result = await this.wechatServiceImplService.getWechatUser(body); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/core/core-addon.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/core/core-addon.controller.ts index d837d2cc..f1dbbb85 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/core/core-addon.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/core/core-addon.controller.ts @@ -21,7 +21,7 @@ export class CoreAddonController { @ApiOperation({ summary: '/setup/{id}' }) @ApiResponse({ status: 200, description: '成功' }) async getSetupid(@Param('id') id: string, @Query() query: Record): Promise> { - const result = await this.coreAddonInstallServiceImplService.installCheck(id, query); + const result = await this.coreAddonInstallServiceImplService.installCheck(query); return Result.success(result); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/core/core-async.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/core/core-async.controller.ts index 8c285dff..2a71f82e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/core/core-async.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/core/core-async.controller.ts @@ -13,7 +13,7 @@ export class CoreAsyncTaskController { @ApiOperation({ summary: '/sync' }) @ApiResponse({ status: 200, description: '成功' }) async getSync(@Query() query: Record): Promise> { - const result = await this.coreAsyncTaskServiceImplService.execute(query); + const result = await this.coreAsyncTaskServiceImplService.execute(body); return Result.success(result); } @@ -21,7 +21,7 @@ export class CoreAsyncTaskController { @ApiOperation({ summary: '/async' }) @ApiResponse({ status: 200, description: '成功' }) async getAsync(@Query() query: Record): Promise> { - const result = await this.coreAsyncTaskServiceImplService.executeAsyncTask(query); + const result = await this.coreAsyncTaskServiceImplService.executeAsyncTask(body); return Result.success(result); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/core/core-queue-control.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/core/core-queue-control.controller.ts index e42b65f1..e743aeda 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/core/core-queue-control.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/core/core-queue-control.controller.ts @@ -13,7 +13,7 @@ export class CoreQueueControlController { @ApiOperation({ summary: '/exec' }) @ApiResponse({ status: 200, description: '成功' }) async getExec(@Query() query: Record): Promise> { - const result = await this.coreQueueServiceImplService.execUseQueue(query); + const result = await this.coreQueueServiceImplService.execUseQueue(body); return Result.success(result); } }