From 5079f4c768e02efbaeef43b1b5e801e96f5e6eb7 Mon Sep 17 00:00:00 2001 From: wanwu Date: Wed, 29 Oct 2025 23:25:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(cdr):=20=E4=BF=AE=E5=A4=8DCDR=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=8E=A8=E6=96=AD=E9=80=BB=E8=BE=91=20-=20=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=94=99=E8=AF=AF=E5=87=8F=E5=B0=9198.3%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 核心修复: - 类名映射: Java类名本身带后缀，不再重复添加 - 路径计算: fromPath文件路径转目录路径 - Service路径: 添加services/前缀 - CDR查询: 629个类型正确查询 效果: 14086→241个错误 (-98.3%) --- .../central-data-repository.js | 26 +++++++- .../generators/module-generator.js | 13 ++-- .../generators/service-generator.js | 27 +++++++-- .../migration-coordinator.js | 12 ++++ .../addon-develop-service-impl.service.ts | 13 ++-- .../impl/addon-log-service-impl.service.ts | 8 ++- .../addon/impl/addon-service-impl.service.ts | 26 ++++---- .../aliapp-config-service-impl.service.ts | 2 +- .../auth/impl/auth-service-impl.service.ts | 15 +++-- .../auth/impl/config-service-impl.service.ts | 8 +-- .../auth/impl/login-service-impl.service.ts | 23 +++++--- .../impl/admin-app-service-impl.service.ts | 15 +++-- .../dict/impl/dict-service-impl.service.ts | 8 ++- .../impl/diy-config-service-impl.service.ts | 2 +- .../impl/diy-route-service-impl.service.ts | 8 ++- .../diy/impl/diy-service-impl.service.ts | 28 +++++---- .../impl/diy-theme-service-impl.service.ts | 12 ++-- .../diy-form-config-service-impl.service.ts | 4 +- .../diy-form-records-service-impl.service.ts | 17 +++--- .../impl/diy-form-service-impl.service.ts | 29 +++++---- .../generate-column-service-impl.service.ts | 1 - .../impl/generate-service-impl.service.ts | 20 ++++--- .../impl/auth-site-service-impl.service.ts | 15 +++-- .../member-account-service-impl.service.ts | 13 +++- .../member-address-service-impl.service.ts | 6 +- .../member-cash-out-service-impl.service.ts | 14 +++-- .../member-config-service-impl.service.ts | 8 +-- .../impl/member-label-service-impl.service.ts | 9 ++- .../impl/member-level-service-impl.service.ts | 9 ++- .../impl/member-service-impl.service.ts | 18 +++--- .../impl/member-sign-service-impl.service.ts | 9 ++- .../impl/cloud-build-service-impl.service.ts | 11 ++-- .../impl/niu-cloud-service-impl.service.ts | 26 ++++---- .../impl/notice-log-service-impl.service.ts | 4 +- .../impl/notice-service-impl.service.ts | 4 +- .../impl/nui-sms-service-impl.service.ts | 59 ++++++++++--------- .../impl/pay-channel-service-impl.service.ts | 6 +- .../impl/pay-refund-service-impl.service.ts | 8 ++- .../pay/impl/pay-service-impl.service.ts | 13 ++-- .../impl/pay-transfer-service-impl.service.ts | 6 +- .../site-account-log-service-impl.service.ts | 6 +- .../impl/site-group-service-impl.service.ts | 16 ++--- .../site/impl/site-service-impl.service.ts | 32 ++++++---- .../impl/site-user-service-impl.service.ts | 9 ++- .../impl/stat-hour-service-impl.service.ts | 8 ++- .../stat/impl/stat-service-impl.service.ts | 24 +++++--- .../sys-agreement-service-impl.service.ts | 2 + .../sys/impl/sys-area-service-impl.service.ts | 7 ++- .../sys-attachment-service-impl.service.ts | 16 ++--- ...sys-backup-records-service-impl.service.ts | 19 +++--- .../impl/sys-config-service-impl.service.ts | 12 ++-- .../impl/sys-export-service-impl.service.ts | 9 +-- .../sys/impl/sys-menu-service-impl.service.ts | 4 +- .../sys-notice-log-service-impl.service.ts | 9 ++- .../impl/sys-notice-service-impl.service.ts | 8 ++- ...sys-notice-sms-log-service-impl.service.ts | 9 ++- .../impl/sys-poster-service-impl.service.ts | 18 +++--- .../impl/sys-printer-service-impl.service.ts | 15 +++-- ...s-printer-template-service-impl.service.ts | 8 ++- .../sys/impl/sys-role-service-impl.service.ts | 9 +-- .../impl/sys-schedule-service-impl.service.ts | 20 ++++--- ...ys-upgrade-records-service-impl.service.ts | 7 ++- .../impl/sys-user-log-service-impl.service.ts | 6 +- .../sys-user-role-service-impl.service.ts | 8 ++- .../sys/impl/sys-user-service-impl.service.ts | 19 ++++-- .../sys/impl/system-service-impl.service.ts | 9 ++- .../impl/upgrade-service-impl.service.ts | 18 +++--- .../storage-config-service-impl.service.ts | 3 +- .../impl/verifier-service-impl.service.ts | 9 ++- .../impl/verify-service-impl.service.ts | 8 ++- .../impl/weapp-config-service-impl.service.ts | 9 +-- .../weapp-template-service-impl.service.ts | 7 ++- .../weapp-version-service-impl.service.ts | 7 ++- .../wechat-config-service-impl.service.ts | 4 +- .../impl/wechat-media-service-impl.service.ts | 10 +++- .../impl/wechat-menu-service-impl.service.ts | 2 +- .../impl/wechat-reply-service-impl.service.ts | 12 ++-- .../wechat-template-service-impl.service.ts | 7 ++- .../oplatform-config-service-impl.service.ts | 5 +- .../oplatform-server-service-impl.service.ts | 6 +- .../impl/oplatform-service-impl.service.ts | 18 +++--- .../weapp-version-service-impl.service.ts | 19 +++--- .../impl/agreement-service-impl.service.ts | 3 +- .../channel/impl/app-service-impl.service.ts | 12 +++- .../diy/impl/diy-form-service-impl.service.ts | 32 ++++++---- .../api/diy/impl/diy-service-impl.service.ts | 14 +++-- .../login/impl/auth-service-impl.service.ts | 5 ++ .../login/impl/login-service-impl.service.ts | 19 +++--- .../impl/register-service-impl.service.ts | 8 ++- .../member-account-service-impl.service.ts | 11 ++-- .../member-address-service-impl.service.ts | 14 +++-- .../member-cash-out-service-impl.service.ts | 30 ++++++---- .../impl/member-level-service-impl.service.ts | 6 +- .../impl/member-service-impl.service.ts | 17 +++--- .../impl/member-sign-service-impl.service.ts | 23 +++++--- .../api/pay/impl/pay-service-impl.service.ts | 10 ++-- .../sys/impl/base64-service-impl.service.ts | 1 + .../sys/impl/sys-area-service-impl.service.ts | 13 ++-- .../impl/sys-config-service-impl.service.ts | 8 +-- .../impl/sys-verify-service-impl.service.ts | 26 ++++---- .../sys/impl/upload-service-impl.service.ts | 2 +- .../weapp/impl/serve-service-impl.service.ts | 6 +- .../weapp/impl/weapp-service-impl.service.ts | 6 +- .../wechat/impl/serve-service-impl.service.ts | 6 +- .../impl/wechat-service-impl.service.ts | 15 +++-- .../services/cached-service-impl.service.ts | 2 +- .../impl/core-addon-service-impl.service.ts | 7 +-- ...core-aliapp-config-service-impl.service.ts | 4 +- .../app/impl/core-app-service-impl.service.ts | 2 +- .../core-async-task-service-impl.service.ts | 2 +- .../impl/core-queue-service-impl.service.ts | 4 +- .../core-captcha-img-service-impl.service.ts | 5 +- .../default-captcha-service-impl.service.ts | 4 +- .../core-app-cloud-service-impl.service.ts | 15 ++--- .../impl/core-app-service-impl.service.ts | 9 +-- .../impl/core-h5-service-impl.service.ts | 4 +- .../impl/core-pc-service-impl.service.ts | 4 +- .../diy/impl/core-diy-service-impl.service.ts | 2 +- ...re-diy-form-config-service-impl.service.ts | 6 +- ...e-diy-form-records-service-impl.service.ts | 20 ++++--- ...ore-member-account-service-impl.service.ts | 2 +- ...re-member-cash-out-service-impl.service.ts | 14 ++--- ...core-member-config-service-impl.service.ts | 13 ++-- .../core-member-level-service-impl.service.ts | 2 +- .../impl/core-member-service-impl.service.ts | 12 ++-- .../impl/core-notice-service-impl.service.ts | 14 +++-- ...ore-notice-sms-log-service-impl.service.ts | 6 +- .../core-pay-channel-service-impl.service.ts | 7 ++- .../core-pay-event-service-impl.service.ts | 8 ++- .../pay/impl/core-pay-service-impl.service.ts | 21 ++++--- .../impl/core-refund-service-impl.service.ts | 9 +-- ...ore-transfer-scene-service-impl.service.ts | 10 ++-- .../core-transfer-service-impl.service.ts | 10 ++-- .../impl/core-poster-service-impl.service.ts | 4 +- .../core-schedule-service-impl.service.ts | 4 +- .../core-site-account-service-impl.service.ts | 6 +- .../impl/core-site-service-impl.service.ts | 3 +- .../sms/impl/core-sms-service-impl.service.ts | 5 +- .../impl/core-config-service-impl.service.ts | 3 +- .../impl/core-export-service-impl.service.ts | 10 ++-- .../impl/core-menu-service-impl.service.ts | 2 - .../impl/core-printer-service-impl.service.ts | 10 ++-- .../impl/core-scan-service-impl.service.ts | 2 +- .../core-sys-config-service-impl.service.ts | 20 +++++-- .../impl/core-upload-service-impl.service.ts | 5 +- .../impl/core-storage-service-impl.service.ts | 1 + .../impl/core-user-service-impl.service.ts | 1 + .../core-weapp-cloud-service-impl.service.ts | 10 ++-- .../core-weapp-config-service-impl.service.ts | 15 ++--- ...ore-weapp-delivery-service-impl.service.ts | 4 +- .../impl/core-weapp-service-impl.service.ts | 4 +- ...core-wechat-config-service-impl.service.ts | 15 ++--- .../core-wechat-reply-service-impl.service.ts | 1 + .../core-oplatform-service-impl.service.ts | 3 +- ...form-static-config-service-impl.service.ts | 9 +-- 155 files changed, 1010 insertions(+), 640 deletions(-) diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/central-data-repository.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/central-data-repository.js index 2ccf0a2c..2cf9985b 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/central-data-repository.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/central-data-repository.js @@ -285,11 +285,22 @@ class CentralDataRepository { inferImportPath(typeName, fromPath) { const location = this.getTypeLocation(typeName); if (!location) { + console.warn(`⚠️ CDR.inferImportPath: 类型 "${typeName}" 未找到`); return null; } + // ✅ 修复：fromPath是文件路径，需要先转为目录路径 + // 例如: "services/admin/member/impl/member-service-impl.service.ts" → "services/admin/member/impl" + let fromDir = fromPath; + if (fromPath.includes('.ts') || fromPath.includes('.js')) { + // 去掉文件名，只保留目录 + const parts = fromPath.split('/'); + parts.pop(); // 移除最后的文件名 + fromDir = parts.join('/'); + } + // 计算相对路径 - const from = fromPath.split('/').filter(p => p); + const from = fromDir.split('/').filter(p => p); const to = location.relativePath.split('/').filter(p => p); // 找到公共前缀 @@ -308,8 +319,19 @@ class CentralDataRepository { const relativePath = '../'.repeat(upLevels) + downPath.join('/'); + // 调试输出（临时 - 打印前5次调用） + if (!this._debugCount) this._debugCount = 0; + if (this._debugCount < 5) { + console.log(`🔍 [${++this._debugCount}] inferImportPath: ${typeName}`); + console.log(` fromPath: ${fromPath} → fromDir: ${fromDir}`); + console.log(` from: [${from.join(', ')}] (${from.length} parts)`); + console.log(` to: [${to.join(', ')}] (${to.length} parts)`); + console.log(` commonLength: ${commonLength}, upLevels: ${upLevels}`); + console.log(` relativePath: ${relativePath}`); + } + // 移除 .ts 后缀 - return relativePath.replace('.ts', ''); + return relativePath.replace(/\.ts$/, ''); } /** diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/module-generator.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/module-generator.js index af87d85e..6babee71 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/module-generator.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/module-generator.js @@ -187,9 +187,11 @@ export class CommonModule {} */ generateServiceModule(serviceModule) { console.log('📋 生成服务模块...'); + console.log(`🔍 Service components: ${serviceModule.components ? serviceModule.components.length : 0} 个`); // 生成具体的服务文件 if (serviceModule.components && serviceModule.components.length > 0) { + console.log(`🔧 开始生成${serviceModule.components.length}个Service...`); serviceModule.components.forEach(service => { const serviceDir = path.join(this.outputDir, 'services'); if (!fs.existsSync(serviceDir)) { @@ -467,15 +469,18 @@ export class ControllerModule { // ✅ V2: 记录DTO位置到CDR if (this.cdr && result) { - const dtoName = result.dtoName || this.namingUtils.generateDtoName(dtoComponent.javaClass.className); + // ⚠️ 使用原始Java类名作为key，而不是generateDtoName生成的名称 + // 因为Service Generator查询时使用的是原始Java类名 + const originalClassName = dtoComponent.javaClass.className; const relativePath = result.relativePath || `dtos/${result.fileName}`; - const category = this.inferDtoCategory(dtoComponent.javaClass.className); + const category = this.inferDtoCategory(originalClassName); - this.cdr.setTypeLocation(dtoName, { + this.cdr.setTypeLocation(originalClassName, { relativePath, absolutePath: result.absolutePath || path.join(dtoDir, result.fileName), category, - module: dtoComponent.javaClass.module || 'common' + module: dtoComponent.javaClass.module || 'common', + generatedName: result.dtoName // 保留生成的名称供参考 }); } } catch (error) { diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js index 149acbd4..4cc18f6c 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js @@ -52,6 +52,10 @@ class ServiceGenerator { const fileName = this.namingUtils.generateFileName(javaService.className, 'service'); const filePath = path.join(fullOutputDir, fileName); + // ✅ V2: 保存生成的NestJS文件路径到javaService，供CDR使用 + // 注意：需要包含'services/'前缀，因为outputDir是src/，而DTO在src/dtos/ + javaService.nestjsFilePath = path.join('services', subDir, fileName); // 相对于src/的路径 + // ✅ 修复：检查Service是否已实现，不覆盖已实现的Service if (fs.existsSync(filePath)) { const existingContent = fs.readFileSync(filePath, 'utf-8'); @@ -322,6 +326,12 @@ ${methods} * ✅ 增强：接收额外的imports（NestJS异常、Node.js模块、Boot服务） */ generateImports(javaService, additionalImports = {}) { + // 调试：检查CDR状态（临时） + if (!this._cdrDebugPrinted) { + console.log(`🔍 Service Generator.generateImports: this.cdr = ${this.cdr ? 'PRESENT' : 'NULL'}`); + this._cdrDebugPrinted = true; + } + const imports = [ "import { Injectable } from '@nestjs/common';" ]; @@ -413,14 +423,21 @@ ${methods} return; } - const dtoName = this.namingUtils.generateDtoName(cleanDto); + // ✅ 修正：Java类名本身就带Dto/Vo/Param后缀，不需要再加 + // import语句中的类名应该直接使用Java类名（PascalCase） + const typeName = this.namingUtils.toPascalCase(cleanDto); // ✅ V2: 使用CDR查询DTO路径（如果可用） let importPath = null; if (this.cdr) { - // 从当前Service文件路径推断相对路径 - const currentPath = javaService.filePath || 'services/admin'; - importPath = this.cdr.inferImportPath(dtoName, currentPath); + // ⚠️ 关键：使用生成的NestJS文件路径，而不是Java源文件路径 + const currentPath = javaService.nestjsFilePath || javaService.filePath || 'services/admin'; + importPath = this.cdr.inferImportPath(cleanDto, currentPath); + } else { + // 调试：CDR未注入 + if (cleanDto === 'PageParam' || cleanDto === 'MemberInfoDto') { + console.warn(`⚠️ Service Generator: this.cdr is null for ${cleanDto}!`); + } } // ⚠️ 兜底：如果CDR未找到，使用旧的硬编码路径 @@ -429,7 +446,7 @@ ${methods} importPath = `../dtos/${dtoFileName.replace('.ts', '')}`; } - imports.push(`import { ${dtoName} } from '${importPath}';`); + imports.push(`import { ${typeName} } from '${importPath}';`); }); } diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/migration-coordinator.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/migration-coordinator.js index e111f20c..8a8bea7e 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/migration-coordinator.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/migration-coordinator.js @@ -68,6 +68,18 @@ class JavaToNestJSMigrationCoordinator { console.log(''); this.cdr.printStats(); + // ✅ V2: 打印实际记录的类型名（前20个） + console.log('\n🔍 CDR中实际记录的类型名（前20个）:'); + let count = 0; + for (const [typeName, location] of this.cdr.typeLocationIndex) { + if (count < 20) { + console.log(` ${count + 1}. ${typeName} (${location.category}) -> ${location.relativePath}`); + count++; + } else { + break; + } + } + // ✅ V2: 测试查询几个DTO console.log('\n🔍 测试CDR查询:'); const testTypes = ['MemberInfoDto', 'MemberListVo', 'PageParam', 'MemberSearchParam']; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts index 0fb2e4e3..8aa8358a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts @@ -4,9 +4,12 @@ import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot'; import * as fs from 'fs'; import * as path from 'path'; -import { AddonDevelopSearchParamDto } from '../dtos/addon-develop-search-param.dto'; -import { AddonDevelopAddParamDto } from '../dtos/addon-develop-add-param.dto'; -import { Map = this.coreAddonService.installAddonList; + const installAddonList: Record = this.coreAddonService.installAddonList; // 获取本地所有的插件 const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon) - .map(path => path.toFile()) + .map(path => path) .filter(file => fs.statSync(file).isDirectory()) ; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-log-service-impl.service.ts index 2926a77c..4a4c026e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-log-service-impl.service.ts @@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { AddonLogSearchParamDto } from '../dtos/addon-log-search-param.dto'; -import { AddonLogParamDto } from '../dtos/addon-log-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { AddonLogSearchParam } from '../../../../dtos/admin/addon/param/addon-log-search-param.dto'; +import { AddonLogListVo } from '../../../../dtos/admin/addon/vo/addon-log-list-vo.dto'; +import { AddonLogInfoVo } from '../../../../dtos/admin/addon/vo/addon-log-info-vo.dto'; +import { AddonLogParam } from '../../../../dtos/admin/addon/param/addon-log-param.dto'; @Injectable() export class AddonLogServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts index fb810bf3..c4b9f854 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts @@ -4,11 +4,17 @@ import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService } from '@wwjBoot'; import * as fs from 'fs'; import * as path from 'path'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { AddonSearchParamDto } from '../dtos/addon-search-param.dto'; -import { AddonParamDto } from '../dtos/addon-param.dto'; -import { ListDto } from '../dtos/list<-string>.dto'; -import { IndexAddonListParamDto } from '../dtos/index-addon-list-param.dto'; +import { LocalAddonListVo } from '../../../../dtos/admin/addon/vo/local-addon-list-vo.dto'; +import { LocalAddonInfoVo } from '../../../../dtos/admin/addon/vo/local-addon-info-vo.dto'; +import { InstallAddonListVo } from '../dtos/install-addon-list-vo.dto'; +import { ModuleListVo } from '../../../../dtos/admin/niucloud/vo/module-list-vo.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { AddonSearchParam } from '../../../../dtos/admin/addon/param/addon-search-param.dto'; +import { AddonListVo } from '../../../../dtos/admin/addon/vo/addon-list-vo.dto'; +import { AddonInfoVo } from '../../../../dtos/admin/addon/vo/addon-info-vo.dto'; +import { AddonParam } from '../../../../dtos/admin/addon/param/addon-param.dto'; +import { IndexAddonListParam } from '../../../../dtos/admin/addon/vo/index-addon-list-param.dto'; +import { NiucloudConfigVo } from '../../../../dtos/core/niucloud/vo/niucloud-config-vo.dto'; @Injectable() export class AddonServiceImplService { @@ -23,7 +29,7 @@ export class AddonServiceImplService { async getLocalAddonList(): Promise { const vo: LocalAddonListVo = new LocalAddonListVo(); - const list: Record = new const installAddonList: Record<>(); + const list: Record = new const installAddonList: Record<>(); // 获取已安装的插件 Record = this.this.CoreAddonService.installAddonList; @@ -49,7 +55,7 @@ export class AddonServiceImplService { // 获取本地所有的插件 const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon) - .map(path => path.toFile()) + .map(path => path) .filter(file => fs.statSync(file).isDirectory()) ; @@ -225,7 +231,7 @@ export class AddonServiceImplService { async download(addon: string, version: string): Promise { const instance: NiucloudUtils = NiucloudUtils.instance; - const actionQuery: Record = new const query: Record<>(); + const actionQuery: Record = new const query: Record<>(); actionQuery.put("data[app_key]", addon); actionQuery.put("data[version]", version); actionQuery.put("data[product_key]", instance.productKey); @@ -251,7 +257,7 @@ export class AddonServiceImplService { try (const fos: FileOutputStream = new FileOutputStream(file)) { fos.write(response.bodyBytes()); - ZipUtil.unzip(file.path, this.appConfig.webRootDownAddon, Charset.forName(System.getProperty("sun.jnu.encoding"))); + ZipUtil.unzip(file.path, this.appConfig.webRootDownAddon, Charset.forName('utf-8')); } catch (e) { console.error(e); throw new BadRequestException(e.message); @@ -262,7 +268,7 @@ export class AddonServiceImplService { * getIndexAddonList */ async getIndexAddonList(param: IndexAddonListParam): Promise { - const params: Record = {}; + const params: Record = {}; const config: NiucloudConfigVo = this.coreNiucloudConfigService.niucloudConfig; params.put("code", config.authCode); params.put("secret", config.authSecret); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/aliapp/impl/aliapp-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/aliapp/impl/aliapp-config-service-impl.service.ts index e04c9c1e..bb1847c8 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/aliapp/impl/aliapp-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/aliapp/impl/aliapp-config-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { AliappConfigParamDto } from '../dtos/aliapp-config-param.dto'; +import { AliappConfigParam } from '../../../../dtos/core/aliapp/param/aliapp-config-param.dto'; @Injectable() export class AliappConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts index bca60f51..d285286a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts @@ -2,10 +2,15 @@ import { Injectable, BadRequestException, UnauthorizedException } from '@nestjs/ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import * as path from 'path'; -import { HttpServletRequestDto } from '../dtos/http-servlet-request.dto'; -import { EditAuthUserParamDto } from '../dtos/edit-auth-user-param.dto'; -import { Map otherMenuList = this.sysMenuService.getAllApiList(RequestUtils.appType() === AppTypeEnum.path.basename(ADMIN) ? AppTypeEnum.path.basename(SITE) : AppTypeEnum.path.basename(ADMIN), 100); + Map otherMenuList = this.sysMenuService.getAllApiList(RequestUtils.appType() === AppTypeEnum.basename(ADMIN) ? AppTypeEnum.basename(SITE) : AppTypeEnum.basename(ADMIN), 100); const methodMenuList: string[] = otherMenuList.get(method); const is_method_exists: number = methodMenuList.indexOf(rule); if (is_method_exists > 0) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/config-service-impl.service.ts index 0ce1a4e4..735ea521 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/config-service-impl.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import * as path from 'path'; -import { LoginConfigParamDto } from '../dtos/login-config-param.dto'; +import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; +import { LoginConfigParam } from '../../../../dtos/admin/member/param/login-config-param.dto'; @Injectable() export class ConfigServiceImplService { @@ -17,7 +17,7 @@ export class ConfigServiceImplService { */ async getLoginConfig(): Promise { const defaultSiteId: number = RequestUtils.defaultSiteId(); - const sysConfig: Record = this.coreConfigService.getConfigValue(defaultSiteId, ConfigKeyEnum.path.basename(ADMIN_LOGIN)); + const sysConfig: Record = this.coreConfigService.getConfigValue(defaultSiteId, ConfigKeyEnum.basename(ADMIN_LOGIN)); return Object.assign(new LoginConfigVo(), sysConfig) /* TODO: 检查LoginConfigVo构造函数 */; } @@ -30,6 +30,6 @@ export class ConfigServiceImplService { jsonObject.set("is_site_captcha", loginConfigParam.isSiteCaptcha); jsonObject.set("bg", loginConfigParam.bg); jsonObject.set("site_bg", loginConfigParam.siteBg); - this.coreConfigService.config = this.requestContext.siteId, ConfigKeyEnum.path.basename(ADMIN_LOGIN, jsonObject); + this.coreConfigService.config = this.requestContext.siteId, ConfigKeyEnum.basename(ADMIN_LOGIN, jsonObject); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts index 72db4f10..de0320cd 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts @@ -2,8 +2,13 @@ import { Injectable, UnauthorizedException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import * as path from 'path'; -import { UserLoginParamDto } from '../dtos/user-login-param.dto'; +import { UserLoginParam } from '../../../../dtos/admin/auth/param/user-login-param.dto'; +import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; +import { SysUserInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-info-vo.dto'; +import { SysUserRoleInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-role-info-vo.dto'; +import { LoginResultVo } from '../../../../dtos/admin/auth/vo/login-result-vo.dto'; +import { LoginUserInfoVo } from '../../../../dtos/admin/auth/vo/login-user-info-vo.dto'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; @Injectable() export class LoginServiceImplService { @@ -27,9 +32,9 @@ export class LoginServiceImplService { const loginConfigVo: LoginConfigVo = this.configService.loginConfig; const isCaptcha: number = 0; - if(appType === AppTypeEnum.path.basename(ADMIN)){ + if(appType === AppTypeEnum.basename(ADMIN)){ isCaptcha=loginConfigVo.isCaptcha; - }else if(appType === AppTypeEnum.path.basename(SITE)){ + }else if(appType === AppTypeEnum.basename(SITE)){ isCaptcha=loginConfigVo.isSiteCaptcha; } @@ -54,7 +59,7 @@ export class LoginServiceImplService { const defaultSiteId: number = 0; const roleInfoVo: SysUserRoleInfoVo = new SysUserRoleInfoVo(); const siteIds: number[] = []; - if(appType === AppTypeEnum.path.basename(ADMIN)){ + if(appType === AppTypeEnum.basename(ADMIN)){ defaultSiteId=RequestUtils.defaultSiteId(); roleInfoVo=this.sysUserRoleService.getUserRole(defaultSiteId, userInfo.uid); if(ObjectUtil.isNotNull(roleInfoVo)){ @@ -62,9 +67,9 @@ export class LoginServiceImplService { throw new UnauthorizedException("账号被锁定"); } }else{ - appType=AppTypeEnum.path.basename(SITE); + appType=AppTypeEnum.basename(SITE); } - }else if(appType === AppTypeEnum.path.basename(SITE)){ + }else if(appType === AppTypeEnum.basename(SITE)){ siteIds=this.authSiteService.siteIds; if(ObjectUtil.isNotNull(siteIds) && siteIds.length>0){ defaultSiteId=siteIds.indexOf(this.requestContext.siteId)>0 || this.authService.isSuperAdmin()?this.requestContext.siteId:siteIds.get(0); @@ -94,12 +99,12 @@ export class LoginServiceImplService { userInfoVo.isSuperAdmin = this.authService.isSuperAdmin(); - if(appType === AppTypeEnum.path.basename(ADMIN) || (appType === AppTypeEnum.path.basename(SITE) && defaultSiteId>0)){ + if(appType === AppTypeEnum.basename(ADMIN) || (appType === AppTypeEnum.basename(SITE) && defaultSiteId>0)){ RequestUtils.siteId = defaultSiteId; const siteInfoVo: SiteInfoVo = this.siteService.info(this.requestContext.siteId); resultVo.siteInfo = siteInfoVo; } - if(appType === AppTypeEnum.path.basename(ADMIN) && !userInfoVo.isSuperAdmin){ + if(appType === AppTypeEnum.basename(ADMIN) && !userInfoVo.isSuperAdmin){ siteIds=this.authSiteService.siteIds; } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts index b98b0268..caf0a418 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts @@ -2,12 +2,15 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { SetAppParamDto } from '../dtos/set-app-param.dto'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { AppVersionPageParamDto } from '../dtos/app-version-page-param.dto'; -import { AppVersionAddParamDto } from '../dtos/app-version-add-param.dto'; -import { MapDto } from '../dtos/object>.dto'; +import { SetAppParam } from '../../../../dtos/core/channel/param/set-app-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { AppVersionPageParam } from '../../../../dtos/admin/channel/param/app-version-page-param.dto'; +import { AppVersionListVo } from '../../../../dtos/admin/niucloud/vo/app-version-list-vo.dto'; +import { AppVersionInfoVo } from '../../../../dtos/admin/channel/vo/app-version-info-vo.dto'; +import { AppVersionAddParam } from '../../../../dtos/admin/channel/param/app-version-add-param.dto'; +import { AppCompileLogVo } from '../../../../dtos/core/channel/vo/app-compile-log-vo.dto'; +import { Map } from '../dtos/object>.dto'; @Injectable() export class AdminAppServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/dict/impl/dict-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/dict/impl/dict-service-impl.service.ts index d241d988..6a17a30b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/dict/impl/dict-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/dict/impl/dict-service-impl.service.ts @@ -3,9 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot'; import * as path from 'path'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { DictSearchParamDto } from '../dtos/dict-search-param.dto'; -import { DictParamDto } from '../dtos/dict-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { DictSearchParam } from '../../../../dtos/admin/dict/param/dict-search-param.dto'; +import { DictListVo } from '../../../../dtos/admin/dict/vo/dict-list-vo.dto'; +import { DictInfoVo } from '../../../../dtos/admin/dict/vo/dict-info-vo.dto'; +import { DictParam } from '../../../../dtos/admin/dict/param/dict-param.dto'; @Injectable() export class DictServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-config-service-impl.service.ts index 3830e31e..59c59cb0 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-config-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { SetBottomConfigParamDto } from '../dtos/set-bottom-config-param.dto'; +import { SetBottomConfigParam } from '../../../../dtos/admin/diy/param/set-bottom-config-param.dto'; @Injectable() export class DiyConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-route-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-route-service-impl.service.ts index 845f9c45..17766bbb 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-route-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-route-service-impl.service.ts @@ -3,9 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -import { DiyRouteSearchParamDto } from '../dtos/diy-route-search-param.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; -import { DiyRouteShareParamDto } from '../dtos/diy-route-share-param.dto'; +import { DiyRouteSearchParam } from '../../../../dtos/admin/diy/param/diy-route-search-param.dto'; +import { DiyRouteListVo } from '../../../../dtos/admin/diy/vo/diy-route-list-vo.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { DiyRouteInfoVo } from '../../../../dtos/admin/diy/vo/diy-route-info-vo.dto'; +import { DiyRouteShareParam } from '../../../../dtos/admin/diy/param/diy-route-share-param.dto'; @Injectable() export class DiyRouteServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-service-impl.service.ts index cd0b11b4..ce892aea 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-service-impl.service.ts @@ -3,16 +3,22 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { DiyPageSearchParamDto } from '../dtos/diy-page-search-param.dto'; -import { DiyPageParamDto } from '../dtos/diy-page-param.dto'; -import { DiyPageInitParamDto } from '../dtos/diy-page-init-param.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; -import { TemplateParamDto } from '../dtos/template-param.dto'; -import { StartUpPageConfigParamDto } from '../dtos/start-up-page-config-param.dto'; -import { SetDiyDataParamDto } from '../dtos/set-diy-data-param.dto'; -import { MapDto } from '../dtos/object>.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { DiyPageSearchParam } from '../../../../dtos/admin/diy/param/diy-page-search-param.dto'; +import { DiyPageListVo } from '../../../../dtos/admin/diy/vo/diy-page-list-vo.dto'; +import { DiyPageInfoVo } from '../../../../dtos/admin/diy/vo/diy-page-info-vo.dto'; +import { DiyPageParam } from '../../../../dtos/admin/diy/param/diy-page-param.dto'; +import { DiyPageInitParam } from '../../../../dtos/admin/diy/param/diy-page-init-param.dto'; +import { TemplateParam } from '../../../../dtos/admin/diy/param/template-param.dto'; +import { StartUpPageConfigVo } from '../../../../dtos/core/diy/vo/start-up-page-config-vo.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { StartUpPageConfigParam } from '../../../../dtos/core/diy/param/start-up-page-config-param.dto'; +import { DiyRouteSearchParam } from '../../../../dtos/admin/diy/param/diy-route-search-param.dto'; +import { DiyRouteListVo } from '../../../../dtos/admin/diy/vo/diy-route-list-vo.dto'; +import { SceneDomainVo } from '../dtos/scene-domain-vo.dto'; +import { SetDiyDataParam } from '../../../../dtos/admin/diy/param/set-diy-data-param.dto'; +import { Map } from '../dtos/object>.dto'; @Injectable() export class DiyServiceImplService { @@ -49,7 +55,7 @@ export class DiyServiceImplService { .filter(temp => vo.type != null && vo.type === temp.get("type")) .findFirst() .map(addon => ObjectUtil.defaultIfNull(addon.get("title"), "").toString()) - .orElse(""); + || ""; vo.addonName = addonName; list.push(vo); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-theme-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-theme-service-impl.service.ts index 1c1a95db..0f999a0e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-theme-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-theme-service-impl.service.ts @@ -2,10 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; -import { DiyThemeSetParamDto } from '../dtos/diy-theme-set-param.dto'; -import { DiyThemeColorParamDto } from '../dtos/diy-theme-color-param.dto'; -import { DiyThemeParamDto } from '../dtos/diy-theme-param.dto'; -import { DiyThemeTitleParamDto } from '../dtos/diy-theme-title-param.dto'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { DiyThemeSetParam } from '../../../../dtos/admin/diy/param/diy-theme-set-param.dto'; +import { DiyThemeColorParam } from '../../../../dtos/admin/diy/param/diy-theme-color-param.dto'; +import { DiyThemeInfoVo } from '../../../../dtos/admin/diy/vo/diy-theme-info-vo.dto'; +import { DiyThemeParam } from '../../../../dtos/admin/diy/param/diy-theme-param.dto'; +import { DiyThemeTitleParam } from '../../../../dtos/admin/diy/param/diy-theme-title-param.dto'; @Injectable() export class DiyThemeServiceImplService { @@ -21,7 +23,7 @@ export class DiyThemeServiceImplService { const siteId: number = this.requestContext.siteId; const siteCache: SiteInfoVo = this.coreSiteService.getSiteCache(siteId); const themeDataList: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("type", "app").eq("is_selected", 1)); - const themeData: Record = {}; + const themeData: Record = {}; if ((themeDataList && themeDataList.length > 0)){ themeData = themeDataList.collect(/* Collectors已删除 */.toMap(theme => theme.addon, theme => theme)); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-config-service-impl.service.ts index 37916798..e71eb4bb 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-config-service-impl.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { DiyFormWriteConfigParamDto } from '../dtos/diy-form-write-config-param.dto'; -import { DiyFormSubmitConfigParamDto } from '../dtos/diy-form-submit-config-param.dto'; +import { DiyFormWriteConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-write-config-param.dto'; +import { DiyFormSubmitConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-submit-config-param.dto'; @Injectable() export class DiyFormConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-records-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-records-service-impl.service.ts index 3de61738..36eca5b6 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-records-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-records-service-impl.service.ts @@ -2,8 +2,11 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { DiyFormRecordsSearchParamDto } from '../dtos/diy-form-records-search-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { DiyFormRecordsSearchParam } from '../../../../dtos/core/diy_form/param/diy-form-records-search-param.dto'; +import { DiyFormRecordsListVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-list-vo.dto'; +import { DiyFormRecordsFieldsSearchParam } from '../../../../dtos/admin/diy_form/param/diy-form-records-fields-search-param.dto'; +import { DiyFormFieldsListVo } from '../../../../dtos/admin/diy_form/vo/diy-form-fields-list-vo.dto'; @Injectable() export class DiyFormRecordsServiceImplService { @@ -82,7 +85,7 @@ export class DiyFormRecordsServiceImplService { .select("form_id, field_key, field_type, field_value, count(*) as write_count") .groupBy("field_value")); for (const i of number = 0; i < valueList.length; i++) { - const value: Record = valueList.get(i); + const value: Record = valueList.get(i); const diyFormComponentEnum: DiyFormComponentEnum = new DiyFormComponentEnum(); const component: Record = diyFormComponentEnum.getComponent(value.get("field_type").toString()); if(component.containsKey("render")){ @@ -112,7 +115,7 @@ export class DiyFormRecordsServiceImplService { if (totalCount > 0) { const totalPercent: number = 100; for (const i of number = 0; i < valueList.length; i++) { - const value: Record = valueList.get(i); + const value: Record = valueList.get(i); double itemPercent; if (i == valueList.length - 1) { itemPercent = totalPercent; @@ -138,7 +141,7 @@ export class DiyFormRecordsServiceImplService { } List> fieldList = diyFormRecordsFieldsMapper.selectMaps(fieldQueryWrapper); for (const i of number = 0; i < fieldList.length; i++) { - const value: Record = fieldList.get(i); + const value: Record = fieldList.get(i); const diyFormComponentEnum: DiyFormComponentEnum = new DiyFormComponentEnum(); const component: Record = diyFormComponentEnum.getComponent(value.get("field_type").toString()); if(component.containsKey("render")){ @@ -180,7 +183,7 @@ export class DiyFormRecordsServiceImplService { valueMap.get(key).put("write_count", valueMap.get(key).get("write_count") + 1); totalCount++; } else { - const newRecord: Record = new HashMap<>(record); + const newRecord: Record = new HashMap<>(record); newRecord.put("render_value", value); newRecord.put("write_count", 1); valueMap.put(key, newRecord); @@ -194,7 +197,7 @@ export class DiyFormRecordsServiceImplService { List> valueList = new ArrayList<>(valueMap.values()); const totalPercent: number = 100; for (const i of number = 0; i < valueList.length; i++) { - const value: Record = valueList.get(i); + const value: Record = valueList.get(i); double itemPercent; if (i == valueList.length - 1) { itemPercent = totalPercent; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-service-impl.service.ts index 39402b18..74bc46dc 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-service-impl.service.ts @@ -2,17 +2,22 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { DiyFormSearchParamDto } from '../dtos/diy-form-search-param.dto'; -import { DiyFormParamDto } from '../dtos/diy-form-param.dto'; -import { ListDto } from '../dtos/list<-integer>.dto'; -import { DiyFormInitParamDto } from '../dtos/diy-form-init-param.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; -import { DiyFormTemplateParamDto } from '../dtos/diy-form-template-param.dto'; -import { DiyFormStatusParamDto } from '../dtos/diy-form-status-param.dto'; -import { DiyFormRecordsSearchParamDto } from '../dtos/diy-form-records-search-param.dto'; -import { DiyFormRecordsFieldsSearchParamDto } from '../dtos/diy-form-records-fields-search-param.dto'; -import { DiyFormSelectParamDto } from '../dtos/diy-form-select-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { DiyFormSearchParam } from '../../../../dtos/core/diy_form/param/diy-form-search-param.dto'; +import { DiyFormListVo } from '../../../../dtos/admin/diy_form/vo/diy-form-list-vo.dto'; +import { DiyFormInfoVo } from '../../../../dtos/api/diy/vo/diy-form-info-vo.dto'; +import { DiyFormParam } from '../../../../dtos/api/diy/param/diy-form-param.dto'; +import { DiyFormWriteConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-write-config-param.dto'; +import { DiyFormSubmitConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-submit-config-param.dto'; +import { DiyFormInitParam } from '../../../../dtos/admin/diy_form/param/diy-form-init-param.dto'; +import { DiyFormInitVo } from '../../../../dtos/admin/diy_form/vo/diy-form-init-vo.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { DiyFormTemplateParam } from '../../../../dtos/admin/diy_form/param/diy-form-template-param.dto'; +import { DiyFormStatusParam } from '../../../../dtos/admin/diy_form/param/diy-form-status-param.dto'; +import { DiyFormRecordsSearchParam } from '../../../../dtos/core/diy_form/param/diy-form-records-search-param.dto'; +import { DiyFormRecordsFieldsSearchParam } from '../../../../dtos/admin/diy_form/param/diy-form-records-fields-search-param.dto'; +import { DiyFormFieldsListVo } from '../../../../dtos/admin/diy_form/vo/diy-form-fields-list-vo.dto'; +import { DiyFormSelectParam } from '../../../../dtos/admin/diy_form/param/diy-form-select-param.dto'; @Injectable() export class DiyFormServiceImplService { @@ -232,7 +237,7 @@ export class DiyFormServiceImplService { model.updateTime = Date.now( / 1000); diyFormMapper.updateById(model); const formFieldsList: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); - const formFieldsListMap: Record = formFieldsList.collect(/* Collectors已删除 */.toMap(DiyFormFields::getFieldKey, a => a)); + const formFieldsListMap: Record = formFieldsList.collect(/* Collectors已删除 */.toMap(DiyFormFields::getFieldKey, a => a)); const existFieldKeys: string[] = []; const diyFormFields: DiyFormFields[] = []; if (CommonUtils.isNotEmpty(editParam.value)) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-column-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-column-service-impl.service.ts index 7a005f51..6fcd0d33 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-column-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-column-service-impl.service.ts @@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { ListDto } from '../dtos/list<-generate-column>.dto'; @Injectable() export class GenerateColumnServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts index 91063588..0dd057d1 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts @@ -2,11 +2,17 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { GenerateSearchParamDto } from '../dtos/generate-search-param.dto'; -import { GenerateParamDto } from '../dtos/generate-param.dto'; -import { GenerateEditParamDto } from '../dtos/generate-edit-param.dto'; -import { GenerateCodeParamDto } from '../dtos/generate-code-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { GenerateSearchParam } from '../../../../dtos/admin/generator/param/generate-search-param.dto'; +import { GenerateListVo } from '../../../../dtos/admin/generator/vo/generate-list-vo.dto'; +import { GenerateDetailVo } from '../../../../dtos/admin/generator/vo/generate-detail-vo.dto'; +import { GenerateColumnVo } from '../dtos/generate-column-vo.dto'; +import { GenerateParam } from '../../../../dtos/admin/generator/param/generate-param.dto'; +import { GenerateEditParam } from '../../../../dtos/admin/generator/param/generate-edit-param.dto'; +import { GenerateCodeParam } from '../../../../dtos/admin/generator/param/generate-code-param.dto'; +import { CoreGenerateTemplateVo } from '../../../../dtos/core/generator/vo/core-generate-template-vo.dto'; +import { GeneratePreviewVo } from '../../../../dtos/admin/generator/vo/generate-preview-vo.dto'; +import { MapperInfoVo } from '../../../../dtos/core/generator/vo/mapper-info-vo.dto'; @Injectable() export class GenerateServiceImplService { @@ -153,7 +159,7 @@ export class GenerateServiceImplService { } List> listData = jdbcTemplate.queryForList(sql); if (CommonUtils.isEmpty(listData)) throw new AdminException("数据表不存在"); - const table: Record = listData.get(0); + const table: Record = listData.get(0); if (CommonUtils.isEmpty(table)) throw new AdminException("数据表不存在"); const tableName: string = table.get("Name").toString().substring(tablePrefix.length()); @@ -369,7 +375,7 @@ export class GenerateServiceImplService { */ async getDbFieldType(type: string): Promise { type = getDbType(type); - const map: Record = SqlColumnEnum.map; + const map: Record = SqlColumnEnum.map; const field: string = ""; for (Map.Entry entry : map.entrySet()) { if ([entry.getValue(]).includes(type)) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/home/impl/auth-site-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/home/impl/auth-site-service-impl.service.ts index 718f9486..32a77dbb 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/home/impl/auth-site-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/home/impl/auth-site-service-impl.service.ts @@ -2,11 +2,16 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SiteSearchParamDto } from '../dtos/site-search-param.dto'; -import { SiteParamDto } from '../dtos/site-param.dto'; -import { HomeSiteAddParamDto } from '../dtos/home-site-add-param.dto'; -import { ListDto } from '../dtos/list<-addon>.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SiteSearchParam } from '../../../../dtos/admin/site/param/site-search-param.dto'; +import { SiteListVo } from '../../../../dtos/admin/site/vo/site-list-vo.dto'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { SiteParam } from '../../../../dtos/admin/site/param/site-param.dto'; +import { UserCreateSiteVo } from '../../../../dtos/admin/home/vo/user-create-site-vo.dto'; +import { SiteGroupVo } from '../../../../dtos/admin/home/vo/site-group-vo.dto'; +import { HomeSiteAddParam } from '../../../../dtos/admin/home/param/home-site-add-param.dto'; +import { SiteAddParam } from '../../../../dtos/admin/site/param/site-add-param.dto'; +import { AddonInfoVo } from '../../../../dtos/admin/addon/vo/addon-info-vo.dto'; @Injectable() export class AuthSiteServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-account-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-account-service-impl.service.ts index 4948da41..87e6586c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-account-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-account-service-impl.service.ts @@ -2,9 +2,16 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { MemberAccountLogSearchParamDto } from '../dtos/member-account-log-search-param.dto'; -import { AdjustAccountParamDto } from '../dtos/adjust-account-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { MemberAccountLogSearchParam } from '../../../../dtos/admin/member/param/member-account-log-search-param.dto'; +import { MemberAccountLogVo } from '../../../../dtos/admin/member/vo/member-account-log-vo.dto'; +import { MemberAccountLogListVo } from '../../../../dtos/admin/member/vo/member-account-log-list-vo.dto'; +import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto'; +import { MemberAccountVo } from '../../../../dtos/admin/member/vo/member-account-vo.dto'; +import { SumCommissionVo } from '../../../../dtos/admin/member/vo/sum-commission-vo.dto'; +import { SumBalanceVo } from '../../../../dtos/admin/member/vo/sum-balance-vo.dto'; +import { SumPointVo } from '../../../../dtos/admin/member/vo/sum-point-vo.dto'; +import { AdjustAccountParam } from '../../../../dtos/admin/member/param/adjust-account-param.dto'; @Injectable() export class MemberAccountServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-address-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-address-service-impl.service.ts index a054f0dd..324d68c3 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-address-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-address-service-impl.service.ts @@ -2,8 +2,10 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { MemberAddressSearchParamDto } from '../dtos/member-address-search-param.dto'; -import { MemberAddressParamDto } from '../dtos/member-address-param.dto'; +import { MemberAddressSearchParam } from '../../../../dtos/admin/member/param/member-address-search-param.dto'; +import { MemberAddressListVo } from '../../../../dtos/admin/member/vo/member-address-list-vo.dto'; +import { MemberAddressInfoVo } from '../../../../dtos/admin/member/vo/member-address-info-vo.dto'; +import { MemberAddressParam } from '../../../../dtos/admin/member/param/member-address-param.dto'; @Injectable() export class MemberAddressServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-cash-out-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-cash-out-service-impl.service.ts index 3b314449..38d0a345 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-cash-out-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-cash-out-service-impl.service.ts @@ -2,11 +2,15 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { MemberCashOutSearchParamDto } from '../dtos/member-cash-out-search-param.dto'; -import { MemberCashOutAuditParamDto } from '../dtos/member-cash-out-audit-param.dto'; -import { CashOutTransferParamDto } from '../dtos/cash-out-transfer-param.dto'; -import { MemberCashOutRemarkParamDto } from '../dtos/member-cash-out-remark-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { MemberCashOutSearchParam } from '../../../../dtos/admin/member/param/member-cash-out-search-param.dto'; +import { MemberCashOutListVo } from '../../../../dtos/api/member/vo/member-cash-out-list-vo.dto'; +import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto'; +import { MemberCashOutInfoVo } from '../../../../dtos/api/member/vo/member-cash-out-info-vo.dto'; +import { CashOutStatVo } from '../../../../dtos/admin/member/vo/cash-out-stat-vo.dto'; +import { MemberCashOutAuditParam } from '../../../../dtos/admin/member/param/member-cash-out-audit-param.dto'; +import { CashOutTransferParam } from '../../../../dtos/admin/member/param/cash-out-transfer-param.dto'; +import { MemberCashOutRemarkParam } from '../../../../dtos/admin/member/param/member-cash-out-remark-param.dto'; @Injectable() export class MemberCashOutServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-config-service-impl.service.ts index ebadcc61..7fb2a796 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-config-service-impl.service.ts @@ -2,10 +2,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { LoginConfigParamDto } from '../dtos/login-config-param.dto'; -import { CashOutConfigParamDto } from '../dtos/cash-out-config-param.dto'; -import { MemberConfigParamDto } from '../dtos/member-config-param.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; +import { LoginConfigParam } from '../../../../dtos/admin/member/param/login-config-param.dto'; +import { CashOutConfigParam } from '../../../../dtos/admin/member/param/cash-out-config-param.dto'; +import { MemberConfigParam } from '../../../../dtos/admin/member/param/member-config-param.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; @Injectable() export class MemberConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-label-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-label-service-impl.service.ts index ef6a4148..2ba4533f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-label-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-label-service-impl.service.ts @@ -2,9 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { MemberLabelSearchParamDto } from '../dtos/member-label-search-param.dto'; -import { MemberLabelEditParamDto } from '../dtos/member-label-edit-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { MemberLabelSearchParam } from '../../../../dtos/admin/member/param/member-label-search-param.dto'; +import { MemberLabelListVo } from '../../../../dtos/admin/member/vo/member-label-list-vo.dto'; +import { MemberLabelInfoVo } from '../../../../dtos/admin/member/vo/member-label-info-vo.dto'; +import { MemberLabelEditParam } from '../../../../dtos/admin/member/param/member-label-edit-param.dto'; +import { MemberLabelAllListVo } from '../../../../dtos/admin/member/vo/member-label-all-list-vo.dto'; @Injectable() export class MemberLabelServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-level-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-level-service-impl.service.ts index 80587436..60eae434 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-level-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-level-service-impl.service.ts @@ -2,9 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { MemberLevelSearchParamDto } from '../dtos/member-level-search-param.dto'; -import { MemberLevelParamDto } from '../dtos/member-level-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { MemberLevelSearchParam } from '../../../../dtos/admin/member/param/member-level-search-param.dto'; +import { MemberLevelListVo } from '../../../../dtos/admin/member/vo/member-level-list-vo.dto'; +import { MemberLevelInfoVo } from '../../../../dtos/api/member/vo/member-level-info-vo.dto'; +import { MemberLevelParam } from '../../../../dtos/api/member/param/member-level-param.dto'; +import { MemberLevelAllListVo } from '../../../../dtos/admin/member/vo/member-level-all-list-vo.dto'; @Injectable() export class MemberLevelServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-service-impl.service.ts index 07a382f2..6e39792f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-service-impl.service.ts @@ -2,13 +2,17 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { MemberSearchParamDto } from '../dtos/member-search-param.dto'; -import { MemberAddParamDto } from '../dtos/member-add-param.dto'; -import { MemberParamDto } from '../dtos/member-param.dto'; -import { MemberModifyParamDto } from '../dtos/member-modify-param.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; -import { BatchModifyParamDto } from '../dtos/batch-modify-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { MemberSearchParam } from '../../../../dtos/admin/member/param/member-search-param.dto'; +import { MemberListVo } from '../../../../dtos/admin/member/vo/member-list-vo.dto'; +import { MemberLabelAllListVo } from '../../../../dtos/admin/member/vo/member-label-all-list-vo.dto'; +import { MemberInfoVo } from '../../../../dtos/api/member/vo/member-info-vo.dto'; +import { MemberAddParam } from '../../../../dtos/admin/member/param/member-add-param.dto'; +import { MemberParam } from '../../../../dtos/admin/member/param/member-param.dto'; +import { MemberModifyParam } from '../../../../dtos/api/member/param/member-modify-param.dto'; +import { MemberAllListVo } from '../../../../dtos/admin/member/vo/member-all-list-vo.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { BatchModifyParam } from '../../../../dtos/admin/member/param/batch-modify-param.dto'; @Injectable() export class MemberServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-sign-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-sign-service-impl.service.ts index 8f17e56a..5f401974 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-sign-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-sign-service-impl.service.ts @@ -2,9 +2,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { MemberSignSearchParamDto } from '../dtos/member-sign-search-param.dto'; -import { SignConfigParamDto } from '../dtos/sign-config-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { MemberSignSearchParam } from '../../../../dtos/admin/member/param/member-sign-search-param.dto'; +import { MemberSignListVo } from '../../../../dtos/admin/member/vo/member-sign-list-vo.dto'; +import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto'; +import { SignConfigVo } from '../../../../dtos/admin/member/vo/sign-config-vo.dto'; +import { SignConfigParam } from '../../../../dtos/admin/member/param/sign-config-param.dto'; @Injectable() export class MemberSignServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts index 11d41df8..8c32ac85 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts @@ -3,9 +3,10 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService } from '@wwjBoot'; import * as fs from 'fs'; -import { ConnectTestParamDto } from '../dtos/connect-test-param.dto'; -import { BooleanDto } from '../dtos/boolean.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; +import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { ConnectTestParam } from '../../../../dtos/admin/niucloud/param/connect-test-param.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { InstallAddonListVo } from '../dtos/install-addon-list-vo.dto'; @Injectable() export class CloudBuildServiceImplService { @@ -58,7 +59,7 @@ export class CloudBuildServiceImplService { const instance: NiucloudUtils = NiucloudUtils.instance; - const actionQuery: Record = new const query: Record<>(); + const actionQuery: Record = new const query: Record<>(); actionQuery.put("data[product_key]", instance.productKey); const actionToken: Record = this.niucloudService.getActionToken("cloudbuild", actionQuery); @@ -94,7 +95,7 @@ export class CloudBuildServiceImplService { const instance: NiucloudUtils = NiucloudUtils.instance; - const query: Record = {}; + const query: Record = {}; query.put("authorize_code", instance.code); query.put("timestamp", this.buildTask.getStr("timestamp")); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/niu-cloud-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/niu-cloud-service-impl.service.ts index c2db7981..b4dc3a17 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/niu-cloud-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/niu-cloud-service-impl.service.ts @@ -2,10 +2,14 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { SetAuthorizeParamDto } from '../dtos/set-authorize-param.dto'; -import { MapDto } from '../dtos/object>.dto'; -import { GetAppVersionListParamDto } from '../dtos/get-app-version-list-param.dto'; +import { FrameworkVersionListVo } from '../../../../dtos/admin/niucloud/vo/framework-version-list-vo.dto'; +import { AuthInfoVo } from '../../../../dtos/admin/niucloud/vo/auth-info-vo.dto'; +import { SetAuthorizeParam } from '../../../../dtos/core/niucloud/param/set-authorize-param.dto'; +import { ModuleListVo } from '../../../../dtos/admin/niucloud/vo/module-list-vo.dto'; +import { Map } from '../dtos/object>.dto'; +import { GetAppVersionListParam } from '../../../../dtos/admin/niucloud/param/get-app-version-list-param.dto'; +import { AppVersionListVo } from '../../../../dtos/admin/niucloud/vo/app-version-list-vo.dto'; @Injectable() export class NiuCloudServiceImplService { @@ -19,7 +23,7 @@ export class NiuCloudServiceImplService { async getFrameworkLastVersion(): Promise { const instance: NiucloudUtils = NiucloudUtils.instance; - const query: Record = {}; + const query: Record = {}; query.put("product_key", instance.productKey); const data: Record = NiucloudUtils.Niucloud.get("store/framework/lastversion", query).getRecord("data"); @@ -39,7 +43,7 @@ export class NiuCloudServiceImplService { async getFrameworkVersionList(): Promise { const instance: NiucloudUtils = NiucloudUtils.instance; - const query: Record = {}; + const query: Record = {}; query.put("product_key", instance.productKey); const data: JSONArray = NiucloudUtils.Niucloud.get("store/framework/version", query).getJSONArray("data"); @@ -58,7 +62,7 @@ export class NiuCloudServiceImplService { async getAuthinfo(): Promise { const instance: NiucloudUtils = NiucloudUtils.instance; - const query: Record = {}; + const query: Record = {}; query.put("code", instance.code); query.put("secret", instance.secret); query.put("product_key", instance.productKey); @@ -78,7 +82,7 @@ export class NiuCloudServiceImplService { async setAuthorize(param: SetAuthorizeParam): Promise { const instance: NiucloudUtils = NiucloudUtils.instance; - const query: Record = {}; + const query: Record = {}; query.put("code", param.authCode); query.put("secret", param.authSecret); query.put("product_key", instance.productKey); @@ -96,7 +100,7 @@ export class NiuCloudServiceImplService { async getModuleList(): Promise { const instance: NiucloudUtils = NiucloudUtils.instance; - const query: Record = {}; + const query: Record = {}; query.put("code", instance.code); query.put("secret", instance.secret); query.put("product_key", instance.productKey); @@ -126,7 +130,7 @@ export class NiuCloudServiceImplService { async checkKey(key: string): Promise { const instance: NiucloudUtils = NiucloudUtils.instance; - const query: Record = {}; + const query: Record = {}; query.put("product_key", instance.productKey); return NiucloudUtils.Niucloud.get("store/app_check/" + key, query).get("data", boolean.class); @@ -138,7 +142,7 @@ export class NiuCloudServiceImplService { async getAppVersionList(param: GetAppVersionListParam): Promise { const instance: NiucloudUtils = NiucloudUtils.instance; - const query: Record = {}; + const query: Record = {}; query.put("product_key", instance.productKey); query.put("app_key", param.appKey); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/notice-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/notice-log-service-impl.service.ts index 20bf3ef8..0c059989 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/notice-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/notice-log-service-impl.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { NoticeLogSearchParamDto } from '../dtos/notice-log-search-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { NoticeLogSearchParam } from '../../../../dtos/core/notice/param/notice-log-search-param.dto'; @Injectable() export class NoticeLogServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/notice-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/notice-service-impl.service.ts index 13cdc805..35629c1a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/notice-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/notice-service-impl.service.ts @@ -2,8 +2,8 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; -import { EditMessageStatusParamDto } from '../dtos/edit-message-status-param.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { EditMessageStatusParam } from '../../../../dtos/admin/notice/param/edit-message-status-param.dto'; @Injectable() export class NoticeServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/nui-sms-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/nui-sms-service-impl.service.ts index a8523458..1e1289e1 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/nui-sms-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/nui-sms-service-impl.service.ts @@ -3,19 +3,20 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -import { SendMobileCodeParamDto } from '../dtos/send-mobile-code-param.dto'; -import { RegisterAccountParamDto } from '../dtos/register-account-param.dto'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { OrderListParamDto } from '../dtos/order-list-param.dto'; -import { SendListParamDto } from '../dtos/send-list-param.dto'; -import { EditAccountParamDto } from '../dtos/edit-account-param.dto'; -import { SignDeleteParamDto } from '../dtos/sign-delete-param.dto'; -import { SmsPackageParamDto } from '../dtos/sms-package-param.dto'; -import { OrderCalculateParamDto } from '../dtos/order-calculate-param.dto'; -import { TemplateCreateParamDto } from '../dtos/template-create-param.dto'; -import { MapDto } from '../dtos/object>.dto'; -import { ListDto } from '../dtos/list<-template-list-vo>.dto'; +import { SendMobileCodeParam } from '../../../../dtos/api/login/param/send-mobile-code-param.dto'; +import { RegisterAccountParam } from '../../../../dtos/admin/notice/param/register-account-param.dto'; +import { TemplateListVo } from '../../../../dtos/admin/notice/vo/template-list-vo.dto'; +import { NoticeEnumListVo } from '../../../../dtos/notice/vo/notice-enum-list-vo.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { OrderListParam } from '../../../../dtos/admin/notice/param/order-list-param.dto'; +import { SendListParam } from '../../../../dtos/admin/notice/param/send-list-param.dto'; +import { EditAccountParam } from '../../../../dtos/admin/notice/param/edit-account-param.dto'; +import { SignDeleteParam } from '../../../../dtos/admin/notice/param/sign-delete-param.dto'; +import { SmsPackageParam } from '../../../../dtos/admin/notice/param/sms-package-param.dto'; +import { OrderCalculateParam } from '../../../../dtos/admin/notice/param/order-calculate-param.dto'; +import { TemplateCreateParam } from '../../../../dtos/admin/notice/param/template-create-param.dto'; +import { Map } from '../dtos/object>.dto'; @Injectable() export class NuiSmsServiceImplService { @@ -44,7 +45,7 @@ export class NuiSmsServiceImplService { * sendMobileCode */ async sendMobileCode(param: SendMobileCodeParam): Promise { - const body: Record = {}; + const body: Record = {}; body.put("mobile", param.mobile); body.put("captcha_key", param.captchaKey); body.put("captcha_code", param.captchaCode); @@ -84,7 +85,7 @@ export class NuiSmsServiceImplService { */ async loginAccount(param: RegisterAccountParam): Promise { const url: string = String.format(LOGIN_ACCOUNT_URL, param.username); - const body: Record = {}; + const body: Record = {}; body.put("username", param.username); body.put("password", param.password); try { @@ -124,7 +125,7 @@ export class NuiSmsServiceImplService { const newPassword: string = null; try { const resetPasswordUrl: string = String.format(RESET_PASSWORD_URL, param.username); - const resetPasswordBody: Record = {}; + const resetPasswordBody: Record = {}; resetPasswordBody.put("mobile", param.mobile); resetPasswordBody.put("code", param.code); resetPasswordBody.put("key", param.key); @@ -179,7 +180,7 @@ export class NuiSmsServiceImplService { throw new ApiException("牛云短信账号异常,请重新登录账号"); } const list: SysNotice[] = this.sysNoticeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); - const map: Record = {}; + const map: Record = {}; if (!CollectionUtils.isEmpty(list)) { map = list.collect(/* Collectors已删除 */.toMap(SysNotice::getKey, item => item)); } @@ -210,7 +211,7 @@ export class NuiSmsServiceImplService { const niuSmsTemplates: NiuSmsTemplate[] = this.niuSmsTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) .eq("username", username) .eq("site_id", siteId)); - const templateMap: Record = {}; + const templateMap: Record = {}; if (!CollectionUtils.isEmpty(niuSmsTemplates)){ templateMap = niuSmsTemplates.collect(/* Collectors已删除 */.toMap(NiuSmsTemplate::getTemplateKey, item => item)); } @@ -286,7 +287,7 @@ export class NuiSmsServiceImplService { const orderListUrl: string = String.format(ORDER_LIST_URL, username); const result: Record = null; try { - const orderListParam: Record = {}; + const orderListParam: Record = {}; orderListParam.put("out_trade_no", param.outTradeNo); orderListParam.put("order_status", param.status); orderListParam.put("create_time_start", param.createTimeStart); @@ -309,7 +310,7 @@ export class NuiSmsServiceImplService { */ async accountSendList(pageParam: PageParam, username: string, param: SendListParam): Promise { const accountSendUrl: string = String.format(ACCOUNT_SEND_LIST_URL, username); - const accountSendParam: Record = {}; + const accountSendParam: Record = {}; accountSendParam.put("mobile", param.mobile); accountSendParam.put("content", param.content); accountSendParam.put("smsStatus", param.smsStatus); @@ -357,7 +358,7 @@ export class NuiSmsServiceImplService { */ async editAccount(username: string, param: EditAccountParam): Promise { const editAccountUrl: string = String.format(ACCOUNT_EDIT_URL, username); - const editAccountBody: Record = {}; + const editAccountBody: Record = {}; editAccountBody.put("new_mobile", param.newMobile); editAccountBody.put("mobile", param.mobile); editAccountBody.put("code", param.code); @@ -428,7 +429,7 @@ export class NuiSmsServiceImplService { * getSmsPackageList */ async getSmsPackageList(param: SmsPackageParam): Promise { - const pageListParam: Record = {}; + const pageListParam: Record = {}; pageListParam.put("package_name", param.packageName); pageListParam.put("sms_num", param.smsNum); pageListParam.put("price_start", param.priceStart); @@ -456,7 +457,7 @@ export class NuiSmsServiceImplService { */ async orderCalculate(username: string, param: OrderCalculateParam): Promise { const orderCalculateUrl: string = String.format(ORDER_CALCULATE_URL, username); - const orderCalculateBody: Record = {}; + const orderCalculateBody: Record = {}; orderCalculateBody.put("package_id", param.packageId); try { const jsonObject: Record = NiucloudUtils.Niucloud.post(orderCalculateUrl, orderCalculateBody); @@ -475,7 +476,7 @@ export class NuiSmsServiceImplService { */ async createOrder(username: string, param: OrderCalculateParam): Promise { const orderCreateUrl: string = String.format(ORDER_CREATE_URL, username); - const orderCreateBody: Record = {}; + const orderCreateBody: Record = {}; orderCreateBody.put("package_id", param.packageId); try { const jsonObject: Record = NiucloudUtils.Niucloud.post(orderCreateUrl, orderCreateBody); @@ -503,7 +504,7 @@ export class NuiSmsServiceImplService { } const returnUrl: string = String.format("%s://%s/site/setting/sms/pay", protocol, host); const payInfoUrl: string = String.format(ORDER_PAY_URL, username); - const payInfoBody: Record = {}; + const payInfoBody: Record = {}; payInfoBody.put("notify_url", payInfoUrl); payInfoBody.put("return_url", returnUrl); payInfoBody.put("out_trade_no", outTradeNo); @@ -581,7 +582,7 @@ export class NuiSmsServiceImplService { const config: Record = getConfig(false); const templateCreateUrl: string = String.format(TEMPLATE_ADD_URL, username); - const templateCreateBody: Record = {}; + const templateCreateBody: Record = {}; templateCreateBody.put("temName", path.basename(templateInfo)); templateCreateBody.put("temType", param.templateType); templateCreateBody.put("temContent", templateInfo.sms.get("content")); @@ -632,7 +633,7 @@ export class NuiSmsServiceImplService { */ async templateDelete(username: string, templateId: string): Promise { const config: Record = getConfig(false); - const deleteBody: Record = {}; + const deleteBody: Record = {}; const time: number = DateUtil.currentSeconds(); deleteBody.put("tKey", time); deleteBody.put("password", DigestUtil.md5Hex(DigestUtil.md5Hex(config.getStr("password")) + time)); @@ -660,7 +661,7 @@ export class NuiSmsServiceImplService { throw new AdminException("短信模版暂未报备"); } const orderCreateUrl: string = String.format(TEMPLATE_INFO_URL, username); - const templateInfoParam: Record = {}; + const templateInfoParam: Record = {}; templateInfoParam.put("tem_id", niuSmsTemplate.templateId); try { const jsonObject: Record = NiucloudUtils.Niucloud.get(orderCreateUrl, templateInfoParam); @@ -701,7 +702,7 @@ export class NuiSmsServiceImplService { const config: Record = getConfig(true); config.put("default", CommonUtils.isNotEmpty(param.defaultVal) ? param.defaultVal : config.getOrDefault("default", "")); const niuSmsConfig: Record = config.getRecord(NIUYUN); - const newNiuSmsConfig: Record = {}; + const newNiuSmsConfig: Record = {}; newNiuSmsConfig.put("username", CommonUtils.isNotEmpty(param.username) ? param.username : niuSmsConfig != null ? niuSmsConfig.getOrDefault("username", "") : ""); newNiuSmsConfig.put("password", CommonUtils.isNotEmpty(param.password) ? param.password : niuSmsConfig != null ? niuSmsConfig.getOrDefault("password", "") : ""); newNiuSmsConfig.put("signature", CommonUtils.isNotEmpty(param.signature) ? param.signature : niuSmsConfig != null ? niuSmsConfig.getOrDefault("signature", "") : ""); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-channel-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-channel-service-impl.service.ts index dcbed933..6d3aac29 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-channel-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-channel-service-impl.service.ts @@ -2,8 +2,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PayChannelAllSetParamDto } from '../dtos/pay-channel-all-set-param.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; +import { PayChanneltemVo } from '../../../../dtos/admin/pay/vo/pay-channeltem-vo.dto'; +import { PayChannelAllSetParam } from '../../../../dtos/admin/pay/param/pay-channel-all-set-param.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { PayChannelListVo } from '../../../../dtos/core/pay/vo/pay-channel-list-vo.dto'; @Injectable() export class PayChannelServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-refund-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-refund-service-impl.service.ts index 6b4c3f21..327e6e35 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-refund-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-refund-service-impl.service.ts @@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { PayRefundSearchParamDto } from '../dtos/pay-refund-search-param.dto'; -import { PayRefundTransferParamDto } from '../dtos/pay-refund-transfer-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { PayRefundSearchParam } from '../../../../dtos/core/pay/param/pay-refund-search-param.dto'; +import { PayRefundListVo } from '../../../../dtos/core/pay/vo/pay-refund-list-vo.dto'; +import { PayRefundInfoVo } from '../../../../dtos/core/pay/vo/pay-refund-info-vo.dto'; +import { PayRefundTransferParam } from '../../../../dtos/core/pay/param/pay-refund-transfer-param.dto'; @Injectable() export class PayRefundServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-service-impl.service.ts index 97d436c4..4f58087e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-service-impl.service.ts @@ -2,10 +2,15 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { PaySearchParamDto } from '../dtos/pay-search-param.dto'; -import { PayParamDto } from '../dtos/pay-param.dto'; -import { GetFriendspayInfoByTradeParamDto } from '../dtos/get-friendspay-info-by-trade-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { PaySearchParam } from '../../../../dtos/core/pay/param/pay-search-param.dto'; +import { PayListVo } from '../../../../dtos/core/pay/vo/pay-list-vo.dto'; +import { PayInfoVo } from '../../../../dtos/core/pay/vo/pay-info-vo.dto'; +import { PayParam } from '../../../../dtos/admin/pay/param/pay-param.dto'; +import { GetFriendspayInfoByTradeParam } from '../../../../dtos/admin/pay/param/get-friendspay-info-by-trade-param.dto'; +import { GetInfoByTradeVo } from '../../../../dtos/core/pay/vo/get-info-by-trade-vo.dto'; +import { FriendsPayInfoByTradeVo } from '../../../../dtos/admin/pay/vo/friends-pay-info-by-trade-vo.dto'; +import { PayTypeVo } from '../../../../dtos/core/pay/vo/pay-type-vo.dto'; @Injectable() export class PayServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-transfer-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-transfer-service-impl.service.ts index f596280d..fc471d5c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-transfer-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-transfer-service-impl.service.ts @@ -2,8 +2,8 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { SetSceneIdParamDto } from '../dtos/set-scene-id-param.dto'; -import { SetTradeSceneParamDto } from '../dtos/set-trade-scene-param.dto'; +import { SetSceneIdParam } from '../../../../dtos/admin/pay/param/set-scene-id-param.dto'; +import { SetTradeSceneParam } from '../../../../dtos/core/pay/param/set-trade-scene-param.dto'; @Injectable() export class PayTransferServiceImplService { @@ -18,7 +18,7 @@ export class PayTransferServiceImplService { async setSceneId(param: SetSceneIdParam): Promise { const config: Record = this.coreTransferSceneService.getWechatTransferSceneConfig(this.requestContext.siteId); - const tradeScenelist: Record = TransferSceneEnum.wechatTransferSceneMap; + const tradeScenelist: Record = TransferSceneEnum.wechatTransferSceneMap; if (!tradeScenelist.containsKey(param.scene)) { throw new BadRequestException("不存在的商户转账场景"); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-account-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-account-log-service-impl.service.ts index c64c94e1..1d4c5127 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-account-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-account-log-service-impl.service.ts @@ -2,8 +2,10 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SiteAccountLogSearchParamDto } from '../dtos/site-account-log-search-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SiteAccountLogSearchParam } from '../../../../dtos/admin/site/param/site-account-log-search-param.dto'; +import { SiteAccountLogListVo } from '../../../../dtos/admin/site/vo/site-account-log-list-vo.dto'; +import { SiteAccountLogInfoVo } from '../../../../dtos/admin/site/vo/site-account-log-info-vo.dto'; @Injectable() export class SiteAccountLogServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts index 88e0ee86..610ac980 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts @@ -2,12 +2,14 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot'; -import { @LazyDto } from '../dtos/@-lazy.dto'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SiteGroupSearchParamDto } from '../dtos/site-group-search-param.dto'; -import { SiteGroupAddParamDto } from '../dtos/site-group-add-param.dto'; -import { SiteGroupParamDto } from '../dtos/site-group-param.dto'; -import { JSONArrayDto } from '../dtos/j-s-o-n-array.dto'; +import { @Lazy } from '../dtos/@-lazy.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SiteGroupSearchParam } from '../../../../dtos/admin/site/param/site-group-search-param.dto'; +import { SiteGroupListVo } from '../../../../dtos/admin/site/vo/site-group-list-vo.dto'; +import { SiteGroupAddParam } from '../../../../dtos/admin/site/param/site-group-add-param.dto'; +import { SiteGroupParam } from '../../../../dtos/admin/site/param/site-group-param.dto'; +import { JSONArray } from '../dtos/j-s-o-n-array.dto'; +import { InstallAddonListVo } from '../dtos/install-addon-list-vo.dto'; @Injectable() export class SiteGroupServiceImplService { @@ -186,7 +188,7 @@ export class SiteGroupServiceImplService { * checkAddon */ async checkAddon(jsonArray: JSONArray): Promise { - const addonListVoMap: Record = this.coreAddonService.installAddonList; + const addonListVoMap: Record = this.coreAddonService.installAddonList; const keys: string[] = new ArrayList<>(addonListVoMap.keySet()); const addonString: string[] = JSONUtil.toList(jsonArray, String.class); keys.retainAll(addonString); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts index c322f7d1..66ee5dd4 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts @@ -3,13 +3,21 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SiteSearchParamDto } from '../dtos/site-search-param.dto'; -import { SiteAddParamDto } from '../dtos/site-add-param.dto'; -import { SiteEditParamDto } from '../dtos/site-edit-param.dto'; -import { ClassDto } from '../dtos/class.dto'; -import { SiteDto } from '../dtos/site.dto'; -import { SiteGroupDto } from '../dtos/site-group.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SiteSearchParam } from '../../../../dtos/admin/site/param/site-search-param.dto'; +import { SiteListVo } from '../../../../dtos/admin/site/vo/site-list-vo.dto'; +import { SiteAdminVo } from '../../../../dtos/admin/site/vo/site-admin-vo.dto'; +import { SiteAddParam } from '../../../../dtos/admin/site/param/site-add-param.dto'; +import { SiteUserParam } from '../../../../dtos/admin/site/param/site-user-param.dto'; +import { SysUserRoleParam } from '../../../../dtos/admin/sys/param/sys-user-role-param.dto'; +import { SiteEditParam } from '../../../../dtos/admin/site/param/site-edit-param.dto'; +import { Class } from '../dtos/class.dto'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { Site } from '../dtos/site.dto'; +import { SiteGroup } from '../dtos/site-group.dto'; +import { ShowAppListVo } from '../../../../dtos/admin/site/vo/show-app-list-vo.dto'; +import { SpecialMenuListVo } from '../../../../dtos/admin/site/vo/special-menu-list-vo.dto'; +import { MenuVo } from '../dtos/menu-vo.dto'; @Injectable() export class SiteServiceImplService { @@ -124,7 +132,7 @@ export class SiteServiceImplService { const model: Site = new Site(); model.siteName = addParam.siteName; model.groupId = addParam.groupId; - model.appType = AppTypeEnum.path.basename(SITE); + model.appType = AppTypeEnum.basename(SITE); model.createTime = DateUtils.currTime(); model.expireTime = DateUtils.StringToTimestamp(addParam.expireTime); model.app = siteGroup.app; @@ -159,7 +167,7 @@ export class SiteServiceImplService { event.siteGroup = siteGroup; EventAndSubscribeOfPublisher.publishAll(event); - const param: Record = {}; + const param: Record = {}; param.put("site_id", siteId); param.put("main_app", siteGroup.app); param.put("tag", "add"); @@ -393,7 +401,7 @@ export class SiteServiceImplService { const authMenuList: JSONArray = this.authService.getAuthMenuTreeList(1, "all"); // 将菜单列表转换为Map，便于通过menu_key查找 - const authMenuMap: Record> = {}; + const authMenuMap: Record> = {}; for (const i of number = 0; i < authMenuList.length; i++) { const menu: Record = authMenuList.getRecord(i); authMenuMap.put(menu.get("menu_key").toString(), menu); @@ -405,7 +413,7 @@ export class SiteServiceImplService { return new SpecialMenuListVo("addon", []); } - const showList: Record = showCustomer(false); + const showList: Record = showCustomer(false); const addonChildMenus: AddonChildMenuEnum.MenuConfig[] = AddonChildMenuEnum.all; const menuList: SpecialMenuListVo.MenuVo[] = []; @@ -415,7 +423,7 @@ export class SiteServiceImplService { const menuKey: string = item.key; const menuKeyList: string[] = []; if (showList.containsKey(menuKey) && showList.get(menuKey) instanceof Map) { - const menuItem: Record = (Record) showList.get(menuKey); + const menuItem: Record = (Record) showList.get(menuKey); if (menuItem.containsKey("list") && menuItem.get("list") instanceof List) { List> listItems = (List>) menuItem.get("list"); for (Record listItem : listItems) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-user-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-user-service-impl.service.ts index 724e3e46..8f2153e3 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-user-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-user-service-impl.service.ts @@ -2,9 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SiteUserSearchParamDto } from '../dtos/site-user-search-param.dto'; -import { SiteUserParamDto } from '../dtos/site-user-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SiteUserSearchParam } from '../../../../dtos/admin/site/param/site-user-search-param.dto'; +import { SiteUserVo } from '../../../../dtos/admin/site/vo/site-user-vo.dto'; +import { SiteUserParam } from '../../../../dtos/admin/site/param/site-user-param.dto'; +import { SysUserParam } from '../../../../dtos/admin/sys/param/sys-user-param.dto'; +import { SysUserRoleParam } from '../../../../dtos/admin/sys/param/sys-user-role-param.dto'; @Injectable() export class SiteUserServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-hour-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-hour-service-impl.service.ts index b645cb82..9cce0a59 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-hour-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-hour-service-impl.service.ts @@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { StatHourSearchParamDto } from '../dtos/stat-hour-search-param.dto'; -import { StatHourParamDto } from '../dtos/stat-hour-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { StatHourSearchParam } from '../../../../dtos/admin/stat/param/stat-hour-search-param.dto'; +import { StatHourListVo } from '../../../../dtos/admin/stat/vo/stat-hour-list-vo.dto'; +import { StatHourInfoVo } from '../../../../dtos/admin/stat/vo/stat-hour-info-vo.dto'; +import { StatHourParam } from '../../../../dtos/admin/stat/param/stat-hour-param.dto'; @Injectable() export class StatHourServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-service-impl.service.ts index 133d06b9..5eb8285b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-service-impl.service.ts @@ -2,7 +2,15 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import * as path from 'path'; +import { StatInfoVo } from '../../../../dtos/admin/stat/vo/stat-info-vo.dto'; +import { StatToDayVo } from '../../../../dtos/admin/stat/vo/stat-to-day-vo.dto'; +import { MemberStatSearchParam } from '../../../../dtos/core/member/param/member-stat-search-param.dto'; +import { SiteSearchParam } from '../../../../dtos/admin/site/param/site-search-param.dto'; +import { StatSystemVo } from '../../../../dtos/admin/stat/vo/stat-system-vo.dto'; +import { StatDateVo } from '../../../../dtos/admin/stat/vo/stat-date-vo.dto'; +import { StatTypeVo } from '../../../../dtos/admin/stat/vo/stat-type-vo.dto'; +import { StatAppVo } from '../../../../dtos/admin/stat/vo/stat-app-vo.dto'; +import { CoreAddonSearchParam } from '../../../../dtos/core/addon/param/core-addon-search-param.dto'; @Injectable() export class StatServiceImplService { @@ -35,17 +43,17 @@ export class StatServiceImplService { //今日站点数 const todaySiteParam: SiteSearchParam = new SiteSearchParam(); todaySiteParam.createTime = createTimes; - todaySiteParam.appType = AppTypeEnum.path.basename(SITE); + todaySiteParam.appType = AppTypeEnum.basename(SITE); statToDayVo.todaySiteCount = this.siteService.getSiteCountByCondition(todaySiteParam); //正常站点数 const normaSiteParam: SiteSearchParam = new SiteSearchParam(); normaSiteParam.status = 1; - normaSiteParam.appType = AppTypeEnum.path.basename(SITE); + normaSiteParam.appType = AppTypeEnum.basename(SITE); statToDayVo.normaSiteCount = this.siteService.getSiteCountByCondition(normaSiteParam); //到期站点数 const expireSiteParam: SiteSearchParam = new SiteSearchParam(); expireSiteParam.status = 2; - expireSiteParam.appType = AppTypeEnum.path.basename(SITE); + expireSiteParam.appType = AppTypeEnum.basename(SITE); statToDayVo.expireSiteCount = this.siteService.getSiteCountByCondition(expireSiteParam); //即将到期站点数 const weekExpireSiteParam: SiteSearchParam = new SiteSearchParam(); @@ -54,7 +62,7 @@ export class StatServiceImplService { expireTimes[1] = DateUtils.getDateAddDay(7); weekExpireSiteParam.status = 1; weekExpireSiteParam.expireTime = expireTimes; - weekExpireSiteParam.appType = AppTypeEnum.path.basename(SITE); + weekExpireSiteParam.appType = AppTypeEnum.basename(SITE); statToDayVo.weekExpireSiteCount = this.siteService.getSiteCountByCondition(weekExpireSiteParam); /** @@ -103,9 +111,9 @@ export class StatServiceImplService { */ const memberStat: StatTypeVo = new StatTypeVo(); const sexlist: string[] = []; - sexlist.push(SexEnum.path.basename(MAN)); - sexlist.push(SexEnum.path.basename(WOMAN)); - sexlist.push(SexEnum.path.basename(UNKNOWN)); + sexlist.push(SexEnum.basename(MAN)); + sexlist.push(SexEnum.basename(WOMAN)); + sexlist.push(SexEnum.basename(UNKNOWN)); const sexCountList: number[] = []; const sexMemberParam: MemberStatSearchParam = new MemberStatSearchParam(); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-agreement-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-agreement-service-impl.service.ts index d3620c90..67292c02 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-agreement-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-agreement-service-impl.service.ts @@ -2,6 +2,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; +import { SysAgreementListVo } from '../../../../dtos/admin/sys/vo/sys-agreement-list-vo.dto'; +import { SysAgreementInfoVo } from '../../../../dtos/admin/sys/vo/sys-agreement-info-vo.dto'; @Injectable() export class SysAgreementServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-area-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-area-service-impl.service.ts index d1ce3a98..0c667504 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-area-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-area-service-impl.service.ts @@ -3,8 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysAreaSearchParamDto } from '../dtos/sys-area-search-param.dto'; +import { SysAreaByCodeVo } from '../../../../dtos/admin/sys/vo/sys-area-by-code-vo.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysAreaSearchParam } from '../../../../dtos/admin/sys/param/sys-area-search-param.dto'; +import { SysAreaListVo } from '../../../../dtos/api/sys/vo/sys-area-list-vo.dto'; +import { SysMapVo } from '../../../../dtos/admin/sys/vo/sys-map-vo.dto'; @Injectable() export class SysAreaServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-attachment-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-attachment-service-impl.service.ts index a7e0dda3..56aee58d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-attachment-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-attachment-service-impl.service.ts @@ -3,13 +3,15 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysAttachmentSearchParamDto } from '../dtos/sys-attachment-search-param.dto'; -import { AttachmentUploadParamDto } from '../dtos/attachment-upload-param.dto'; -import { SysAttachmentMoveParamDto } from '../dtos/sys-attachment-move-param.dto'; -import { SysAttachmentDelParamDto } from '../dtos/sys-attachment-del-param.dto'; -import { SysAttachmentCategorySearchParamDto } from '../dtos/sys-attachment-category-search-param.dto'; -import { SysAttachmentCategoryParamDto } from '../dtos/sys-attachment-category-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysAttachmentSearchParam } from '../../../../dtos/admin/sys/param/sys-attachment-search-param.dto'; +import { SysAttachmentListVo } from '../../../../dtos/admin/sys/vo/sys-attachment-list-vo.dto'; +import { AttachmentUploadParam } from '../../../../dtos/admin/sys/param/attachment-upload-param.dto'; +import { SysAttachmentMoveParam } from '../../../../dtos/admin/sys/param/sys-attachment-move-param.dto'; +import { SysAttachmentDelParam } from '../../../../dtos/admin/sys/param/sys-attachment-del-param.dto'; +import { SysAttachmentCategorySearchParam } from '../../../../dtos/admin/sys/param/sys-attachment-category-search-param.dto'; +import { SysAttachmentCategoryListVo } from '../../../../dtos/admin/sys/vo/sys-attachment-category-list-vo.dto'; +import { SysAttachmentCategoryParam } from '../../../../dtos/admin/sys/param/sys-attachment-category-param.dto'; @Injectable() export class SysAttachmentServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-backup-records-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-backup-records-service-impl.service.ts index 168a0d74..afa3674a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-backup-records-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-backup-records-service-impl.service.ts @@ -3,13 +3,14 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot'; import * as fs from 'fs'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysBackupRecordsSearchParamDto } from '../dtos/sys-backup-records-search-param.dto'; -import { SysBackupRecordsParamDto } from '../dtos/sys-backup-records-param.dto'; -import { SysBackupRecordsDelParamDto } from '../dtos/sys-backup-records-del-param.dto'; -import { BackupRestoreParamDto } from '../dtos/backup-restore-param.dto'; -import { BackupTaskVoDto } from '../dtos/backup-task-vo.dto'; -import { Dto } from '../dtos/.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysBackupRecordsSearchParam } from '../../../../dtos/admin/sys/param/sys-backup-records-search-param.dto'; +import { SysBackupRecordsListVo } from '../../../../dtos/admin/sys/vo/sys-backup-records-list-vo.dto'; +import { SysBackupRecordsParam } from '../../../../dtos/admin/sys/param/sys-backup-records-param.dto'; +import { SysBackupRecordsDelParam } from '../../../../dtos/admin/sys/param/sys-backup-records-del-param.dto'; +import { BackupRestoreParam } from '../../../../dtos/admin/sys/param/backup-restore-param.dto'; +import { BackupTaskVo } from '../dtos/backup-task-vo.dto'; +import { } from '../dtos/.dto'; @Injectable() export class SysBackupRecordsServiceImplService { @@ -151,7 +152,7 @@ export class SysBackupRecordsServiceImplService { vo.executed.add(step); } try { - const param: Record = null; + const param: Record = null; param = (Record) dynamicMethodCall(step, vo); if (param != null) { vo.params = param; @@ -204,7 +205,7 @@ export class SysBackupRecordsServiceImplService { vo.executed.add(step); } try { - const param: Record = null; + const param: Record = null; param = (Record) dynamicMethodCall(step, vo); if (param != null) { vo.params = param; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-config-service-impl.service.ts index cbebfe97..34251554 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-config-service-impl.service.ts @@ -2,12 +2,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { SysWebsiteParamDto } from '../dtos/sys-website-param.dto'; -import { SysCopyRightParamDto } from '../dtos/sys-copy-right-param.dto'; -import { SysMapParamDto } from '../dtos/sys-map-param.dto'; -import { SysDeveloperTokenParamDto } from '../dtos/sys-developer-token-param.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; -import { SysLoginConfigParamDto } from '../dtos/sys-login-config-param.dto'; +import { SysWebsiteParam } from '../../../../dtos/admin/sys/param/sys-website-param.dto'; +import { SysCopyRightParam } from '../../../../dtos/admin/sys/param/sys-copy-right-param.dto'; +import { SysMapParam } from '../../../../dtos/admin/sys/param/sys-map-param.dto'; +import { SysDeveloperTokenParam } from '../../../../dtos/admin/sys/param/sys-developer-token-param.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { SysLoginConfigParam } from '../../../../dtos/admin/sys/param/sys-login-config-param.dto'; @Injectable() export class SysConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-export-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-export-service-impl.service.ts index 803e5741..e45bc069 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-export-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-export-service-impl.service.ts @@ -2,10 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysExportSearchParamDto } from '../dtos/sys-export-search-param.dto'; -import { MapDto } from '../dtos/object>.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysExportSearchParam } from '../../../../dtos/admin/sys/param/sys-export-search-param.dto'; +import { SysExportListVo } from '../../../../dtos/admin/sys/vo/sys-export-list-vo.dto'; +import { Map } from '../dtos/object>.dto'; @Injectable() export class SysExportServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-menu-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-menu-service-impl.service.ts index 75ad5897..7854584e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-menu-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-menu-service-impl.service.ts @@ -2,8 +2,8 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { SysMenuParamDto } from '../dtos/sys-menu-param.dto'; -import { ListDto } from '../dtos/list<-string>.dto'; +import { SysMenuInfoVo } from '../../../../dtos/admin/sys/vo/sys-menu-info-vo.dto'; +import { SysMenuParam } from '../../../../dtos/admin/sys/param/sys-menu-param.dto'; @Injectable() export class SysMenuServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-log-service-impl.service.ts index 3f18a7e8..41186873 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-log-service-impl.service.ts @@ -2,8 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysNoticeLogSearchParamDto } from '../dtos/sys-notice-log-search-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysNoticeLogSearchParam } from '../../../../dtos/admin/sys/param/sys-notice-log-search-param.dto'; +import { NoticeEnumListVo } from '../../../../dtos/notice/vo/notice-enum-list-vo.dto'; +import { SysNoticeLogListVo } from '../../../../dtos/admin/sys/vo/sys-notice-log-list-vo.dto'; +import { SysNoticeLogInfoVo } from '../../../../dtos/admin/sys/vo/sys-notice-log-info-vo.dto'; @Injectable() export class SysNoticeLogServiceImplService { @@ -26,7 +29,7 @@ export class SysNoticeLogServiceImplService { if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "create_time", searchParam.createTime); queryWrapper.orderByDesc("id"); - const noticeEnum: Record = NoticeEnum.notice; + const noticeEnum: Record = NoticeEnum.notice; [SysNoticeLog[], number] iPage = this.sysNoticeLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); const list: SysNoticeLogListVo[] = []; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-service-impl.service.ts index c6d1f946..d708bd3b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-service-impl.service.ts @@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysNoticeSearchParamDto } from '../dtos/sys-notice-search-param.dto'; -import { SysNoticeParamDto } from '../dtos/sys-notice-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysNoticeSearchParam } from '../../../../dtos/admin/sys/param/sys-notice-search-param.dto'; +import { SysNoticeListVo } from '../../../../dtos/admin/sys/vo/sys-notice-list-vo.dto'; +import { SysNoticeInfoVo } from '../../../../dtos/admin/sys/vo/sys-notice-info-vo.dto'; +import { SysNoticeParam } from '../../../../dtos/admin/sys/param/sys-notice-param.dto'; @Injectable() export class SysNoticeServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-sms-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-sms-log-service-impl.service.ts index 097eb956..809bce0a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-sms-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-sms-log-service-impl.service.ts @@ -2,8 +2,11 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysNoticeSmsLogSearchParamDto } from '../dtos/sys-notice-sms-log-search-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysNoticeSmsLogSearchParam } from '../../../../dtos/core/notice/param/sys-notice-sms-log-search-param.dto'; +import { NoticeEnumListVo } from '../../../../dtos/notice/vo/notice-enum-list-vo.dto'; +import { SysNoticeSmsLogListVo } from '../../../../dtos/admin/sys/vo/sys-notice-sms-log-list-vo.dto'; +import { SysNoticeSmsLogInfoVo } from '../../../../dtos/admin/sys/vo/sys-notice-sms-log-info-vo.dto'; @Injectable() export class SysNoticeSmsLogServiceImplService { @@ -28,7 +31,7 @@ export class SysNoticeSmsLogServiceImplService { queryWrapper.orderByDesc("id"); const smsTypeEnum: Record = SmsTypeEnum.type; - const notice: Record = NoticeEnum.notice; + const notice: Record = NoticeEnum.notice; [SysNoticeSmsLog[], number] iPage = this.sysNoticeSmsLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); const list: SysNoticeSmsLogListVo[] = []; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-poster-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-poster-service-impl.service.ts index 292ee4b0..dce6c755 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-poster-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-poster-service-impl.service.ts @@ -3,12 +3,16 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysPosterSearchParamDto } from '../dtos/sys-poster-search-param.dto'; -import { SysPosterParamDto } from '../dtos/sys-poster-param.dto'; -import { SysPosterInitParamDto } from '../dtos/sys-poster-init-param.dto'; -import { SysPosterTemplateSearchParamDto } from '../dtos/sys-poster-template-search-param.dto'; -import { PreviewPosterParamDto } from '../dtos/preview-poster-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysPosterSearchParam } from '../../../../dtos/admin/sys/param/sys-poster-search-param.dto'; +import { SysPosterListVo } from '../../../../dtos/admin/sys/vo/sys-poster-list-vo.dto'; +import { SysPosterInfoVo } from '../../../../dtos/admin/sys/vo/sys-poster-info-vo.dto'; +import { SysPosterParam } from '../../../../dtos/admin/sys/param/sys-poster-param.dto'; +import { SysPosterInitParam } from '../../../../dtos/admin/sys/param/sys-poster-init-param.dto'; +import { SysPosterInitVo } from '../../../../dtos/admin/sys/vo/sys-poster-init-vo.dto'; +import { SysPosterTemplateSearchParam } from '../../../../dtos/admin/sys/param/sys-poster-template-search-param.dto'; +import { PreviewPosterParam } from '../../../../dtos/admin/sys/param/preview-poster-param.dto'; +import { GetPosterParam } from '../../../../dtos/core/poster/param/get-poster-param.dto'; @Injectable() export class SysPosterServiceImplService { @@ -212,7 +216,7 @@ export class SysPosterServiceImplService { getPosterParam.type = param.type; getPosterParam.siteId = this.requestContext.siteId; getPosterParam.channel = ObjectUtil.defaultIfNull(param.channel, "h5"); - const posterParam: Record = {}; + const posterParam: Record = {}; posterParam.put("mode", "preview"); getPosterParam.param = posterParam; getPosterParam.isThrowException = true; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts index 6c222486..94b66863 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts @@ -3,12 +3,15 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysPrinterSearchParamDto } from '../dtos/sys-printer-search-param.dto'; -import { SysPrinterParamDto } from '../dtos/sys-printer-param.dto'; -import { SysPrinterModifyStatusParamDto } from '../dtos/sys-printer-modify-status-param.dto'; -import { SysPrinterPrintTicketParamDto } from '../dtos/sys-printer-print-ticket-param.dto'; -import { SysPrinterDto } from '../dtos/sys-printer.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysPrinterSearchParam } from '../../../../dtos/admin/sys/param/sys-printer-search-param.dto'; +import { SysPrinterListVo } from '../../../../dtos/admin/sys/vo/sys-printer-list-vo.dto'; +import { SysPrinterInfoVo } from '../../../../dtos/admin/sys/vo/sys-printer-info-vo.dto'; +import { SysPrinterParam } from '../../../../dtos/admin/sys/param/sys-printer-param.dto'; +import { SysPrinterAddPrinterYlyParam } from '../../../../dtos/core/sys/param/sys-printer-add-printer-yly-param.dto'; +import { SysPrinterModifyStatusParam } from '../../../../dtos/admin/sys/param/sys-printer-modify-status-param.dto'; +import { SysPrinterPrintTicketParam } from '../../../../dtos/core/sys/param/sys-printer-print-ticket-param.dto'; +import { SysPrinter } from '../dtos/sys-printer.dto'; @Injectable() export class SysPrinterServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-template-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-template-service-impl.service.ts index 581c778c..570758e5 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-template-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-template-service-impl.service.ts @@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysPrinterTemplateSearchParamDto } from '../dtos/sys-printer-template-search-param.dto'; -import { SysPrinterTemplateParamDto } from '../dtos/sys-printer-template-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysPrinterTemplateSearchParam } from '../../../../dtos/admin/sys/param/sys-printer-template-search-param.dto'; +import { SysPrinterTemplateListVo } from '../../../../dtos/admin/sys/vo/sys-printer-template-list-vo.dto'; +import { SysPrinterTemplateInfoVo } from '../../../../dtos/admin/sys/vo/sys-printer-template-info-vo.dto'; +import { SysPrinterTemplateParam } from '../../../../dtos/admin/sys/param/sys-printer-template-param.dto'; @Injectable() export class SysPrinterTemplateServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-role-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-role-service-impl.service.ts index cc8136cd..63f640bb 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-role-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-role-service-impl.service.ts @@ -2,10 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysRoleSearchParamDto } from '../dtos/sys-role-search-param.dto'; -import { SysRoleParamDto } from '../dtos/sys-role-param.dto'; -import { ListDto } from '../dtos/list<-string>.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysRoleSearchParam } from '../../../../dtos/admin/sys/param/sys-role-search-param.dto'; +import { SysRoleListVo } from '../../../../dtos/admin/sys/vo/sys-role-list-vo.dto'; +import { SysRoleInfoVo } from '../../../../dtos/admin/sys/vo/sys-role-info-vo.dto'; +import { SysRoleParam } from '../../../../dtos/admin/sys/param/sys-role-param.dto'; @Injectable() export class SysRoleServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts index 17847f5e..b6c6868f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts @@ -3,13 +3,17 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -import { ApplicationContextDto } from '../dtos/application-context.dto'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysScheduleSearchParamDto } from '../dtos/sys-schedule-search-param.dto'; -import { SysScheduleStatusParamDto } from '../dtos/sys-schedule-status-param.dto'; -import { SysScheduleParamDto } from '../dtos/sys-schedule-param.dto'; -import { SysScheduleLogSearchParamDto } from '../dtos/sys-schedule-log-search-param.dto'; -import { SysScheduleLogDto } from '../dtos/sys-schedule-log.dto'; +import { ApplicationContext } from '../dtos/application-context.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysScheduleSearchParam } from '../../../../dtos/admin/sys/param/sys-schedule-search-param.dto'; +import { SysScheduleListVo } from '../../../../dtos/admin/sys/vo/sys-schedule-list-vo.dto'; +import { SysScheduleInfoVo } from '../../../../dtos/admin/sys/vo/sys-schedule-info-vo.dto'; +import { SysScheduleStatusParam } from '../../../../dtos/admin/sys/param/sys-schedule-status-param.dto'; +import { SysScheduleParam } from '../../../../dtos/admin/sys/param/sys-schedule-param.dto'; +import { SysScheduleTemplateVo } from '../../../../dtos/admin/sys/vo/sys-schedule-template-vo.dto'; +import { SysScheduleLogSearchParam } from '../../../../dtos/admin/sys/param/sys-schedule-log-search-param.dto'; +import { SysScheduleLogListVo } from '../../../../dtos/admin/sys/vo/sys-schedule-log-list-vo.dto'; +import { SysScheduleLog } from '../dtos/sys-schedule-log.dto'; @Injectable() export class SysScheduleServiceImplService { @@ -30,7 +34,7 @@ export class SysScheduleServiceImplService { */ async init(): Promise { // 通过 ApplicationContext 获取所有 IJobProvider 实现 - const providers: Record = applicationContext.getBeansOfType(IJobProvider.class); + const providers: Record = applicationContext.getBeansOfType(IJobProvider.class); log.info("Loaded job provider count: {}", providers.length); for (const provider of providers.values()) { log.info("Loaded job provider: {}", provider.getClass().name); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-upgrade-records-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-upgrade-records-service-impl.service.ts index 982dd9f0..aef4115a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-upgrade-records-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-upgrade-records-service-impl.service.ts @@ -3,8 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; import * as path from 'path'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysUpgradeRecordsSearchParamDto } from '../dtos/sys-upgrade-records-search-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysUpgradeRecordsSearchParam } from '../dtos/sys-upgrade-records-search-param.dto'; +import { SysUpgradeRecordsListVo } from '../dtos/sys-upgrade-records-list-vo.dto'; +import { SysUpgradeRecordsParam } from '../dtos/sys-upgrade-records-param.dto'; +import { SysUpgradeRecordsDelParam } from '../dtos/sys-upgrade-records-del-param.dto'; @Injectable() export class SysUpgradeRecordsServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-log-service-impl.service.ts index a2e2a478..1f066669 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-log-service-impl.service.ts @@ -2,8 +2,10 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysUserLogSearchParamDto } from '../dtos/sys-user-log-search-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysUserLogSearchParam } from '../../../../dtos/admin/sys/param/sys-user-log-search-param.dto'; +import { SysUserLogListVo } from '../../../../dtos/admin/sys/vo/sys-user-log-list-vo.dto'; +import { SysUserLogInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-log-info-vo.dto'; @Injectable() export class SysUserLogServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-role-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-role-service-impl.service.ts index ab578f3c..18a72291 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-role-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-role-service-impl.service.ts @@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysUserRoleSearchParamDto } from '../dtos/sys-user-role-search-param.dto'; -import { SysUserRoleParamDto } from '../dtos/sys-user-role-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysUserRoleSearchParam } from '../../../../dtos/admin/sys/param/sys-user-role-search-param.dto'; +import { SysUserRoleListVo } from '../../../../dtos/admin/sys/vo/sys-user-role-list-vo.dto'; +import { SysUserRoleInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-role-info-vo.dto'; +import { SysUserRoleParam } from '../../../../dtos/admin/sys/param/sys-user-role-param.dto'; @Injectable() export class SysUserRoleServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-service-impl.service.ts index 280fd5c3..d3d42c9b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-service-impl.service.ts @@ -2,12 +2,19 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, AppConfigService, CommonUtils } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysUserSearchParamDto } from '../dtos/sys-user-search-param.dto'; -import { SysUserParamDto } from '../dtos/sys-user-param.dto'; -import { SiteUserParamDto } from '../dtos/site-user-param.dto'; -import { SysUserCreateSiteLimitAddParamDto } from '../dtos/sys-user-create-site-limit-add-param.dto'; -import { SysUserCreateSiteLimitEditParamDto } from '../dtos/sys-user-create-site-limit-edit-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysUserSearchParam } from '../../../../dtos/admin/sys/param/sys-user-search-param.dto'; +import { SysUserListVo } from '../../../../dtos/admin/sys/vo/sys-user-list-vo.dto'; +import { SysUserDetailVo } from '../../../../dtos/admin/sys/vo/sys-user-detail-vo.dto'; +import { SysUserSiteRoleVo } from '../../../../dtos/admin/sys/vo/sys-user-site-role-vo.dto'; +import { SysUserParam } from '../../../../dtos/admin/sys/param/sys-user-param.dto'; +import { SysCreateSiteLimitParam } from '../../../../dtos/admin/sys/param/sys-create-site-limit-param.dto'; +import { SysUserInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-info-vo.dto'; +import { SiteUserParam } from '../../../../dtos/admin/site/param/site-user-param.dto'; +import { SysUserRoleParam } from '../../../../dtos/admin/sys/param/sys-user-role-param.dto'; +import { SysUserCreateSiteLimitVo } from '../../../../dtos/admin/sys/vo/sys-user-create-site-limit-vo.dto'; +import { SysUserCreateSiteLimitAddParam } from '../../../../dtos/admin/sys/param/sys-user-create-site-limit-add-param.dto'; +import { SysUserCreateSiteLimitEditParam } from '../../../../dtos/admin/sys/param/sys-user-create-site-limit-edit-param.dto'; @Injectable() export class SysUserServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts index fff3d91d..13178ebb 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts @@ -2,8 +2,11 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; -import { SpreadQrcodeParamDto } from '../dtos/spread-qrcode-param.dto'; -import { FileDto } from '../dtos/file.dto'; +import { StatSystemVo } from '../../../../dtos/admin/stat/vo/stat-system-vo.dto'; +import { StatVersionVo } from '../../../../dtos/admin/stat/vo/stat-version-vo.dto'; +import { SpreadQrcodeParam } from '../../../../dtos/admin/sys/param/spread-qrcode-param.dto'; +import { SpreadQrcodeVo } from '../../../../dtos/admin/sys/vo/spread-qrcode-vo.dto'; +import { File } from '../dtos/file.dto'; @Injectable() export class SystemServiceImplService { @@ -43,7 +46,7 @@ export class SystemServiceImplService { const vo: SpreadQrcodeVo = new SpreadQrcodeVo(); try { - const data: Record = {}; + const data: Record = {}; for (SpreadQrcodeParam.Param qrcodeParam : param.params) { const jsonArray: JSONArray = JSONUtil.parseArray(qrcodeParam); const jsonObject: Record = JsonUtils.parseObject(jsonArray); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upgrade/impl/upgrade-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upgrade/impl/upgrade-service-impl.service.ts index 4e2d6771..5600bd5f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upgrade/impl/upgrade-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upgrade/impl/upgrade-service-impl.service.ts @@ -3,10 +3,12 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot'; import * as fs from 'fs'; -import { @LazyDto } from '../dtos/@-lazy.dto'; -import { UpgradeParamDto } from '../dtos/upgrade-param.dto'; -import { UpgradeTaskVoDto } from '../dtos/upgrade-task-vo.dto'; -import { Dto } from '../dtos/.dto'; +import { @Lazy } from '../dtos/@-lazy.dto'; +import { UpgradeContentVo } from '../dtos/upgrade-content-vo.dto'; +import { UpgradeParam } from '../dtos/upgrade-param.dto'; +import { UpgradeTaskVo } from '../dtos/upgrade-task-vo.dto'; +import { SysUpgradeRecordsParam } from '../dtos/sys-upgrade-records-param.dto'; +import { } from '../dtos/.dto'; @Injectable() export class UpgradeServiceImplService { @@ -91,7 +93,7 @@ export class UpgradeServiceImplService { const apps: Map[] = []; if ((!addon || addon.length === 0)) { - const query: Record = {}; + const query: Record = {}; query.put("product_key", instance.productKey); query.put("app_key", this.appConfig.appKey); query.put("version", this.appConfig.version); @@ -99,7 +101,7 @@ export class UpgradeServiceImplService { } else { for (const key of addon.split(",")) { const addonModel: Addon = this.addonRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).select("version,type")); - const query: Record = {}; + const query: Record = {}; query.put("product_key", instance.productKey); query.put("app_key", key); query.put("version", addonModel.version); @@ -143,7 +145,7 @@ export class UpgradeServiceImplService { const instance: NiucloudUtils = NiucloudUtils.instance; // 获取下载token - const actionQuery: Record = new const query: Record<>(); + const actionQuery: Record = new const query: Record<>(); actionQuery.put("data[product_key]", instance.productKey); actionQuery.put("data[framework_version]", this.appConfig.version); actionQuery.put("data[app_key]", upgradeContent.getContent().get(0).getApp().appKey); @@ -252,7 +254,7 @@ export class UpgradeServiceImplService { vo.getLog().add(vo.getSteps().get(step).title); } try { - const param: Record = null; + const param: Record = null; param = (Record) dynamicMethodCall(step, vo); if (param != null) { vo.params = param; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upload/impl/storage-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upload/impl/storage-config-service-impl.service.ts index 7e85697b..8ef4dffb 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upload/impl/storage-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upload/impl/storage-config-service-impl.service.ts @@ -2,7 +2,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; +import { CoreStorAgeConfigVo } from '../../../../dtos/core/upload/vo/core-stor-age-config-vo.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; @Injectable() export class StorageConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verifier-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verifier-service-impl.service.ts index a4cc195b..ccdb2629 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verifier-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verifier-service-impl.service.ts @@ -2,9 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { VerifierSearchParamDto } from '../dtos/verifier-search-param.dto'; -import { VerifierParamDto } from '../dtos/verifier-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { VerifierSearchParam } from '../../../../dtos/admin/verify/param/verifier-search-param.dto'; +import { VerifierVo } from '../../../../dtos/admin/verify/vo/verifier-vo.dto'; +import { VerifierListVo } from '../../../../dtos/admin/verify/vo/verifier-list-vo.dto'; +import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto'; +import { VerifierParam } from '../../../../dtos/admin/verify/param/verifier-param.dto'; @Injectable() export class VerifierServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verify-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verify-service-impl.service.ts index 2e75c9e7..f89a1793 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verify-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verify-service-impl.service.ts @@ -2,8 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { VerifySearchParamDto } from '../dtos/verify-search-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { VerifySearchParam } from '../../../../dtos/admin/verify/param/verify-search-param.dto'; +import { VerifyVo } from '../../../../dtos/admin/verify/vo/verify-vo.dto'; +import { VerifyListVo } from '../../../../dtos/admin/verify/vo/verify-list-vo.dto'; +import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto'; +import { VerifyInfoVo } from '../../../../dtos/admin/verify/vo/verify-info-vo.dto'; @Injectable() export class VerifyServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts index e87614b2..16e50333 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts @@ -2,10 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { WeappConfigParamDto } from '../dtos/weapp-config-param.dto'; -import { SetDomainParamDto } from '../dtos/set-domain-param.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; -import { WeappConfigVoDto } from '../dtos/weapp-config-vo.dto'; +import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; +import { WeappConfigParam } from '../../../../dtos/core/weapp/param/weapp-config-param.dto'; +import { SetDomainParam } from '../dtos/set-domain-param.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { SceneDomainVo } from '../dtos/scene-domain-vo.dto'; @Injectable() export class WeappConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-template-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-template-service-impl.service.ts index e28fa580..fd13eb47 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-template-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-template-service-impl.service.ts @@ -2,8 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { WeappTemplateSyncParamDto } from '../dtos/weapp-template-sync-param.dto'; -import { ListDto } from '../dtos/list<-integer>.dto'; +import { AddonNoticeListVo } from '../../../../dtos/core/notice/vo/addon-notice-list-vo.dto'; +import { NoticeInfoVo } from '../../../../dtos/core/notice/vo/notice-info-vo.dto'; +import { WeappTemplateSyncParam } from '../../../../dtos/admin/weapp/param/weapp-template-sync-param.dto'; @Injectable() export class WeappTemplateServiceImplService { @@ -34,7 +35,7 @@ export class WeappTemplateServiceImplService { * sync */ async sync(param: WeappTemplateSyncParam): Promise { - const list: Record = this.coreNoticeService.getList(this.requestContext.siteId, param.keys); + const list: Record = this.coreNoticeService.getList(this.requestContext.siteId, param.keys); const keys: string[] = [param.getKeys(]); for (const item of list.values()) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-version-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-version-service-impl.service.ts index 2898ec55..d576f72f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-version-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-version-service-impl.service.ts @@ -3,8 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import * as fs from 'fs'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { WeappVersionAddParamDto } from '../dtos/weapp-version-add-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { WeappVersionListVo } from '../../../../dtos/admin/weapp/vo/weapp-version-list-vo.dto'; +import { WeappVersionAddParam } from '../../../../dtos/admin/weapp/param/weapp-version-add-param.dto'; +import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; +import { WeappUploadParam } from '../../../../dtos/core/weapp/param/weapp-upload-param.dto'; @Injectable() export class WeappVersionServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-config-service-impl.service.ts index 5806db3a..62ed2bd2 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-config-service-impl.service.ts @@ -2,7 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { WechatConfigParamDto } from '../dtos/wechat-config-param.dto'; +import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto'; +import { SceneDomainVo } from '../dtos/scene-domain-vo.dto'; +import { WechatStaticInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-static-info-vo.dto'; @Injectable() export class WechatConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-media-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-media-service-impl.service.ts index 4f5d8ea3..c31216bb 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-media-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-media-service-impl.service.ts @@ -2,9 +2,13 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { WechatMediaSearchParamDto } from '../dtos/wechat-media-search-param.dto'; -import { MultipartFileDto } from '../dtos/multipart-file.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { WechatMediaSearchParam } from '../../../../dtos/admin/wechat/param/wechat-media-search-param.dto'; +import { WechatMediaListVo } from '../../../../dtos/admin/wechat/vo/wechat-media-list-vo.dto'; +import { MultipartFile } from '../dtos/multipart-file.dto'; +import { AttachmentUploadParam } from '../../../../dtos/admin/sys/param/attachment-upload-param.dto'; +import { AttachmentUploadVo } from '../../../../dtos/admin/sys/vo/attachment-upload-vo.dto'; +import { WechatMediaInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-media-info-vo.dto'; @Injectable() export class WechatMediaServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-menu-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-menu-service-impl.service.ts index d46b9724..56c85776 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-menu-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-menu-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; -import { JSONArrayDto } from '../dtos/j-s-o-n-array.dto'; +import { JSONArray } from '../dtos/j-s-o-n-array.dto'; @Injectable() export class WechatMenuServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-reply-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-reply-service-impl.service.ts index 85cc8016..e3cd10c7 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-reply-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-reply-service-impl.service.ts @@ -3,11 +3,13 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { WechatReplySearchParamDto } from '../dtos/wechat-reply-search-param.dto'; -import { WechatReplyParamDto } from '../dtos/wechat-reply-param.dto'; -import { WechatDefaultReplyParamDto } from '../dtos/wechat-default-reply-param.dto'; -import { WechatSubscribeReplyParamDto } from '../dtos/wechat-subscribe-reply-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { WechatReplySearchParam } from '../../../../dtos/admin/wechat/param/wechat-reply-search-param.dto'; +import { WechatReplyListVo } from '../../../../dtos/admin/wechat/vo/wechat-reply-list-vo.dto'; +import { WechatReplyInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-reply-info-vo.dto'; +import { WechatReplyParam } from '../../../../dtos/admin/wechat/param/wechat-reply-param.dto'; +import { WechatDefaultReplyParam } from '../../../../dtos/admin/wechat/param/wechat-default-reply-param.dto'; +import { WechatSubscribeReplyParam } from '../../../../dtos/admin/wechat/param/wechat-subscribe-reply-param.dto'; @Injectable() export class WechatReplyServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-template-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-template-service-impl.service.ts index 010137b9..4a4f1d00 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-template-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-template-service-impl.service.ts @@ -2,8 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { WechatTemplateSyncParamDto } from '../dtos/wechat-template-sync-param.dto'; -import { ListDto } from '../dtos/list<-string>.dto'; +import { AddonNoticeListVo } from '../../../../dtos/core/notice/vo/addon-notice-list-vo.dto'; +import { NoticeInfoVo } from '../../../../dtos/core/notice/vo/notice-info-vo.dto'; +import { WechatTemplateSyncParam } from '../../../../dtos/admin/wechat/param/wechat-template-sync-param.dto'; @Injectable() export class WechatTemplateServiceImplService { @@ -34,7 +35,7 @@ export class WechatTemplateServiceImplService { * sync */ async sync(param: WechatTemplateSyncParam): Promise { - const list: Record = this.coreNoticeService.getList(this.requestContext.siteId, param.keys); + const list: Record = this.coreNoticeService.getList(this.requestContext.siteId, param.keys); const keys: string[] = [param.getKeys(]); for (const item of list.values()) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-config-service-impl.service.ts index dde7d18a..5ebf0f5c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-config-service-impl.service.ts @@ -2,8 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import * as path from 'path'; -import { OplatformConfigParamDto } from '../dtos/oplatform-config-param.dto'; +import { OplatformConfigParam } from '../../../../dtos/admin/wxoplatform/param/oplatform-config-param.dto'; @Injectable() export class OplatformConfigServiceImplService { @@ -22,7 +21,7 @@ export class OplatformConfigServiceImplService { * getWxOplatformConfig */ async getWxOplatformConfig(): Promise { - const jsonObject: Record = this.coreConfigService.getConfigValue(RequestUtils.defaultSiteId(), ConfigKeyEnum.path.basename(WXOPLATFORM)); + const jsonObject: Record = this.coreConfigService.getConfigValue(RequestUtils.defaultSiteId(), ConfigKeyEnum.basename(WXOPLATFORM)); const configJsonObject: Record = new Record(); configJsonObject.set("app_id", jsonObject.getStr("app_id", "")); configJsonObject.set("app_secret", jsonObject.getStr("app_secret", "")); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-server-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-server-service-impl.service.ts index 00ce2327..8ea49ce4 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-server-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-server-service-impl.service.ts @@ -2,8 +2,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils } from '@wwjBoot'; -import { OplatformServerParamDto } from '../dtos/oplatform-server-param.dto'; -import { WxMpXmlMessageDto } from '../dtos/wx-mp-xml-message.dto'; +import { OplatformServerParam } from '../../../../dtos/admin/wxoplatform/param/oplatform-server-param.dto'; +import { AuthorizationParam } from '../../../../dtos/admin/wxoplatform/param/authorization-param.dto'; +import { WxMpXmlMessage } from '../dtos/wx-mp-xml-message.dto'; +import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; @Injectable() export class OplatformServerServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-service-impl.service.ts index 59625b77..496128e7 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-service-impl.service.ts @@ -2,12 +2,14 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; -import * as path from 'path'; -import { AuthorizationParamDto } from '../dtos/authorization-param.dto'; -import { WxOpenAuthorizerInfoDto } from '../dtos/wx-open-authorizer-info.dto'; -import { WxOpenAuthorizationInfoDto } from '../dtos/wx-open-authorization-info.dto'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { IOplatformAuthRecordParamDto } from '../dtos/i-oplatform-auth-record-param.dto'; +import { AuthorizationParam } from '../../../../dtos/admin/wxoplatform/param/authorization-param.dto'; +import { WeappConfigParam } from '../../../../dtos/core/weapp/param/weapp-config-param.dto'; +import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto'; +import { WxOpenAuthorizerInfo } from '../dtos/wx-open-authorizer-info.dto'; +import { WxOpenAuthorizationInfo } from '../dtos/wx-open-authorization-info.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { IOplatformAuthRecordParam } from '../../../../dtos/admin/wxoplatform/param/i-oplatform-auth-record-param.dto'; +import { OplatformRecordVo } from '../../../../dtos/admin/wxoplatform/vo/oplatform-record-vo.dto'; @Injectable() export class OplatformServiceImplService { @@ -76,7 +78,7 @@ export class OplatformServiceImplService { * clearAuthorization */ async clearAuthorization(appid: string): Promise { - const configKey: string[] = new String[]{ ConfigKeyEnum.path.basename(WECHAT), ConfigKeyEnum.path.basename(WEAPP), ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO), ConfigKeyEnum.path.basename(WECHAT_AUTHORIZATION_INFO)}; + const configKey: string[] = new String[]{ ConfigKeyEnum.basename(WECHAT), ConfigKeyEnum.basename(WEAPP), ConfigKeyEnum.basename(WEAPP_AUTHORIZATION_INFO), ConfigKeyEnum.basename(WECHAT_AUTHORIZATION_INFO)}; this.sysConfigRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ }).in("config_key", configKey)); this.coreConfigService.cacheClear(); } @@ -91,7 +93,7 @@ export class OplatformServiceImplService { MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); wrapper.select(SysConfig::getCreateTime,SysConfig::getAddon,SysConfig::getStatus,SysConfig::getConfigKey, SysConfig::getValue, SysConfig::getSiteId, SysConfig::getUpdateTime); wrapper.leftJoin(Site.class, "siteinfo",Site::getSiteId, SysConfig::getSiteId).select("site_name"); - wrapper.in(SysConfig::getConfigKey, ConfigKeyEnum.path.basename(WECHAT_AUTHORIZATION_INFO), ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO)); + wrapper.in(SysConfig::getConfigKey, ConfigKeyEnum.basename(WECHAT_AUTHORIZATION_INFO), ConfigKeyEnum.basename(WEAPP_AUTHORIZATION_INFO)); wrapper.eq(SysConfig::getSiteId, this.requestContext.siteId); wrapper.orderByDesc(SysConfig::getUpdateTime); any /* TODO: Page */ pageObj = new Page<>(page, limit); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts index 942300cb..da05833c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts @@ -2,12 +2,17 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import * as path from 'path'; -import { @LazyDto } from '../dtos/@-lazy.dto'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { WxOplatfromWeappVersionDto } from '../dtos/wx-oplatfrom-weapp-version.dto'; -import { UndoAuditParamDto } from '../dtos/undo-audit-param.dto'; -import { SyncSiteGroupAuthWeappParamDto } from '../dtos/sync-site-group-auth-weapp-param.dto'; +import { @Lazy } from '../dtos/@-lazy.dto'; +import { WxOplatfromWeappVersionVo } from '../../../../dtos/admin/wxoplatform/vo/wx-oplatfrom-weapp-version-vo.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { OplatformConfigVo } from '../../../../dtos/admin/wxoplatform/vo/oplatform-config-vo.dto'; +import { WeappUploadParam } from '../../../../dtos/core/weapp/param/weapp-upload-param.dto'; +import { WxOplatfromWeappVersion } from '../dtos/wx-oplatfrom-weapp-version.dto'; +import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { SiteGroupWeappVersionVo } from '../../../../dtos/admin/wxoplatform/vo/site-group-weapp-version-vo.dto'; +import { UndoAuditParam } from '../../../../dtos/admin/wxoplatform/param/undo-audit-param.dto'; +import { SyncSiteGroupAuthWeappParam } from '../../../../dtos/admin/wxoplatform/param/sync-site-group-auth-weapp-param.dto'; @Injectable() export class WeappVersionServiceImplService { @@ -343,7 +348,7 @@ export class WeappVersionServiceImplService { const siteIds: number[] = this.siteRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("group_id", param.siteGroupId)).stream().map(Site::getSiteId); if (CommonUtils.isNotEmpty(siteIds)) { - const authSite: SysConfig[] = this.sysConfigRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("config_key", ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO))); + const authSite: SysConfig[] = this.sysConfigRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("config_key", ConfigKeyEnum.basename(WEAPP_AUTHORIZATION_INFO))); if (CommonUtils.isNotEmpty(authSite)) { authSite.forEach(item => { weappCommit(item.siteId, param.siteGroupId, version); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/agreement/impl/agreement-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/agreement/impl/agreement-service-impl.service.ts index 2b3195a8..3487f7db 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/agreement/impl/agreement-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/agreement/impl/agreement-service-impl.service.ts @@ -2,7 +2,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { AgreementInfoParamDto } from '../dtos/agreement-info-param.dto'; +import { AgreementInfoParam } from '../../../../dtos/api/agreement/param/agreement-info-param.dto'; +import { AgreementInfoVo } from '../../../../dtos/api/agreement/vo/agreement-info-vo.dto'; @Injectable() export class AgreementServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/channel/impl/app-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/channel/impl/app-service-impl.service.ts index 83308ee3..5096c7fb 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/channel/impl/app-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/channel/impl/app-service-impl.service.ts @@ -2,9 +2,15 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { WechatAuthParamDto } from '../dtos/wechat-auth-param.dto'; -import { GetNewVersionParamDto } from '../dtos/get-new-version-param.dto'; -import { AuthRegisterParamDto } from '../dtos/auth-register-param.dto'; +import { WechatAuthParam } from '../../../../dtos/api/wechat/param/wechat-auth-param.dto'; +import { LoginVo } from '../../../../dtos/api/login/vo/login-vo.dto'; +import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; +import { GetNewVersionParam } from '../../../../dtos/api/channel/param/get-new-version-param.dto'; +import { NewVersionVo } from '../../../../dtos/api/channel/vo/new-version-vo.dto'; +import { AuthRegisterParam } from '../../../../dtos/api/wechat/param/auth-register-param.dto'; +import { ApiAppConfigVo } from '../../../../dtos/api/channel/vo/api-app-config-vo.dto'; +import { AppConfigVo } from '../../../../dtos/core/channel/vo/app-config-vo.dto'; +import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; @Injectable() export class AppServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts index 56b5eea8..ccc7b1e8 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts @@ -2,9 +2,15 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { DiyFormWriteConfigDto } from '../dtos/diy-form-write-config.dto'; -import { DiyFormRecordsParamDto } from '../dtos/diy-form-records-param.dto'; -import { ListDto } from '../dtos/list<-diy-form-fields>.dto'; +import { DiyFormInfoVo } from '../../../../dtos/api/diy/vo/diy-form-info-vo.dto'; +import { DiyFormWriteConfig } from '../dtos/diy-form-write-config.dto'; +import { DiyFormRecordsParam } from '../../../../dtos/core/diy_form/param/diy-form-records-param.dto'; +import { DiyFormRecordsInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-info-vo.dto'; +import { DiyFormSubmitConfigInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-submit-config-info-vo.dto'; +import { DiyFormRecordsDetailVo } from '../../../../dtos/api/diy/vo/diy-form-records-detail-vo.dto'; +import { DiyFormRecordsFieldsListVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-fields-list-vo.dto'; +import { MemberConfigVo } from '../../../../dtos/admin/member/vo/member-config-vo.dto'; +import { DiyMemberRecordVo } from '../../../../dtos/api/diy/vo/diy-member-record-vo.dto'; @Injectable() export class DiyFormServiceImplService { @@ -75,7 +81,7 @@ export class DiyFormServiceImplService { } } } else { - const errorMap: Record = {}; + const errorMap: Record = {}; errorMap.put("title", "当前表单无法查看"); errorMap.put("type", "表单状态"); errorMap.put("desc", "该表单已关闭"); @@ -112,25 +118,25 @@ export class DiyFormServiceImplService { if (writeConfig != null) { // 检查会员是否可以参与 - const canJoinError: Record = checkMemberCanJoinOrNot(this.requestContext.memberId, writeConfig); + const canJoinError: Record = checkMemberCanJoinOrNot(this.requestContext.memberId, writeConfig); if ((canJoinError && canJoinError.length > 0)) { throw new ApiException(canJoinError.get("desc")); } // 检查表单填写时间 - const timeError: Record = checkFormWriteTime(writeConfig); + const timeError: Record = checkFormWriteTime(writeConfig); if ((timeError && timeError.length > 0)) { throw new ApiException(timeError.get("desc")); } // 检查表单总填写次数限制 - const formLimitError: Record = checkFormWriteLimitNum(diyFormRecordsParam.formId, writeConfig); + const formLimitError: Record = checkFormWriteLimitNum(diyFormRecordsParam.formId, writeConfig); if ((formLimitError && formLimitError.length > 0)) { throw new ApiException(formLimitError.get("desc")); } // 检查会员填写次数限制 - const memberLimitError: Record = checkMemberWriteLimitNum(this.requestContext.memberId, diyFormRecordsParam.formId, writeConfig); + const memberLimitError: Record = checkMemberWriteLimitNum(this.requestContext.memberId, diyFormRecordsParam.formId, writeConfig); if ((memberLimitError && memberLimitError.length > 0)) { throw new ApiException(memberLimitError.get("desc")); } @@ -213,7 +219,7 @@ export class DiyFormServiceImplService { } const result: DiyMemberRecordVo = setResult(diyFormFields); - const fieldMap: Record = diyFormRecordsFields.collect(/* Collectors已删除 */.toMap(DiyFormRecordsFields::getFieldKey, field => field)); + const fieldMap: Record = diyFormRecordsFields.collect(/* Collectors已删除 */.toMap(DiyFormRecordsFields::getFieldKey, field => field)); for (const field of result.formField) { if (fieldMap.containsKey(field.fieldKey)) { field.fieldValue = fieldMap.get(field.getFieldKey().fieldValue == null ? "" : fieldMap.get(field.getFieldKey()).fieldValue); @@ -245,25 +251,25 @@ export class DiyFormServiceImplService { if (writeConfig != null) { // 检查会员是否可以参与 - const canJoinError: Record = checkMemberCanJoinOrNot(this.requestContext.memberId, writeConfig); + const canJoinError: Record = checkMemberCanJoinOrNot(this.requestContext.memberId, writeConfig); if ((canJoinError && canJoinError.length > 0)) { throw new ApiException(canJoinError.get("desc")); } // 检查表单填写时间 - const timeError: Record = checkFormWriteTime(writeConfig); + const timeError: Record = checkFormWriteTime(writeConfig); if ((timeError && timeError.length > 0)) { throw new ApiException(timeError.get("desc")); } // 检查表单总填写次数限制 - const formLimitError: Record = checkFormWriteLimitNum(param.formId, writeConfig); + const formLimitError: Record = checkFormWriteLimitNum(param.formId, writeConfig); if ((formLimitError && formLimitError.length > 0)) { throw new ApiException(formLimitError.get("desc")); } // 检查会员填写次数限制 - const memberLimitError: Record = checkMemberWriteLimitNum(this.requestContext.memberId, param.formId, writeConfig); + const memberLimitError: Record = checkMemberWriteLimitNum(this.requestContext.memberId, param.formId, writeConfig); if ((memberLimitError && memberLimitError.length > 0)) { throw new ApiException(memberLimitError.get("desc")); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-service-impl.service.ts index 778b9b1f..a5e8f10b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-service-impl.service.ts @@ -3,10 +3,16 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; import * as path from 'path'; -import { DiyInfoParamDto } from '../dtos/diy-info-param.dto'; -import { DiyTabbarParamDto } from '../dtos/diy-tabbar-param.dto'; -import { DiyTabbarListParamDto } from '../dtos/diy-tabbar-list-param.dto'; -import { DiyShareParamDto } from '../dtos/diy-share-param.dto'; +import { DiyInfoParam } from '../../../../dtos/api/diy/param/diy-info-param.dto'; +import { StartUpPageConfigVo } from '../../../../dtos/core/diy/vo/start-up-page-config-vo.dto'; +import { TemplateParam } from '../../../../dtos/admin/diy/param/template-param.dto'; +import { DiyInfoVo } from '../../../../dtos/api/diy/vo/diy-info-vo.dto'; +import { DiyTabbarParam } from '../../../../dtos/api/diy/param/diy-tabbar-param.dto'; +import { DiyTabbarVo } from '../../../../dtos/api/diy/vo/diy-tabbar-vo.dto'; +import { DiyTabbarListParam } from '../../../../dtos/api/diy/param/diy-tabbar-list-param.dto'; +import { BottomConfigVo } from '../../../../dtos/core/diy/vo/bottom-config-vo.dto'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { DiyShareParam } from '../../../../dtos/api/diy/param/diy-share-param.dto'; @Injectable() export class DiyServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/auth-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/auth-service-impl.service.ts index b02d7f57..d0a0be0b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/auth-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/auth-service-impl.service.ts @@ -2,6 +2,11 @@ import { Injectable, UnauthorizedException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { MemberInfoParam } from '../../../../dtos/api/member/param/member-info-param.dto'; +import { MemberInfoVo } from '../../../../dtos/api/member/vo/member-info-vo.dto'; +import { H5ConfigVo } from '../../../../dtos/core/channel/vo/h5-config-vo.dto'; +import { PcConfigVo } from '../../../../dtos/core/channel/vo/pc-config-vo.dto'; @Injectable() export class AuthServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts index 60b39e78..75c2ae4d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts @@ -2,12 +2,17 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { @LazyDto } from '../dtos/@-lazy.dto'; -import { AccountLoginParamDto } from '../dtos/account-login-param.dto'; -import { MobileLoginParamDto } from '../dtos/mobile-login-param.dto'; -import { MemberDto } from '../dtos/member.dto'; -import { ResetPasswordParamDto } from '../dtos/reset-password-param.dto'; -import { SendMobileCodeParamDto } from '../dtos/send-mobile-code-param.dto'; +import { @Lazy } from '../dtos/@-lazy.dto'; +import { AccountLoginParam } from '../../../../dtos/api/login/param/account-login-param.dto'; +import { MobileLoginParam } from '../../../../dtos/api/login/param/mobile-login-param.dto'; +import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; +import { MobileRegisterParam } from '../../../../dtos/api/login/param/mobile-register-param.dto'; +import { Member } from '../dtos/member.dto'; +import { LoginVo } from '../../../../dtos/api/login/vo/login-vo.dto'; +import { ResetPasswordParam } from '../../../../dtos/api/login/param/reset-password-param.dto'; +import { SendMobileCodeParam } from '../../../../dtos/api/login/param/send-mobile-code-param.dto'; +import { MobileCodeCacheVo } from '../../../../dtos/api/login/vo/mobile-code-cache-vo.dto'; +import { SendMobileCodeVo } from '../../../../dtos/api/login/vo/send-mobile-code-vo.dto'; @Injectable() export class LoginServiceImplService { @@ -127,7 +132,7 @@ export class LoginServiceImplService { cache.code = String.format("%0" + 4 + "d", RandomUtil.randomInt(1, 9999)); cache.type = param.type; - const data: Record = {}; + const data: Record = {}; data.put("mobile", param.mobile); data.put("code", cache.code); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/register-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/register-service-impl.service.ts index 9f9f1b75..efb69b58 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/register-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/register-service-impl.service.ts @@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { AccountRegisterParamDto } from '../dtos/account-register-param.dto'; -import { MobileRegisterParamDto } from '../dtos/mobile-register-param.dto'; -import { MemberDto } from '../dtos/member.dto'; +import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; +import { AccountRegisterParam } from '../../../../dtos/api/login/param/account-register-param.dto'; +import { MobileRegisterParam } from '../../../../dtos/api/login/param/mobile-register-param.dto'; +import { Member } from '../dtos/member.dto'; +import { MobileCodeCacheVo } from '../../../../dtos/api/login/vo/mobile-code-cache-vo.dto'; @Injectable() export class RegisterServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-account-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-account-service-impl.service.ts index d58c3847..9e996142 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-account-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-account-service-impl.service.ts @@ -2,11 +2,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot'; -import { GetAmountType(Dto } from '../dtos/get-amount-type(.dto'; -import { GetTradeType(Dto } from '../dtos/get-trade-type(.dto'; -import { AccountRecordsParamDto } from '../dtos/account-records-param.dto'; -import { AccountAccountSourceParamDto } from '../dtos/account-account-source-param.dto'; -import { AccountPointCountParamDto } from '../dtos/account-point-count-param.dto'; +import { GetAmountType( } from '../dtos/get-amount-type(.dto'; +import { GetTradeType( } from '../dtos/get-trade-type(.dto'; +import { AccountRecordsParam } from '../../../../dtos/api/member/param/account-records-param.dto'; +import { AccountAccountSourceParam } from '../../../../dtos/api/member/param/account-account-source-param.dto'; +import { AccountPointCountParam } from '../../../../dtos/api/member/param/account-point-count-param.dto'; +import { AccountPointCountVo } from '../../../../dtos/api/member/vo/account-point-count-vo.dto'; @Injectable() export class MemberAccountServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts index 73cfdf94..d24c44ab 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts @@ -2,12 +2,14 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { MemberAddressAddParamDto } from '../dtos/member-address-add-param.dto'; -import { MemberAddressDto } from '../dtos/member-address.dto'; -import { MemberAddressDeleteParamDto } from '../dtos/member-address-delete-param.dto'; -import { MemberAddressEditParamDto } from '../dtos/member-address-edit-param.dto'; -import { MemberAddressGetInfoParamDto } from '../dtos/member-address-get-info-param.dto'; -import { MemberAddressGetListParamDto } from '../dtos/member-address-get-list-param.dto'; +import { MemberAddressAddParam } from '../../../../dtos/api/member/param/member-address-add-param.dto'; +import { MemberAddress } from '../dtos/member-address.dto'; +import { MemberAddressDeleteParam } from '../../../../dtos/api/member/param/member-address-delete-param.dto'; +import { MemberAddressEditParam } from '../../../../dtos/api/member/param/member-address-edit-param.dto'; +import { MemberAddressGetInfoParam } from '../../../../dtos/api/member/param/member-address-get-info-param.dto'; +import { MemberAddressGetInfoVo } from '../../../../dtos/api/member/vo/member-address-get-info-vo.dto'; +import { MemberAddressGetListParam } from '../../../../dtos/api/member/param/member-address-get-list-param.dto'; +import { MemberAddressListInfoVo } from '../../../../dtos/api/member/vo/member-address-list-info-vo.dto'; @Injectable() export class MemberAddressServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-cash-out-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-cash-out-service-impl.service.ts index 27d0c3f0..e70e7d52 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-cash-out-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-cash-out-service-impl.service.ts @@ -2,19 +2,23 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { MemberCashOutInfoParamDto } from '../dtos/member-cash-out-info-param.dto'; -import { MemberCashOutConfigParamDto } from '../dtos/member-cash-out-config-param.dto'; -import { MemberCashOutTransferMethodParamDto } from '../dtos/member-cash-out-transfer-method-param.dto'; -import { MemberCashOutApplyParamDto } from '../dtos/member-cash-out-apply-param.dto'; -import { MemberCashOutCancelParamDto } from '../dtos/member-cash-out-cancel-param.dto'; -import { CashOutTransferParamDto } from '../dtos/cash-out-transfer-param.dto'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { MemberCashOutAccountListParamDto } from '../dtos/member-cash-out-account-list-param.dto'; -import { MemberCashOutAccountDetailsParamDto } from '../dtos/member-cash-out-account-details-param.dto'; -import { MemberCashOutFirstAccountDetailsParamDto } from '../dtos/member-cash-out-first-account-details-param.dto'; -import { MemberCashOutAccountAddParamDto } from '../dtos/member-cash-out-account-add-param.dto'; -import { MemberCashOutAccountEditParamDto } from '../dtos/member-cash-out-account-edit-param.dto'; -import { MemberCashOutAccountDeleteParamDto } from '../dtos/member-cash-out-account-delete-param.dto'; +import { MemberCashOutInfoParam } from '../../../../dtos/api/member/param/member-cash-out-info-param.dto'; +import { MemberCashOutInfoVo } from '../../../../dtos/api/member/vo/member-cash-out-info-vo.dto'; +import { MemberCashOutConfigParam } from '../../../../dtos/api/member/param/member-cash-out-config-param.dto'; +import { MemberCashOutTransferMethodParam } from '../../../../dtos/api/member/param/member-cash-out-transfer-method-param.dto'; +import { MemberCashOutApplyParam } from '../../../../dtos/core/member/param/member-cash-out-apply-param.dto'; +import { MemberCashOutCancelParam } from '../../../../dtos/api/member/param/member-cash-out-cancel-param.dto'; +import { CashOutTransferParam } from '../../../../dtos/admin/member/param/cash-out-transfer-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { MemberCashOutAccountListParam } from '../../../../dtos/api/member/param/member-cash-out-account-list-param.dto'; +import { MemberCashOutAccountVo } from '../../../../dtos/api/member/vo/member-cash-out-account-vo.dto'; +import { MemberCashOutAccountDetailsParam } from '../../../../dtos/api/member/param/member-cash-out-account-details-param.dto'; +import { MemberCashOutAccountDetailsVo } from '../../../../dtos/api/member/vo/member-cash-out-account-details-vo.dto'; +import { MemberCashOutFirstAccountDetailsParam } from '../../../../dtos/api/member/param/member-cash-out-first-account-details-param.dto'; +import { MemberCashOutFirstAccountDetailsVo } from '../../../../dtos/api/member/vo/member-cash-out-first-account-details-vo.dto'; +import { MemberCashOutAccountAddParam } from '../../../../dtos/api/member/param/member-cash-out-account-add-param.dto'; +import { MemberCashOutAccountEditParam } from '../../../../dtos/api/member/param/member-cash-out-account-edit-param.dto'; +import { MemberCashOutAccountDeleteParam } from '../../../../dtos/api/member/param/member-cash-out-account-delete-param.dto'; @Injectable() export class MemberCashOutServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-level-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-level-service-impl.service.ts index 4ec8bf71..3cfb4a32 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-level-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-level-service-impl.service.ts @@ -2,8 +2,10 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { SetDto } from '../dtos/set<-integer>.dto'; -import { MemberLevelParamDto } from '../dtos/member-level-param.dto'; +import { MemberLevelSimpleInfoVo } from '../../../../dtos/api/member/vo/member-level-simple-info-vo.dto'; +import { MemberLevelParam } from '../../../../dtos/api/member/param/member-level-param.dto'; +import { MemberLevelInfoVo } from '../../../../dtos/api/member/vo/member-level-info-vo.dto'; +import { MemberGetMobileVo } from '../../../../dtos/api/member/vo/member-get-mobile-vo.dto'; @Injectable() export class MemberLevelServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-service-impl.service.ts index 83570acd..6ca6081e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-service-impl.service.ts @@ -2,13 +2,16 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { MemberInfoParamDto } from '../dtos/member-info-param.dto'; -import { MemberCenterParamDto } from '../dtos/member-center-param.dto'; -import { MemberModifyParamDto } from '../dtos/member-modify-param.dto'; -import { MemberEditParamDto } from '../dtos/member-edit-param.dto'; -import { MemberMobileParamDto } from '../dtos/member-mobile-param.dto'; -import { MemberLogParamDto } from '../dtos/member-log-param.dto'; -import { MemberQcodeParamDto } from '../dtos/member-qcode-param.dto'; +import { MemberInfoParam } from '../../../../dtos/api/member/param/member-info-param.dto'; +import { MemberInfoVo } from '../../../../dtos/api/member/vo/member-info-vo.dto'; +import { MemberConfigVo } from '../../../../dtos/admin/member/vo/member-config-vo.dto'; +import { MemberCenterParam } from '../../../../dtos/api/member/param/member-center-param.dto'; +import { MemberCenterVo } from '../../../../dtos/api/member/vo/member-center-vo.dto'; +import { MemberModifyParam } from '../../../../dtos/api/member/param/member-modify-param.dto'; +import { MemberEditParam } from '../../../../dtos/api/member/param/member-edit-param.dto'; +import { MemberMobileParam } from '../../../../dtos/api/member/param/member-mobile-param.dto'; +import { MemberLogParam } from '../../../../dtos/api/member/param/member-log-param.dto'; +import { MemberQcodeParam } from '../../../../dtos/api/member/param/member-qcode-param.dto'; @Injectable() export class MemberServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-sign-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-sign-service-impl.service.ts index 3da26e5d..241618dd 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-sign-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-sign-service-impl.service.ts @@ -2,13 +2,18 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { MemberSignRecordParamDto } from '../dtos/member-sign-record-param.dto'; -import { MemberSignDetailsParamDto } from '../dtos/member-sign-details-param.dto'; -import { MemberSignOperateParamDto } from '../dtos/member-sign-operate-param.dto'; -import { MemberSignMonthRecordParamDto } from '../dtos/member-sign-month-record-param.dto'; -import { MemberSignDayRecordParamDto } from '../dtos/member-sign-day-record-param.dto'; -import { MemberSignConfigParamDto } from '../dtos/member-sign-config-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { MemberSignRecordParam } from '../../../../dtos/api/member/param/member-sign-record-param.dto'; +import { MemberSignRecordVo } from '../../../../dtos/api/member/vo/member-sign-record-vo.dto'; +import { MemberSignDetailsParam } from '../../../../dtos/api/member/param/member-sign-details-param.dto'; +import { MemberSignDetailsVo } from '../../../../dtos/api/member/vo/member-sign-details-vo.dto'; +import { MemberSignOperateParam } from '../../../../dtos/api/member/param/member-sign-operate-param.dto'; +import { MemberSignConfigVo } from '../../../../dtos/api/member/vo/member-sign-config-vo.dto'; +import { MemberSignOperateVo } from '../../../../dtos/api/member/vo/member-sign-operate-vo.dto'; +import { MemberSignMonthRecordParam } from '../../../../dtos/api/member/param/member-sign-month-record-param.dto'; +import { MemberSignMonthRecordVo } from '../../../../dtos/api/member/vo/member-sign-month-record-vo.dto'; +import { MemberSignDayRecordParam } from '../../../../dtos/api/member/param/member-sign-day-record-param.dto'; +import { MemberSignConfigParam } from '../../../../dtos/api/member/param/member-sign-config-param.dto'; @Injectable() export class MemberSignServiceImplService { @@ -104,7 +109,7 @@ export class MemberSignServiceImplService { this.memberSignRepository.save(model); // 发放日签奖励 - const dayAwardVar: Record = {}; + const dayAwardVar: Record = {}; dayAwardVar.put("from_type", "day_sign_award"); dayAwardVar.put("memo", "日签奖励"); this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), config.dayAward, dayAwardVar); @@ -152,7 +157,7 @@ export class MemberSignServiceImplService { continueAward.remove("receive_limit"); continueAward.remove("receive_num"); - const continueAwardVar: Record = {}; + const continueAwardVar: Record = {}; continueAwardVar.put("from_type", "continue_sign_award"); continueAwardVar.put("memo", "连签奖励"); this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), continueAward, continueAwardVar); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/pay/impl/pay-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/pay/impl/pay-service-impl.service.ts index d6ee23e3..c1abb0ff 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/pay/impl/pay-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/pay/impl/pay-service-impl.service.ts @@ -2,10 +2,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PayParamDto } from '../dtos/pay-param.dto'; -import { PayAsyncNotifyParamDto } from '../dtos/pay-async-notify-param.dto'; -import { HttpServletRequestDto } from '../dtos/http-servlet-request.dto'; -import { HttpServletResponseDto } from '../dtos/http-servlet-response.dto'; +import { PayParam } from '../../../../dtos/admin/pay/param/pay-param.dto'; +import { PayAsyncNotifyParam } from '../../../../dtos/common/loader/pay/param/pay-async-notify-param.dto'; +import { HttpServletRequest } from '../dtos/http-servlet-request.dto'; +import { HttpServletResponse } from '../dtos/http-servlet-response.dto'; +import { GetInfoByTradeVo } from '../../../../dtos/core/pay/vo/get-info-by-trade-vo.dto'; +import { FriendspayInfoVo } from '../../../../dtos/api/pay/vo/friendspay-info-vo.dto'; @Injectable() export class PayServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/base64-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/base64-service-impl.service.ts index ea93bd45..6a533911 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/base64-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/base64-service-impl.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; +import { Base64ImageVo } from '../../../../dtos/api/sys/vo/base64-image-vo.dto'; @Injectable() export class Base64ServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts index 5e599bb7..23ab256b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts @@ -2,12 +2,13 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { ListDto } from '../dtos/list<-sys-area-level-vo>.dto'; -import { Map>Dto } from '../dtos/list<-sys-area-level-vo>>.dto'; -import { SysAreaLevelVoDto } from '../dtos/sys-area-level-vo.dto'; -import { SysAreaDto } from '../dtos/sys-area.dto'; -import { SysAreaAddressByLatlngParamDto } from '../dtos/sys-area-address-by-latlng-param.dto'; +import { SysAreaListVo } from '../../../../dtos/api/sys/vo/sys-area-list-vo.dto'; +import { SysAreaLevelVo } from '../../../../dtos/api/sys/vo/sys-area-level-vo.dto'; +import { Map } from '../dtos/list>.dto'; +import { SysArea } from '../dtos/sys-area.dto'; +import { SysAreaAddressByLatlngParam } from '../../../../dtos/api/sys/param/sys-area-address-by-latlng-param.dto'; +import { SysMapVo } from '../../../../dtos/admin/sys/vo/sys-map-vo.dto'; @Injectable() export class SysAreaServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-config-service-impl.service.ts index a1d9ecde..9a712d27 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-config-service-impl.service.ts @@ -2,10 +2,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { SysConfigCopyrightParamDto } from '../dtos/sys-config-copyright-param.dto'; -import { SysConfigSiteParamDto } from '../dtos/sys-config-site-param.dto'; -import { SysConfigSceneDomainParamDto } from '../dtos/sys-config-scene-domain-param.dto'; -import { SysConfigMapParamDto } from '../dtos/sys-config-map-param.dto'; +import { SysConfigCopyrightParam } from '../../../../dtos/api/sys/param/sys-config-copyright-param.dto'; +import { SysConfigSiteParam } from '../../../../dtos/api/sys/param/sys-config-site-param.dto'; +import { SysConfigSceneDomainParam } from '../dtos/sys-config-scene-domain-param.dto'; +import { SysConfigMapParam } from '../../../../dtos/api/sys/param/sys-config-map-param.dto'; @Injectable() export class SysConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-verify-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-verify-service-impl.service.ts index 6971cb0a..41bb6d02 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-verify-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-verify-service-impl.service.ts @@ -3,15 +3,19 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import * as fs from 'fs'; -import { SysVerifyGetCodeParamDto } from '../dtos/sys-verify-get-code-param.dto'; -import { MapDto } from '../dtos/object>.dto'; -import { SysVerifyCheckVerifierParamDto } from '../dtos/sys-verify-check-verifier-param.dto'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysVerifyRecordsParamDto } from '../dtos/sys-verify-records-param.dto'; -import { SysVerifyDetailParamDto } from '../dtos/sys-verify-detail-param.dto'; -import { SysVerifyByCodeParamDto } from '../dtos/sys-verify-by-code-param.dto'; -import { SysVerifyCodeParamDto } from '../dtos/sys-verify-code-param.dto'; +import { SysVerifyGetCodeParam } from '../../../../dtos/api/sys/param/sys-verify-get-code-param.dto'; +import { SysVerifyGetCodeVo } from '../../../../dtos/api/sys/vo/sys-verify-get-code-vo.dto'; +import { Map } from '../dtos/object>.dto'; +import { SysVerifyCheckVerifierParam } from '../../../../dtos/api/sys/param/sys-verify-check-verifier-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysVerifyRecordsParam } from '../../../../dtos/api/sys/param/sys-verify-records-param.dto'; +import { SysVerifyRecordsVo } from '../../../../dtos/api/sys/vo/sys-verify-records-vo.dto'; +import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto'; +import { SysVerifyDetailParam } from '../../../../dtos/api/sys/param/sys-verify-detail-param.dto'; +import { SysVerifyDetailVo } from '../../../../dtos/api/sys/vo/sys-verify-detail-vo.dto'; +import { SysVerifyByCodeParam } from '../../../../dtos/api/sys/param/sys-verify-by-code-param.dto'; +import { SysVerifyCodeParam } from '../../../../dtos/api/sys/param/sys-verify-code-param.dto'; @Injectable() export class SysVerifyServiceImplService { @@ -183,7 +187,7 @@ export class SysVerifyServiceImplService { */ async verifyCode(param: SysVerifyCodeParam): Promise { // 1、获取核销码数据 - const verifyMap: Record = this.getCodeData(param.code); + const verifyMap: Record = this.getCodeData(param.code); // 检测站点数据 if (verifyMap.get("site_id") == null || !verifyMap.get("site_id").equals(param.siteId())) { // 核销码已过期 @@ -198,7 +202,7 @@ export class SysVerifyServiceImplService { throw new Error("核销员不存在"); } // 核销操作 - const verifyDataMap: Record = {}; + const verifyDataMap: Record = {}; verifyDataMap.put("site_id", verifyMap.get("site_id")); verifyDataMap.put("code", param.code); verifyDataMap.put("body", verifyMap.get("body")); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/upload-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/upload-service-impl.service.ts index 5ca0693f..183c52f5 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/upload-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/upload-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { AttachmentUploadParamDto } from '../dtos/attachment-upload-param.dto'; +import { AttachmentUploadParam } from '../../../../dtos/admin/sys/param/attachment-upload-param.dto'; @Injectable() export class UploadServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/serve-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/serve-service-impl.service.ts index b1b702e7..37a49223 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/serve-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/serve-service-impl.service.ts @@ -2,9 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, RequestContextService } from '@wwjBoot'; -import { HttpServletRequestDto } from '../dtos/http-servlet-request.dto'; -import { HttpServletResponseDto } from '../dtos/http-servlet-response.dto'; -import { WxMaMessageDto } from '../dtos/wx-ma-message.dto'; +import { HttpServletRequest } from '../dtos/http-servlet-request.dto'; +import { HttpServletResponse } from '../dtos/http-servlet-response.dto'; +import { WxMaMessage } from '../dtos/wx-ma-message.dto'; @Injectable() export class ServeServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/weapp-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/weapp-service-impl.service.ts index 43f2b2ee..2f8a4383 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/weapp-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/weapp-service-impl.service.ts @@ -2,8 +2,10 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { WechatAuthParamDto } from '../dtos/wechat-auth-param.dto'; -import { AuthRegisterParamDto } from '../dtos/auth-register-param.dto'; +import { WechatAuthParam } from '../../../../dtos/api/wechat/param/wechat-auth-param.dto'; +import { LoginVo } from '../../../../dtos/api/login/vo/login-vo.dto'; +import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; +import { AuthRegisterParam } from '../../../../dtos/api/wechat/param/auth-register-param.dto'; @Injectable() export class WeappServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/serve-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/serve-service-impl.service.ts index 04c94e86..1b6e482b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/serve-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/serve-service-impl.service.ts @@ -2,9 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, RequestContextService } from '@wwjBoot'; -import { HttpServletRequestDto } from '../dtos/http-servlet-request.dto'; -import { HttpServletResponseDto } from '../dtos/http-servlet-response.dto'; -import { WxMpXmlMessageDto } from '../dtos/wx-mp-xml-message.dto'; +import { HttpServletRequest } from '../dtos/http-servlet-request.dto'; +import { HttpServletResponse } from '../dtos/http-servlet-response.dto'; +import { WxMpXmlMessage } from '../dtos/wx-mp-xml-message.dto'; @Injectable() export class ServeServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/wechat-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/wechat-service-impl.service.ts index 711c083a..89371636 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/wechat-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/wechat-service-impl.service.ts @@ -2,11 +2,16 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; -import { @LazyDto } from '../dtos/@-lazy.dto'; -import { WechatAuthParamDto } from '../dtos/wechat-auth-param.dto'; -import { WechatAuthDataLoginParamDto } from '../dtos/wechat-auth-data-login-param.dto'; -import { AuthRegisterParamDto } from '../dtos/auth-register-param.dto'; -import { WechatSyncParamDto } from '../dtos/wechat-sync-param.dto'; +import { @Lazy } from '../dtos/@-lazy.dto'; +import { WechatCodeUrlVo } from '../../../../dtos/api/wechat/vo/wechat-code-url-vo.dto'; +import { WechatAuthParam } from '../../../../dtos/api/wechat/param/wechat-auth-param.dto'; +import { WechatAuthDataLoginParam } from '../../../../dtos/api/wechat/param/wechat-auth-data-login-param.dto'; +import { LoginVo } from '../../../../dtos/api/login/vo/login-vo.dto'; +import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; +import { AuthRegisterParam } from '../../../../dtos/api/wechat/param/auth-register-param.dto'; +import { WechatSyncParam } from '../../../../dtos/api/wechat/param/wechat-sync-param.dto'; +import { WechatUserInfoVo } from '../../../../dtos/api/wechat/vo/wechat-user-info-vo.dto'; +import { WechatScanLoginVo } from '../../../../dtos/api/wechat/vo/wechat-scan-login-vo.dto'; @Injectable() export class WechatServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/cached-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/cached-service-impl.service.ts index 804d8c2f..3883e282 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/cached-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/cached-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { ClassDto } from '../dtos/class<-t>.dto'; +import { Class } from '../dtos/class.dto'; @Injectable() export class CachedServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts index ad89e463..5f348a99 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts @@ -3,9 +3,8 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService } from '@wwjBoot'; import * as fs from 'fs'; -import * as path from 'path'; -import { CoreAddonSearchParamDto } from '../dtos/core-addon-search-param.dto'; -import { AddonDto } from '../dtos/addon.dto'; +import { CoreAddonSearchParam } from '../../../../dtos/core/addon/param/core-addon-search-param.dto'; +import { Addon } from '../dtos/addon.dto'; @Injectable() export class CoreAddonServiceImplService { @@ -29,7 +28,7 @@ export class CoreAddonServiceImplService { try { // 获取本地所有的插件 const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon) - .map(path => path.toFile()) + .map(path => path) .filter(file => fs.statSync(file).isDirectory()) ; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/aliapp/impl/core-aliapp-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/aliapp/impl/core-aliapp-config-service-impl.service.ts index 26de2564..96ebcfaf 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/aliapp/impl/core-aliapp-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/aliapp/impl/core-aliapp-config-service-impl.service.ts @@ -2,7 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import { AliappConfigParamDto } from '../dtos/aliapp-config-param.dto'; +import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { AliappConfigVo } from '../../../../dtos/core/aliapp/vo/aliapp-config-vo.dto'; +import { AliappConfigParam } from '../../../../dtos/core/aliapp/param/aliapp-config-param.dto'; @Injectable() export class CoreAliappConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-app-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-app-service-impl.service.ts index ec681938..a929051c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-app-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-app-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { ConnectionDto } from '../dtos/connection.dto'; +import { Connection } from '../dtos/connection.dto'; @Injectable() export class CoreAppServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-async-task-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-async-task-service-impl.service.ts index 351d3070..99f68974 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-async-task-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-async-task-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { CoreAsyncTaskParamDto } from '../dtos/core-async-task-param.dto'; +import { CoreAsyncTaskParam } from '../dtos/core-async-task-param.dto'; @Injectable() export class CoreAsyncTaskServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-queue-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-queue-service-impl.service.ts index 6890b349..ec52e625 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-queue-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-queue-service-impl.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { TaskArgumentDto } from '../dtos/task-argument.dto'; -import { CoreQueueExecParamDto } from '../dtos/core-queue-exec-param.dto'; +import { TaskArgument } from '../dtos/task-argument.dto'; +import { CoreQueueExecParam } from '../../../../dtos/core/app/param/core-queue-exec-param.dto'; @Injectable() export class CoreQueueServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/core-captcha-img-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/core-captcha-img-service-impl.service.ts index 7cd36fe3..01730e62 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/core-captcha-img-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/core-captcha-img-service-impl.service.ts @@ -2,8 +2,9 @@ import { Injectable, UnauthorizedException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import { CoreCaptchaValiDateParamDto } from '../dtos/core-captcha-vali-date-param.dto'; -import { CaptchaVODto } from '../dtos/captcha-v-o.dto'; +import { CoreCaptchaInfoVo } from '../../../../dtos/core/captcha/vo/core-captcha-info-vo.dto'; +import { CoreCaptchaValiDateParam } from '../../../../dtos/core/captcha/param/core-captcha-vali-date-param.dto'; +import { CaptchaVO } from '../dtos/captcha-v-o.dto'; @Injectable() export class CoreCaptchaImgServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/default-captcha-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/default-captcha-service-impl.service.ts index e30f2671..70a773a9 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/default-captcha-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/default-captcha-service-impl.service.ts @@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils } from '@wwjBoot'; -import { PropertiesDto } from '../dtos/properties.dto'; -import { CaptchaVODto } from '../dtos/captcha-v-o.dto'; +import { Properties } from '../dtos/properties.dto'; +import { CaptchaVO } from '../dtos/captcha-v-o.dto'; @Injectable() export class DefaultCaptchaServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-cloud-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-cloud-service-impl.service.ts index 4660f165..2b6299f8 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-cloud-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-cloud-service-impl.service.ts @@ -3,10 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot'; import * as fs from 'fs'; -import { AppVersionAddParamDto } from '../dtos/app-version-add-param.dto'; -import { AppConfigVoDto } from '../dtos/app-config-vo.dto'; -import { AppCompileLogVoDto } from '../dtos/app-compile-log-vo.dto'; -import { GenerateSignCertParamDto } from '../dtos/generate-sign-cert-param.dto'; +import { AppVersionAddParam } from '../../../../dtos/admin/channel/param/app-version-add-param.dto'; +import { AppConfigVo } from '../../../../dtos/core/channel/vo/app-config-vo.dto'; +import { SysMapVo } from '../../../../dtos/admin/sys/vo/sys-map-vo.dto'; +import { AppCompileLogVo } from '../../../../dtos/core/channel/vo/app-compile-log-vo.dto'; +import { GenerateSignCertParam } from '../../../../dtos/core/channel/param/generate-sign-cert-param.dto'; @Injectable() export class CoreAppCloudServiceImplService { @@ -79,7 +80,7 @@ export class CoreAppCloudServiceImplService { const instance: NiucloudUtils = NiucloudUtils.instance; - const actionQuery: Record = new const query: Record<>(); + const actionQuery: Record = new const query: Record<>(); actionQuery.put("data[product_key]", instance.productKey); const actionToken: Record = this.niucloudService.getActionToken("appbuild", actionQuery); @@ -110,7 +111,7 @@ export class CoreAppCloudServiceImplService { async getAppCompileLog(key: string): Promise { const instance: NiucloudUtils = NiucloudUtils.instance; - const query: Record = {}; + const query: Record = {}; query.put("authorize_code", instance.code); query.put("timestamp", key); @@ -145,7 +146,7 @@ export class CoreAppCloudServiceImplService { * generateSignCert */ async generateSignCert(param: GenerateSignCertParam): Promise { - const query: Record = {}; + const query: Record = {}; query.put("key_alias", param.keyAlias); query.put("key_password", param.keyPassword); query.put("store_password", param.storePassword); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-service-impl.service.ts index 83da6b5e..272262be 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-service-impl.service.ts @@ -2,8 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import * as path from 'path'; -import { SetAppParamDto } from '../dtos/set-app-param.dto'; +import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { AppConfigVo } from '../../../../dtos/core/channel/vo/app-config-vo.dto'; +import { SetAppParam } from '../../../../dtos/core/channel/param/set-app-param.dto'; @Injectable() export class CoreAppServiceImplService { @@ -15,7 +16,7 @@ export class CoreAppServiceImplService { * getConfig */ async getConfig(siteId: number): Promise { - const config: CoreSysConfigVo = this.coreConfigService.getConfig(siteId, ConfigKeyEnum.path.basename(APP)); + const config: CoreSysConfigVo = this.coreConfigService.getConfig(siteId, ConfigKeyEnum.basename(APP)); if (config == null || config.valueJson == null) { return new AppConfigVo(); } @@ -26,6 +27,6 @@ export class CoreAppServiceImplService { * setConfig */ async setConfig(siteId: number, param: SetAppParam): Promise { - this.coreConfigService.config = siteId, ConfigKeyEnum.path.basename(APP, JsonUtils.parseObject(param)); + this.coreConfigService.config = siteId, ConfigKeyEnum.basename(APP, JsonUtils.parseObject(param)); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-h5-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-h5-service-impl.service.ts index 3895b6eb..af1ee767 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-h5-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-h5-service-impl.service.ts @@ -2,7 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; -import { SetH5ParamDto } from '../dtos/set-h5-param.dto'; +import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { H5ConfigVo } from '../../../../dtos/core/channel/vo/h5-config-vo.dto'; +import { SetH5Param } from '../../../../dtos/core/channel/param/set-h5-param.dto'; @Injectable() export class CoreH5ServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-pc-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-pc-service-impl.service.ts index 1428c35b..c1eed909 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-pc-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-pc-service-impl.service.ts @@ -2,7 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; -import { SetPcParamDto } from '../dtos/set-pc-param.dto'; +import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { PcConfigVo } from '../../../../dtos/core/channel/vo/pc-config-vo.dto'; +import { SetPcParam } from '../../../../dtos/core/channel/param/set-pc-param.dto'; @Injectable() export class CorePcServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy/impl/core-diy-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy/impl/core-diy-service-impl.service.ts index 275b320b..080cb581 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy/impl/core-diy-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy/impl/core-diy-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, JsonUtils } from '@wwjBoot'; -import { ListDto } from '../dtos/list<-diy-theme>.dto'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; @Injectable() export class CoreDiyServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-config-service-impl.service.ts index 41695aee..3d3e96a7 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-config-service-impl.service.ts @@ -2,8 +2,10 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils } from '@wwjBoot'; -import { DiyFormWriteConfigParamDto } from '../dtos/diy-form-write-config-param.dto'; -import { DiyFormSubmitConfigParamDto } from '../dtos/diy-form-submit-config-param.dto'; +import { DiyFormWriteConfigInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-write-config-info-vo.dto'; +import { DiyFormWriteConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-write-config-param.dto'; +import { DiyFormSubmitConfigInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-submit-config-info-vo.dto'; +import { DiyFormSubmitConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-submit-config-param.dto'; @Injectable() export class CoreDiyFormConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-records-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-records-service-impl.service.ts index 6d92bc10..16c0f511 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-records-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-records-service-impl.service.ts @@ -2,11 +2,13 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { DiyFormRecordsSearchParamDto } from '../dtos/diy-form-records-search-param.dto'; -import { DiyFormRecordsParamDto } from '../dtos/diy-form-records-param.dto'; -import { ListDto } from '../dtos/list<-diy-form-records-fields>.dto'; -import { ObjectDto } from '../dtos/object.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { DiyFormRecordsSearchParam } from '../../../../dtos/core/diy_form/param/diy-form-records-search-param.dto'; +import { DiyFormRecordsListVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-list-vo.dto'; +import { DiyFormRecordsFieldsListVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-fields-list-vo.dto'; +import { DiyFormRecordsInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-info-vo.dto'; +import { DiyFormRecordsParam } from '../../../../dtos/core/diy_form/param/diy-form-records-param.dto'; +import { Object } from '../dtos/object.dto'; @Injectable() export class CoreDiyFormRecordsServiceImplService { @@ -52,7 +54,7 @@ export class CoreDiyFormRecordsServiceImplService { Object.assign(memberVo, vo); vo.member = memberVo; if (CommonUtils.isNotEmpty(list)) { - const map: Record = {}; + const map: Record = {}; for (const item of list) { const diyFormRecordsFieldsListVo: DiyFormRecordsFieldsListVo = new DiyFormRecordsFieldsListVo(); Object.assign(diyFormRecordsFieldsListVo, item); @@ -78,7 +80,7 @@ export class CoreDiyFormRecordsServiceImplService { Object.assign(vo, model); const list: DiyFormRecordsFields[] = this.diyFormRecordsFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); if (CommonUtils.isNotEmpty(list)) { - const map: Record = {}; + const map: Record = {}; for (const item of list) { const diyFormRecordsFieldsListVo: DiyFormRecordsFieldsListVo = new DiyFormRecordsFieldsListVo(); Object.assign(diyFormRecordsFieldsListVo, item); @@ -104,7 +106,7 @@ export class CoreDiyFormRecordsServiceImplService { model.value = JSONUtil.toJsonStr(addParam.value); this.diyFormRecordsRepository.save(model); const list: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", addParam.siteId)); - const fieldList: Record = {}; + const fieldList: Record = {}; if (CommonUtils.isNotEmpty(list)) { for (const item of list) { @@ -223,7 +225,7 @@ export class CoreDiyFormRecordsServiceImplService { .set(DiyFormRecords::getValue, JSONUtil.toJsonStr(param.value))); // 获取字段配置 - const formFieldMap: Record = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) + const formFieldMap: Record = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) .select(DiyFormFields::getFieldKey, DiyFormFields::getFieldRequired, DiyFormFields::getFieldUnique) diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-account-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-account-service-impl.service.ts index 751ed182..07d77857 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-account-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-account-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils } from '@wwjBoot'; -import { DoubleDto } from '../dtos/double.dto'; +import { Double } from '../dtos/double.dto'; @Injectable() export class CoreMemberAccountServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts index d144870d..e3d0bc94 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts @@ -2,12 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils } from '@wwjBoot'; -import { MemberCashOutApplyParamDto } from '../dtos/member-cash-out-apply-param.dto'; -import { MemberCashOutDto } from '../dtos/member-cash-out.dto'; -import { MemberDto } from '../dtos/member.dto'; -import { CashOutConfigVoDto } from '../dtos/cash-out-config-vo.dto'; -import { MemberCashOutAuditParamDto } from '../dtos/member-cash-out-audit-param.dto'; -import { CashOutTransferParamDto } from '../dtos/cash-out-transfer-param.dto'; +import { MemberCashOutApplyParam } from '../../../../dtos/core/member/param/member-cash-out-apply-param.dto'; +import { CashOutConfigVo } from '../../../../dtos/admin/member/vo/cash-out-config-vo.dto'; +import { MemberCashOut } from '../dtos/member-cash-out.dto'; +import { Member } from '../dtos/member.dto'; +import { MemberCashOutAuditParam } from '../../../../dtos/admin/member/param/member-cash-out-audit-param.dto'; +import { CashOutTransferParam } from '../../../../dtos/admin/member/param/cash-out-transfer-param.dto'; @Injectable() export class CoreMemberCashOutServiceImplService { @@ -118,7 +118,7 @@ export class CoreMemberCashOutServiceImplService { memberCashOutMapper.updateById(cashOut); } - const data: Record = {}; + const data: Record = {}; data.put("transfer_voucher", ObjectUtil.defaultIfEmpty(param.transferVoucher, "")); data.put("transfer_remark", ObjectUtil.defaultIfEmpty(param.transferRemark, "")); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-config-service-impl.service.ts index 9aef32f1..006c2380 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-config-service-impl.service.ts @@ -2,11 +2,14 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import { @LazyDto } from '../dtos/@-lazy.dto'; -import { LoginConfigParamDto } from '../dtos/login-config-param.dto'; -import { CashOutConfigParamDto } from '../dtos/cash-out-config-param.dto'; -import { MemberConfigParamDto } from '../dtos/member-config-param.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; +import { @Lazy } from '../dtos/@-lazy.dto'; +import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; +import { LoginConfigParam } from '../../../../dtos/admin/member/param/login-config-param.dto'; +import { CashOutConfigVo } from '../../../../dtos/admin/member/vo/cash-out-config-vo.dto'; +import { CashOutConfigParam } from '../../../../dtos/admin/member/param/cash-out-config-param.dto'; +import { MemberConfigVo } from '../../../../dtos/admin/member/vo/member-config-vo.dto'; +import { MemberConfigParam } from '../../../../dtos/admin/member/param/member-config-param.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; @Injectable() export class CoreMemberConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-level-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-level-service-impl.service.ts index ce041e3c..f130c042 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-level-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-level-service-impl.service.ts @@ -31,7 +31,7 @@ export class CoreMemberLevelServiceImplService { const upgrade: MemberLevel[] = this.memberLevelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); if (CommonUtils.isNotEmpty(upgrade)) { - const vars: Record = new HashRecord(); + const vars: Record = new HashRecord(); vars.put("from_type", "level_upgrade"); vars.put("memo", "会员升级奖励"); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-service-impl.service.ts index 7ba58e0a..c8107844 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-service-impl.service.ts @@ -2,10 +2,14 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, CommonUtils } from '@wwjBoot'; -import { MemberStatSearchParamDto } from '../dtos/member-stat-search-param.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; -import { MapDto } from '../dtos/object>.dto'; +import { MemberConfigVo } from '../../../../dtos/admin/member/vo/member-config-vo.dto'; +import { MemberStatSearchParam } from '../../../../dtos/core/member/param/member-stat-search-param.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { Map } from '../dtos/object>.dto'; +import { MemberInfoDto } from '../../../../dtos/core/member/dto/member-info.dto'; +import { MemberLabelInfoVo } from '../../../../dtos/admin/member/vo/member-label-info-vo.dto'; +import { MemberLevelInfoVo } from '../../../../dtos/api/member/vo/member-level-info-vo.dto'; @Injectable() export class CoreMemberServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-service-impl.service.ts index 0b2b2fdb..3b6733c5 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-service-impl.service.ts @@ -2,11 +2,13 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot'; -import { @LazyDto } from '../dtos/@-lazy.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; -import { MapDto } from '../dtos/object>.dto'; -import { NoticeInfoVoDto } from '../dtos/notice-info-vo.dto'; +import { @Lazy } from '../dtos/@-lazy.dto'; +import { NoticeInfoVo } from '../../../../dtos/core/notice/vo/notice-info-vo.dto'; +import { NoticeEnumListVo } from '../../../../dtos/notice/vo/notice-enum-list-vo.dto'; +import { AddonNoticeListVo } from '../../../../dtos/core/notice/vo/addon-notice-list-vo.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { Map } from '../dtos/object>.dto'; @Injectable() export class CoreNoticeServiceImplService { @@ -37,7 +39,7 @@ export class CoreNoticeServiceImplService { */ async getAddonList(siteId: number): Promise { const list: SysNotice[] = this.sysNoticeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); - const map: Record = new const notice: Record<>(); + const map: Record = new const notice: Record<>(); if (ObjectUtil.isNotNull(list)) { for (const item of list) { map.put(item.key, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-sms-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-sms-log-service-impl.service.ts index aa823a1c..544cc02a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-sms-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-sms-log-service-impl.service.ts @@ -2,9 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { SysNoticeSmsLogSearchParamDto } from '../dtos/sys-notice-sms-log-search-param.dto'; -import { SysNoticeSmsLogDto } from '../dtos/sys-notice-sms-log.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { SysNoticeSmsLogSearchParam } from '../../../../dtos/core/notice/param/sys-notice-sms-log-search-param.dto'; +import { SysNoticeSmsLog } from '../dtos/sys-notice-sms-log.dto'; @Injectable() export class CoreNoticeSmsLogServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-channel-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-channel-service-impl.service.ts index 40f04a88..e51863fc 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-channel-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-channel-service-impl.service.ts @@ -2,8 +2,11 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import { @LazyDto } from '../dtos/@-lazy.dto'; -import { PayChannelSearchParamDto } from '../dtos/pay-channel-search-param.dto'; +import { @Lazy } from '../dtos/@-lazy.dto'; +import { PayChannelSearchParam } from '../../../../dtos/core/pay/param/pay-channel-search-param.dto'; +import { PayTypeVo } from '../../../../dtos/core/pay/vo/pay-type-vo.dto'; +import { WechatConfigVo } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto'; +import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; @Injectable() export class CorePayChannelServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-event-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-event-service-impl.service.ts index eb3b5b75..42d32c8a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-event-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-event-service-impl.service.ts @@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { PayRefundSearchParamDto } from '../dtos/pay-refund-search-param.dto'; -import { PayRefundParamDto } from '../dtos/pay-refund-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { PayRefundSearchParam } from '../../../../dtos/core/pay/param/pay-refund-search-param.dto'; +import { PayRefundListVo } from '../../../../dtos/core/pay/vo/pay-refund-list-vo.dto'; +import { PayRefundInfoVo } from '../../../../dtos/core/pay/vo/pay-refund-info-vo.dto'; +import { PayRefundParam } from '../../../../dtos/core/pay/param/pay-refund-param.dto'; @Injectable() export class CorePayEventServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts index 5a31ee45..d105bde9 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts @@ -2,14 +2,17 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils } from '@wwjBoot'; -import { PayParamDto } from '../dtos/pay-param.dto'; -import { PayAsyncNotifyParamDto } from '../dtos/pay-async-notify-param.dto'; -import { HttpServletRequestDto } from '../dtos/http-servlet-request.dto'; -import { HttpServletResponseDto } from '../dtos/http-servlet-response.dto'; -import { PayNotifyParamDto } from '../dtos/pay-notify-param.dto'; -import { PayDto } from '../dtos/pay.dto'; -import { ChannelEnumDto } from '../dtos/channel.dto'; -import { BigDecimalDto } from '../dtos/big-decimal.dto'; +import { PayParam } from '../../../../dtos/admin/pay/param/pay-param.dto'; +import { PayAsyncNotifyParam } from '../../../../dtos/common/loader/pay/param/pay-async-notify-param.dto'; +import { HttpServletRequest } from '../dtos/http-servlet-request.dto'; +import { HttpServletResponse } from '../dtos/http-servlet-response.dto'; +import { PayNotifyParam } from '../../../../dtos/common/loader/pay/param/pay-notify-param.dto'; +import { GetInfoByTradeVo } from '../../../../dtos/core/pay/vo/get-info-by-trade-vo.dto'; +import { PayTypeVo } from '../../../../dtos/core/pay/vo/pay-type-vo.dto'; +import { Pay } from '../dtos/pay.dto'; +import { SysPrinterPrintTicketParam } from '../../../../dtos/core/sys/param/sys-printer-print-ticket-param.dto'; +import { ChannelEnum } from '../dtos/channel.dto'; +import { BigDecimal } from '../dtos/big-decimal.dto'; @Injectable() export class CorePayServiceImplService { @@ -30,7 +33,7 @@ export class CorePayServiceImplService { const driver: BasePay = this.driver(param.siteId, param.channel, param.type); - const json: Record = {}; + const json: Record = {}; json.put("openid", param.openid); pay.json = JSONUtil.toJsonStr(json); this.payMapper.updateById(pay); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-refund-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-refund-service-impl.service.ts index 18a9e56a..a1340239 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-refund-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-refund-service-impl.service.ts @@ -2,10 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { @ValidatedDto } from '../dtos/@-validated.dto'; -import { PayRefundTransferParamDto } from '../dtos/pay-refund-transfer-param.dto'; -import { RefundNotifyParamDto } from '../dtos/refund-notify-param.dto'; -import { PayRefundDto } from '../dtos/pay-refund.dto'; +import { @Validated } from '../dtos/@-validated.dto'; +import { PayRefundTransferParam } from '../../../../dtos/core/pay/param/pay-refund-transfer-param.dto'; +import { RefundParam } from '../../../../dtos/common/loader/pay/param/refund-param.dto'; +import { RefundNotifyParam } from '../../../../dtos/common/loader/pay/param/refund-notify-param.dto'; +import { PayRefund } from '../dtos/pay-refund.dto'; @Injectable() export class CoreRefundServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-scene-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-scene-service-impl.service.ts index 0d6b1500..a5fb2aca 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-scene-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-scene-service-impl.service.ts @@ -2,9 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import * as path from 'path'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; -import { SetTradeSceneParamDto } from '../dtos/set-trade-scene-param.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { WechatTransferSceneListVo } from '../../../../dtos/core/pay/vo/wechat-transfer-scene-list-vo.dto'; +import { SetTradeSceneParam } from '../../../../dtos/core/pay/param/set-trade-scene-param.dto'; @Injectable() export class CoreTransferSceneServiceImplService { @@ -17,7 +17,7 @@ export class CoreTransferSceneServiceImplService { * getWechatTransferSceneConfig */ async getWechatTransferSceneConfig(siteId: number): Promise { - const config: Record = this.coreConfigService.getConfigValue(siteId, ConfigKeyEnum.path.basename(WECHAT_TRANSFER_SCENE_CONFIG)); + const config: Record = this.coreConfigService.getConfigValue(siteId, ConfigKeyEnum.basename(WECHAT_TRANSFER_SCENE_CONFIG)); if (ObjectUtil.isNull(config)) return new Record(); return config; } @@ -26,7 +26,7 @@ export class CoreTransferSceneServiceImplService { * setWechatTransferSceneConfig */ async setWechatTransferSceneConfig(siteId: number, data: JSONObject): Promise { - this.coreConfigService.config = siteId, ConfigKeyEnum.path.basename(WECHAT_TRANSFER_SCENE_CONFIG, data); + this.coreConfigService.config = siteId, ConfigKeyEnum.basename(WECHAT_TRANSFER_SCENE_CONFIG, data); } /** diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-service-impl.service.ts index f56a7b1e..cc1dacb3 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-service-impl.service.ts @@ -2,10 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { PayTransferDto } from '../dtos/pay-transfer.dto'; -import { MapDto } from '../dtos/object>.dto'; -import { TransferNotifyParamDto } from '../dtos/transfer-notify-param.dto'; +import { PayTransfer } from '../dtos/pay-transfer.dto'; +import { Map } from '../dtos/object>.dto'; +import { TransferParam } from '../../../../dtos/common/loader/pay/param/transfer-param.dto'; +import { TransferNotifyParam } from '../../../../dtos/common/loader/pay/param/transfer-notify-param.dto'; +import { TransferQueryVo } from '../../../../dtos/core/pay/vo/transfer-query-vo.dto'; @Injectable() export class CoreTransferServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/poster/impl/core-poster-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/poster/impl/core-poster-service-impl.service.ts index 8e71cb65..ff67adb4 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/poster/impl/core-poster-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/poster/impl/core-poster-service-impl.service.ts @@ -3,8 +3,8 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot'; import * as fs from 'fs'; -import { GetPosterParamDto } from '../dtos/get-poster-param.dto'; -import { AddPosterParamDto } from '../dtos/add-poster-param.dto'; +import { GetPosterParam } from '../../../../dtos/core/poster/param/get-poster-param.dto'; +import { AddPosterParam } from '../../../../dtos/core/poster/param/add-poster-param.dto'; @Injectable() export class CorePosterServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/schedule/impl/core-schedule-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/schedule/impl/core-schedule-service-impl.service.ts index 2e07af5d..2d2d6c9e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/schedule/impl/core-schedule-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/schedule/impl/core-schedule-service-impl.service.ts @@ -20,7 +20,7 @@ export class CoreScheduleServiceImplService { if (CommonUtils.isNotEmpty(schedule)) { const scheduleList: SysSchedule[] = this.sysScheduleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).select("id,`key`")); - const scheduleMap: Record = scheduleList.collect(/* Collectors已删除 */.toMap(SysSchedule::getKey, i => i)); + const scheduleMap: Record = scheduleList.collect(/* Collectors已删除 */.toMap(SysSchedule::getKey, i => i)); const list: SysSchedule[] = []; @@ -79,7 +79,7 @@ export class CoreScheduleServiceImplService { if (CommonUtils.isNotEmpty(schedule)) { const scheduleList: SysSchedule[] = this.sysScheduleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).select("id,`key`")); - const scheduleMap: Record = scheduleList.collect(/* Collectors已删除 */.toMap(SysSchedule::getKey, i => i)); + const scheduleMap: Record = scheduleList.collect(/* Collectors已删除 */.toMap(SysSchedule::getKey, i => i)); const list: SysSchedule[] = []; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-account-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-account-service-impl.service.ts index 509e4592..31b8033c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-account-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-account-service-impl.service.ts @@ -2,9 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { PayDto } from '../dtos/pay.dto'; -import { PayRefundDto } from '../dtos/pay-refund.dto'; -import { PayTransferDto } from '../dtos/pay-transfer.dto'; +import { Pay } from '../dtos/pay.dto'; +import { PayRefund } from '../dtos/pay-refund.dto'; +import { PayTransfer } from '../dtos/pay-transfer.dto'; @Injectable() export class CoreSiteAccountServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-service-impl.service.ts index a08d9485..8bd7ed6c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-service-impl.service.ts @@ -2,7 +2,8 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot'; -import { ListDto } from '../dtos/list<-string>.dto'; +import { SiteInfoCacheVo } from '../../../../dtos/core/site/vo/site-info-cache-vo.dto'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; @Injectable() export class CoreSiteServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sms/impl/core-sms-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sms/impl/core-sms-service-impl.service.ts index 7e1bb6c9..8e5faf23 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sms/impl/core-sms-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sms/impl/core-sms-service-impl.service.ts @@ -2,8 +2,9 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { NoticeInfoVoDto } from '../dtos/notice-info-vo.dto'; -import { NoticeDataVoDto } from '../dtos/notice-data-vo.dto'; +import { NoticeInfoVo } from '../../../../dtos/core/notice/vo/notice-info-vo.dto'; +import { NoticeDataVo } from '../../../../dtos/notice-data-vo.dto'; +import { SendResultVo } from '../../../../dtos/send-result-vo.dto'; @Injectable() export class CoreSmsServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-config-service-impl.service.ts index b97fd232..90b29b8d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-config-service-impl.service.ts @@ -2,7 +2,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils } from '@wwjBoot'; -import { JSONDto } from '../dtos/j-s-o-n.dto'; +import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { JSON } from '../dtos/j-s-o-n.dto'; @Injectable() export class CoreConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts index b958845a..84b0c3f8 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts @@ -2,11 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot'; -import { SysExportDto } from '../dtos/sys-export.dto'; -import { SysExportParamDto } from '../dtos/sys-export-param.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; -import { PageParamDto } from '../dtos/page-param.dto'; -import { JSONArrayDto } from '../dtos/j-s-o-n-array.dto'; +import { SysExport } from '../dtos/sys-export.dto'; +import { SysExportParam } from '../../../../dtos/core/sys/param/sys-export-param.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { JSONArray } from '../dtos/j-s-o-n-array.dto'; @Injectable() export class CoreExportServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-menu-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-menu-service-impl.service.ts index 5c3335fa..736bdcb7 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-menu-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-menu-service-impl.service.ts @@ -4,8 +4,6 @@ import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot'; import * as fs from 'fs'; import * as path from 'path'; -import { ListDto } from '../dtos/list<-j-s-o-n-object>.dto'; -import { BooleanDto } from '../dtos/boolean.dto'; @Injectable() export class CoreMenuServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-printer-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-printer-service-impl.service.ts index 1cfc43a5..09468061 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-printer-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-printer-service-impl.service.ts @@ -2,10 +2,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; -import { JSONDto } from '../dtos/j-s-o-n.dto'; -import { SysPrinterAddPrinterYlyParamDto } from '../dtos/sys-printer-add-printer-yly-param.dto'; -import { SysPrinterDto } from '../dtos/sys-printer.dto'; -import { SysPrinterPrintTicketParamDto } from '../dtos/sys-printer-print-ticket-param.dto'; +import { JSON } from '../dtos/j-s-o-n.dto'; +import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { SysPrinterAddPrinterYlyParam } from '../../../../dtos/core/sys/param/sys-printer-add-printer-yly-param.dto'; +import { SysPrinter } from '../dtos/sys-printer.dto'; +import { SysPrinterPrintTicketParam } from '../../../../dtos/core/sys/param/sys-printer-print-ticket-param.dto'; +import { SysPrinterPrintTicketVo } from '../../../../dtos/core/sys/vo/sys-printer-print-ticket-vo.dto'; @Injectable() export class CorePrinterServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-scan-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-scan-service-impl.service.ts index 1e2921ec..65d6dbaf 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-scan-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-scan-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; @Injectable() export class CoreScanServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-sys-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-sys-config-service-impl.service.ts index 95a4f798..a46bc7c4 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-sys-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-sys-config-service-impl.service.ts @@ -2,12 +2,20 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -import { SysWebsiteParamDto } from '../dtos/sys-website-param.dto'; -import { SysCopyRightParamDto } from '../dtos/sys-copy-right-param.dto'; -import { SysMapParamDto } from '../dtos/sys-map-param.dto'; -import { SysDeveloperTokenParamDto } from '../dtos/sys-developer-token-param.dto'; -import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; -import { SysLoginConfigParamDto } from '../dtos/sys-login-config-param.dto'; +import { SysWebsiteVo } from '../../../../dtos/admin/sys/vo/sys-website-vo.dto'; +import { SysServiceVo } from '../../../../dtos/admin/sys/vo/sys-service-vo.dto'; +import { SysWebsiteParam } from '../../../../dtos/admin/sys/param/sys-website-param.dto'; +import { SysCopyRightVo } from '../../../../dtos/admin/sys/vo/sys-copy-right-vo.dto'; +import { SysCopyRightParam } from '../../../../dtos/admin/sys/param/sys-copy-right-param.dto'; +import { SysMapVo } from '../../../../dtos/admin/sys/vo/sys-map-vo.dto'; +import { SysMapParam } from '../../../../dtos/admin/sys/param/sys-map-param.dto'; +import { SysDeveloperTokenVo } from '../../../../dtos/admin/sys/vo/sys-developer-token-vo.dto'; +import { SysDeveloperTokenParam } from '../../../../dtos/admin/sys/param/sys-developer-token-param.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { SysLoginConfigVo } from '../../../../dtos/admin/sys/vo/sys-login-config-vo.dto'; +import { SysLoginConfigParam } from '../../../../dtos/admin/sys/param/sys-login-config-param.dto'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { SceneDomainVo } from '../dtos/scene-domain-vo.dto'; @Injectable() export class CoreSysConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-upload-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-upload-service-impl.service.ts index 39e4b1e1..b2132665 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-upload-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-upload-service-impl.service.ts @@ -2,8 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot'; -import { AttachmentUploadParamDto } from '../dtos/attachment-upload-param.dto'; -import { UploadModelResultDto } from '../dtos/upload-model-result.dto'; +import { AttachmentUploadParam } from '../../../../dtos/admin/sys/param/attachment-upload-param.dto'; +import { AttachmentUploadVo } from '../../../../dtos/admin/sys/vo/attachment-upload-vo.dto'; +import { UploadModelResult } from '../dtos/upload-model-result.dto'; @Injectable() export class CoreUploadServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-storage-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-storage-service-impl.service.ts index dfb097c1..1d5ffd0f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-storage-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-storage-service-impl.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils } from '@wwjBoot'; +import { CoreStorAgeConfigVo } from '../../../../dtos/core/upload/vo/core-stor-age-config-vo.dto'; @Injectable() export class CoreStorageServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/user/impl/core-user-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/user/impl/core-user-service-impl.service.ts index a0fbb438..1d08dd26 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/user/impl/core-user-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/user/impl/core-user-service-impl.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; +import { UserInfoDto } from '../../../../dtos/core/user/dto/user-info.dto'; @Injectable() export class CoreUserServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-cloud-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-cloud-service-impl.service.ts index 4e152603..d9dfe739 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-cloud-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-cloud-service-impl.service.ts @@ -3,8 +3,8 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService } from '@wwjBoot'; import * as fs from 'fs'; -import { WeappUploadParamDto } from '../dtos/weapp-upload-param.dto'; -import { InputStreamDto } from '../dtos/input-stream.dto'; +import { WeappUploadParam } from '../../../../dtos/core/weapp/param/weapp-upload-param.dto'; +import { InputStream } from '../dtos/input-stream.dto'; @Injectable() export class CoreWeappCloudServiceImplService { @@ -41,7 +41,7 @@ export class CoreWeappCloudServiceImplService { const instance: NiucloudUtils = NiucloudUtils.instance; - const actionQuery: Record = new const query: Record<>(); + const actionQuery: Record = new const query: Record<>(); actionQuery.put("data[product_key]", instance.productKey); const actionToken: Record = this.niucloudService.getActionToken("weappbuild", actionQuery); @@ -74,7 +74,7 @@ export class CoreWeappCloudServiceImplService { async getWeappCompileLog(key: string): Promise { const instance: NiucloudUtils = NiucloudUtils.instance; - const query: Record = {}; + const query: Record = {}; query.put("authorize_code", instance.code); query.put("timestamp", key); @@ -94,7 +94,7 @@ export class CoreWeappCloudServiceImplService { try { const instance: NiucloudUtils = NiucloudUtils.instance; - const query: Record = {}; + const query: Record = {}; query.put("authorize_code", instance.code); const response: HttpResponse = new NiucloudUtils.Cloud().useThirdBuild().build("cloud/get_weapp_preview").query(query).execute(); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-config-service-impl.service.ts index 2cabcd70..bbda3d9e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-config-service-impl.service.ts @@ -2,9 +2,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import * as path from 'path'; -import { WeappConfigParamDto } from '../dtos/weapp-config-param.dto'; -import { WxOpenAuthorizerInfoResultDto } from '../dtos/wx-open-authorizer-info-result.dto'; +import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; +import { WeappConfigParam } from '../../../../dtos/core/weapp/param/weapp-config-param.dto'; +import { WxOpenAuthorizerInfoResult } from '../dtos/wx-open-authorizer-info-result.dto'; @Injectable() export class CoreWeappConfigServiceImplService { @@ -16,7 +17,7 @@ export class CoreWeappConfigServiceImplService { * getWeappConfig */ async getWeappConfig(siteId: number): Promise { - const coreSysConfigVo: CoreSysConfigVo = this.coreConfigService.getConfig(siteId, ConfigKeyEnum.path.basename(WEAPP)); + const coreSysConfigVo: CoreSysConfigVo = this.coreConfigService.getConfig(siteId, ConfigKeyEnum.basename(WEAPP)); const vo: WeappConfigVo = new WeappConfigVo(); if(ObjectUtil.isNotNull(coreSysConfigVo.valueJson)) { @@ -29,14 +30,14 @@ export class CoreWeappConfigServiceImplService { * setWeappConfig */ async setWeappConfig(siteId: number, weappConfigParam: WeappConfigParam): Promise { - this.coreConfigService.config = siteId, ConfigKeyEnum.path.basename(WEAPP, JsonUtils.parseObject(weappConfigParam)); + this.coreConfigService.config = siteId, ConfigKeyEnum.basename(WEAPP, JsonUtils.parseObject(weappConfigParam)); } /** * getWeappAuthorizationInfo */ async getWeappAuthorizationInfo(siteId: number): Promise { - const config: Record = this.coreConfigService.getConfigValue(siteId, ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO)); + const config: Record = this.coreConfigService.getConfigValue(siteId, ConfigKeyEnum.basename(WEAPP_AUTHORIZATION_INFO)); if (config == null) return null; return Object.assign(new WxOpenAuthorizerInfoResult(), config) /* TODO: 检查WxOpenAuthorizerInfoResult构造函数 */; } @@ -45,6 +46,6 @@ export class CoreWeappConfigServiceImplService { * setWeappAuthorizationInfo */ async setWeappAuthorizationInfo(siteId: number, weappAuthorizationInfo: WxOpenAuthorizerInfoResult): Promise { - this.coreConfigService.config = siteId, ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO, JsonUtils.parseObject(weappAuthorizationInfo)); + this.coreConfigService.config = siteId, ConfigKeyEnum.basename(WEAPP_AUTHORIZATION_INFO, JsonUtils.parseObject(weappAuthorizationInfo)); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-delivery-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-delivery-service-impl.service.ts index ed6db35b..7c410552 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-delivery-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-delivery-service-impl.service.ts @@ -2,7 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils } from '@wwjBoot'; -import { WeappUploadShippingParamDto } from '../dtos/weapp-upload-shipping-param.dto'; +import { IsTradeManagedVo } from '../../../../dtos/core/weapp/vo/is-trade-managed-vo.dto'; +import { WeappUploadShippingParam } from '../../../../dtos/core/weapp/param/weapp-upload-shipping-param.dto'; +import { UploadShippingParam } from '../dtos/upload-shipping-param.dto'; @Injectable() export class CoreWeappDeliveryServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts index cb1bfeb8..a02f51de 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts @@ -2,8 +2,8 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { MapDto } from '../dtos/object>.dto'; +import { Map } from '../dtos/object>.dto'; @Injectable() export class CoreWeappServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wechat/impl/core-wechat-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wechat/impl/core-wechat-config-service-impl.service.ts index b9c918f4..a8a9de68 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wechat/impl/core-wechat-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wechat/impl/core-wechat-config-service-impl.service.ts @@ -2,9 +2,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import * as path from 'path'; -import { WechatConfigParamDto } from '../dtos/wechat-config-param.dto'; -import { WxOpenAuthorizerInfoResultDto } from '../dtos/wx-open-authorizer-info-result.dto'; +import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { WechatConfigVo } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto'; +import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto'; +import { WxOpenAuthorizerInfoResult } from '../dtos/wx-open-authorizer-info-result.dto'; @Injectable() export class CoreWechatConfigServiceImplService { @@ -16,7 +17,7 @@ export class CoreWechatConfigServiceImplService { * getWechatConfig */ async getWechatConfig(siteId: number): Promise { - const coreSysConfigVo: CoreSysConfigVo = this.coreConfigService.getConfig(siteId, ConfigKeyEnum.path.basename(WECHAT)); + const coreSysConfigVo: CoreSysConfigVo = this.coreConfigService.getConfig(siteId, ConfigKeyEnum.basename(WECHAT)); const vo: WechatConfigVo = new WechatConfigVo(); if(ObjectUtil.isNotNull(coreSysConfigVo.valueJson)) { @@ -29,21 +30,21 @@ export class CoreWechatConfigServiceImplService { * setWechatConfig */ async setWechatConfig(siteId: number, wechatConfigParam: WechatConfigParam): Promise { - this.coreConfigService.config = siteId, ConfigKeyEnum.path.basename(WECHAT, JsonUtils.parseObject(wechatConfigParam)); + this.coreConfigService.config = siteId, ConfigKeyEnum.basename(WECHAT, JsonUtils.parseObject(wechatConfigParam)); } /** * setWechatAuthorizationInfo */ async setWechatAuthorizationInfo(siteId: number, wechatAuthorizationInfo: WxOpenAuthorizerInfoResult): Promise { - this.coreConfigService.config = siteId, ConfigKeyEnum.path.basename(WECHAT_AUTHORIZATION_INFO, JsonUtils.parseObject(wechatAuthorizationInfo)); + this.coreConfigService.config = siteId, ConfigKeyEnum.basename(WECHAT_AUTHORIZATION_INFO, JsonUtils.parseObject(wechatAuthorizationInfo)); } /** * getWechatAuthorizationInfo */ async getWechatAuthorizationInfo(siteId: number): Promise { - const config: Record = this.coreConfigService.getConfigValue(siteId, ConfigKeyEnum.path.basename(WECHAT_AUTHORIZATION_INFO)); + const config: Record = this.coreConfigService.getConfigValue(siteId, ConfigKeyEnum.basename(WECHAT_AUTHORIZATION_INFO)); if (config == null) return null; return Object.assign(new WxOpenAuthorizerInfoResult(), config) /* TODO: 检查WxOpenAuthorizerInfoResult构造函数 */; } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wechat/impl/core-wechat-reply-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wechat/impl/core-wechat-reply-service-impl.service.ts index 8a8fc031..fcc4d327 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wechat/impl/core-wechat-reply-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wechat/impl/core-wechat-reply-service-impl.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; +import { WechatReplyInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-reply-info-vo.dto'; @Injectable() export class CoreWechatReplyServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wxoplatform/impl/core-oplatform-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wxoplatform/impl/core-oplatform-service-impl.service.ts index 2a0c9d48..a869a236 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wxoplatform/impl/core-oplatform-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wxoplatform/impl/core-oplatform-service-impl.service.ts @@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import * as path from 'path'; @Injectable() export class CoreOplatformServiceImplService { @@ -14,7 +13,7 @@ export class CoreOplatformServiceImplService { * getSiteIdByAuthorizerAppid */ async getSiteIdByAuthorizerAppid(appid: string): Promise { - const configKey: string[] = new String[]{ ConfigKeyEnum.path.basename(WECHAT), ConfigKeyEnum.path.basename(WEAPP), ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO), ConfigKeyEnum.path.basename(WECHAT_AUTHORIZATION_INFO)}; + const configKey: string[] = new String[]{ ConfigKeyEnum.basename(WECHAT), ConfigKeyEnum.basename(WEAPP), ConfigKeyEnum.basename(WEAPP_AUTHORIZATION_INFO), ConfigKeyEnum.basename(WECHAT_AUTHORIZATION_INFO)}; const config: SysConfig = this.sysConfigRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).in("config_key", configKey).last("limit 1")); return config == null ? 0 : config.siteId; } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wxoplatform/impl/core-oplatform-static-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wxoplatform/impl/core-oplatform-static-config-service-impl.service.ts index d54314e2..79232139 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wxoplatform/impl/core-oplatform-static-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wxoplatform/impl/core-oplatform-static-config-service-impl.service.ts @@ -2,8 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot'; -import * as path from 'path'; -import { OplatformConfigParamDto } from '../dtos/oplatform-config-param.dto'; +import { CoreOplatformStaticConfigVo } from '../../../../dtos/core/wxoplatform/vo/core-oplatform-static-config-vo.dto'; +import { OplatformConfigParam } from '../../../../dtos/admin/wxoplatform/param/oplatform-config-param.dto'; +import { OplatformConfigVo } from '../../../../dtos/admin/wxoplatform/vo/oplatform-config-vo.dto'; @Injectable() export class CoreOplatformStaticConfigServiceImplService { @@ -39,7 +40,7 @@ export class CoreOplatformStaticConfigServiceImplService { jsonObject.set("aes_key", oplatformConfigParam.aesKey); jsonObject.set("develop_app_id", oplatformConfigParam.developAppId); jsonObject.set("develop_upload_private_key", oplatformConfigParam.developUploadPrivateKey); - this.coreConfigService.config = RequestUtils.defaultSiteId(, ConfigKeyEnum.path.basename(WXOPLATFORM), jsonObject); + this.coreConfigService.config = RequestUtils.defaultSiteId(, ConfigKeyEnum.basename(WXOPLATFORM), jsonObject); } /** @@ -47,7 +48,7 @@ export class CoreOplatformStaticConfigServiceImplService { */ async getWxOplatformConfig(): Promise { const vo: OplatformConfigVo = new OplatformConfigVo(); - const config: Record = this.coreConfigService.getConfigValue(RequestUtils.defaultSiteId(), ConfigKeyEnum.path.basename(WXOPLATFORM)); + const config: Record = this.coreConfigService.getConfigValue(RequestUtils.defaultSiteId(), ConfigKeyEnum.basename(WXOPLATFORM)); if (CommonUtils.isNotEmpty(config)) vo = Object.assign(new OplatformConfigVo(), config) /* TODO: 检查OplatformConfigVo构造函数 */; return vo; }