diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/scanners/java-scanner.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/scanners/java-scanner.js index 51f54378..04c83b42 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/scanners/java-scanner.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/scanners/java-scanner.js @@ -303,6 +303,7 @@ class JavaScanner { methods: this.extractMethods(content), fields: this.extractFields(content), routeInfo: this.extractRouteInfo(content), + dtos: this.extractDtosFromFile(content), // ✅ 新增:提取DTOs content: content }; } catch (error) { @@ -310,6 +311,107 @@ class JavaScanner { return null; } } + + /** + * ✅ 新增:从文件中提取DTO/VO/Param类型 + */ + extractDtosFromFile(content) { + const dtos = new Set(); + + // 1. 从方法参数提取(@RequestBody, @PathVariable, @RequestParam) + const paramRegex = /@(?:RequestBody|PathVariable|RequestParam)\s*(?:\([^)]*\))?\s*([\w<>,\s\[\]]+)\s+\w+/g; + let match; + while ((match = paramRegex.exec(content)) !== null) { + let typeName = match[1].trim(); + + // ✅ 清理泛型:List → XXX + typeName = this.cleanGenericType(typeName); + + // ✅ 清理数组:String[] → String + typeName = typeName.replace(/\[\]$/g, '').trim(); + + // 跳过基础类型、集合类型、Java Object + if (this.shouldSkipType(typeName)) { + continue; + } + + dtos.add(typeName); + } + + // 2. 从方法返回值提取(Result) + const returnRegex = /Result<([^>]+)>/g; + while ((match = returnRegex.exec(content)) !== null) { + let typeName = match[1]; + // ✅ 清理泛型 + typeName = this.cleanGenericType(typeName); + + if (!this.shouldSkipType(typeName)) { + dtos.add(typeName); + } + } + + // 3. 从import语句提取DTO/VO/Param + const importRegex = /import\s+[\w.]+\.(\w+(?:Dto|Vo|Param|Request|Response));/g; + while ((match = importRegex.exec(content)) !== null) { + dtos.add(match[1]); + } + + return Array.from(dtos); + } + + /** + * ✅ 判断类型是否应该跳过(基础类型、集合类型、Java内置类) + */ + shouldSkipType(typeName) { + if (!typeName) return true; + + const skipTypes = [ + // Java基础类型 + 'String', 'Integer', 'Long', 'Boolean', 'Double', 'Float', 'Byte', 'Short', 'Character', + 'int', 'long', 'boolean', 'double', 'float', 'byte', 'short', 'char', + // Java集合类型 + 'List', 'ArrayList', 'LinkedList', 'Map', 'HashMap', 'TreeMap', 'Set', 'HashSet', 'TreeSet', + // Java内置类 + 'Object', 'Class', 'Void', 'void', + // 其他 + 'Record' + ]; + + return skipTypes.includes(typeName); + } + + /** + * ✅ 清理泛型类型:List → XXX, Map → Map + */ + cleanGenericType(typeName) { + if (!typeName) return typeName; + + let previousType = ''; + let maxIterations = 10; // 防止无限循环 + let iterations = 0; + + // 递归清理嵌套泛型:List> → XXX + while (typeName.includes('<') && typeName !== previousType && iterations < maxIterations) { + previousType = typeName; + iterations++; + + // List, ArrayList → XXX + if (typeName.match(/^(?:List|ArrayList|Set|HashSet)<(.+)>$/)) { + typeName = typeName.replace(/^(?:List|ArrayList|Set|HashSet)<(.+)>$/, '$1').trim(); + } + // Map, HashMap → Map + else if (typeName.match(/^(?:Map|HashMap)<.+>$/)) { + return 'Map'; + } + // 其他泛型:完全移除泛型部分(如 Class → Class) + else { + typeName = typeName.replace(/<.+>/g, '').trim(); + break; // 移除后直接退出 + } + } + + return typeName; + } /** * 提取类名(支持 class、enum、interface) diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/common/base.dto.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/common/base.dto.ts deleted file mode 100644 index c6498a0f..00000000 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/common/base.dto.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Base DTO class - * 所有DTO的基础类 - */ -export class BaseDto { - // 基础DTO类,可以在这里添加通用字段 -} - diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-develop.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-develop.controller.ts index 51f4074d..0d35517e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-develop.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-develop.controller.ts @@ -4,6 +4,13 @@ import { AuthGuard, RbacGuard, Public, Result } from '@wwjBoot'; import { AddonDevelopBuildServiceImplService } from '../../../services/admin/addon/impl/addon-develop-build-service-impl.service'; import { AddonDevelopServiceImplService } from '../../../services/admin/addon/impl/addon-develop-service-impl.service'; import { NiuCloudServiceImplService } from '../../../services/admin/niucloud/impl/niu-cloud-service-impl.service'; +import { AddonDevelopAddParam } from '../../../dtos/admin/addon/param/addon-develop-add-param.dto'; +import { List } from '../dtos/object>.dto'; 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 6a17a30b..7c2f8359 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,11 +3,12 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot'; import * as path from 'path'; -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 { PageParam } from '../../../../dtos/page-param.dto'; +import { DictDataParam } from '../../../../dtos/admin/dict/param/dict-data-param.dto'; import { DictParam } from '../../../../dtos/admin/dict/param/dict-param.dto'; +import { DictSearchParam } from '../../../../dtos/admin/dict/param/dict-search-param.dto'; +import { DictInfoVo } from '../../../../dtos/admin/dict/vo/dict-info-vo.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 59c59cb0..fd60229a 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 @@ -3,6 +3,9 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { SetBottomConfigParam } from '../../../../dtos/admin/diy/param/set-bottom-config-param.dto'; +import { StartUpPageConfigParam } from '../../../../dtos/core/diy/param/start-up-page-config-param.dto'; +import { BottomConfigVo } from '../../../../dtos/core/diy/vo/bottom-config-vo.dto'; +import { StartUpPageConfigVo } from '../../../../dtos/core/diy/vo/start-up-page-config-vo.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 17766bbb..e0d47aba 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,11 +3,12 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -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 { DiyRouteSearchParam } from '../../../../dtos/admin/diy/param/diy-route-search-param.dto'; import { DiyRouteShareParam } from '../../../../dtos/admin/diy/param/diy-route-share-param.dto'; +import { DiyRouteInfoVo } from '../../../../dtos/admin/diy/vo/diy-route-info-vo.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.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 cad2074f..4eab5da8 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,19 +3,21 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -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 { PageParam } from '../../../../dtos/page-param.dto'; import { DiyPageInfoVo } from '../../../../dtos/admin/diy/vo/diy-page-info-vo.dto'; +import { DiyRouteListVo } from '../../../../dtos/admin/diy/vo/diy-route-list-vo.dto'; +import { StartUpPageConfigParam } from '../../../../dtos/core/diy/param/start-up-page-config-param.dto'; +import { StartUpPageConfigVo } from '../../../../dtos/core/diy/vo/start-up-page-config-vo.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 { SceneDomainVo } from '../../../../entities/scene-domain-vo.entity'; +import { DiyPageSearchParam } from '../../../../dtos/admin/diy/param/diy-page-search-param.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 '../../../../entities/scene-domain-vo.entity'; import { SetDiyDataParam } from '../../../../dtos/admin/diy/param/set-diy-data-param.dto'; import { Map } from '../dtos/object>.dto'; 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 0f999a0e..a93c4411 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,12 +2,13 @@ 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 { 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 { DiyThemeSetParam } from '../../../../dtos/admin/diy/param/diy-theme-set-param.dto'; import { DiyThemeTitleParam } from '../../../../dtos/admin/diy/param/diy-theme-title-param.dto'; +import { DiyThemeInfoVo } from '../../../../dtos/admin/diy/vo/diy-theme-info-vo.dto'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { InstallAddonListVo } from '../../../../entities/install-addon-list-vo.entity'; @Injectable() export class DiyThemeServiceImplService { 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 e71eb4bb..7fdd60e0 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,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -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 { 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 { DiyFormWriteConfigInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-write-config-info-vo.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 36eca5b6..ad5a9feb 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,11 +2,14 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; -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 { PageParam } from '../../../../dtos/page-param.dto'; import { DiyFormRecordsFieldsSearchParam } from '../../../../dtos/admin/diy_form/param/diy-form-records-fields-search-param.dto'; +import { DiyFormRecordsParam } from '../../../../dtos/core/diy_form/param/diy-form-records-param.dto'; +import { DiyFormRecordsSearchParam } from '../../../../dtos/core/diy_form/param/diy-form-records-search-param.dto'; import { DiyFormFieldsListVo } from '../../../../dtos/admin/diy_form/vo/diy-form-fields-list-vo.dto'; +import { DiyFormRecordsInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-info-vo.dto'; +import { DiyFormRecordsFieldsListVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-fields-list-vo.dto'; @Injectable() export class DiyFormRecordsServiceImplService { 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 74bc46dc..60b38520 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,19 +2,21 @@ 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 { 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 { DiyFormRecordsListVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-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 { PageParam } from '../../../../dtos/page-param.dto'; +import { DiyFormRecordsSearchParam } from '../../../../dtos/core/diy_form/param/diy-form-records-search-param.dto'; import { DiyFormSubmitConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-submit-config-param.dto'; +import { DiyFormWriteConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-write-config-param.dto'; +import { DiyFormRecordsInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-info-vo.dto'; +import { DiyFormSearchParam } from '../../../../dtos/core/diy_form/param/diy-form-search-param.dto'; +import { DiyFormParam } from '../../../../dtos/api/diy/param/diy-form-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'; 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 8e36659f..eb5eaa48 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,17 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; +import { GenerateCodeParam } from '../../../../dtos/admin/generator/param/generate-code-param.dto'; +import { GenerateEditParam } from '../../../../dtos/admin/generator/param/generate-edit-param.dto'; +import { GenerateParam } from '../../../../dtos/admin/generator/param/generate-param.dto'; +import { GenerateSearchParam } from '../../../../dtos/admin/generator/param/generate-search-param.dto'; +import { CoreGenerateTemplateVo } from '../../../../dtos/core/generator/vo/core-generate-template-vo.dto'; +import { MapperInfoVo } from '../../../../dtos/core/generator/vo/mapper-info-vo.dto'; import { GenerateDetailVo } from '../../../../dtos/admin/generator/vo/generate-detail-vo.dto'; import { GenerateColumnVo } from '../../../../entities/generate-column-vo.entity'; -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 { 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 32a77dbb..8e450b20 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,16 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; import { AddonInfoVo } from '../../../../dtos/admin/addon/vo/addon-info-vo.dto'; +import { HomeSiteAddParam } from '../../../../dtos/admin/home/param/home-site-add-param.dto'; +import { SiteParam } from '../../../../dtos/admin/site/param/site-param.dto'; +import { SiteSearchParam } from '../../../../dtos/admin/site/param/site-search-param.dto'; +import { SiteGroupVo } from '../../../../dtos/admin/home/vo/site-group-vo.dto'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { UserCreateSiteVo } from '../../../../dtos/admin/home/vo/user-create-site-vo.dto'; +import { SiteAddParam } from '../../../../dtos/admin/site/param/site-add-param.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 87e6586c..49bcf846 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,16 +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 { MemberAccountLogListVo } from '../../../../dtos/admin/member/vo/member-account-log-list-vo.dto'; import { PageParam } from '../../../../dtos/page-param.dto'; +import { AdjustAccountParam } from '../../../../dtos/admin/member/param/adjust-account-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 324d68c3..9d1721b5 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,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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; import { MemberAddressParam } from '../../../../dtos/admin/member/param/member-address-param.dto'; +import { MemberAddressSearchParam } from '../../../../dtos/admin/member/param/member-address-search-param.dto'; +import { MemberAddressInfoVo } from '../../../../dtos/admin/member/vo/member-address-info-vo.dto'; +import { MemberAddressListVo } from '../../../../dtos/admin/member/vo/member-address-list-vo.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 38d0a345..2eda385b 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,15 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; +import { CashOutTransferParam } from '../../../../dtos/admin/member/param/cash-out-transfer-param.dto'; +import { MemberCashOutAuditParam } from '../../../../dtos/admin/member/param/member-cash-out-audit-param.dto'; +import { MemberCashOutRemarkParam } from '../../../../dtos/admin/member/param/member-cash-out-remark-param.dto'; +import { MemberCashOutSearchParam } from '../../../../dtos/admin/member/param/member-cash-out-search-param.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-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 2ba4533f..7e282f17 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,12 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; import { MemberLabelEditParam } from '../../../../dtos/admin/member/param/member-label-edit-param.dto'; +import { MemberLabelSearchParam } from '../../../../dtos/admin/member/param/member-label-search-param.dto'; import { MemberLabelAllListVo } from '../../../../dtos/admin/member/vo/member-label-all-list-vo.dto'; +import { MemberLabelInfoVo } from '../../../../dtos/admin/member/vo/member-label-info-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 60eae434..b35942e1 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,12 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; import { MemberLevelParam } from '../../../../dtos/api/member/param/member-level-param.dto'; +import { MemberLevelSearchParam } from '../../../../dtos/admin/member/param/member-level-search-param.dto'; import { MemberLevelAllListVo } from '../../../../dtos/admin/member/vo/member-level-all-list-vo.dto'; +import { MemberLevelInfoVo } from '../../../../dtos/api/member/vo/member-level-info-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 6e39792f..bc1074f9 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,15 +2,15 @@ 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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; +import { MemberAllListVo } from '../../../../dtos/admin/member/vo/member-all-list-vo.dto'; import { MemberInfoVo } from '../../../../dtos/api/member/vo/member-info-vo.dto'; +import { MemberLabelAllListVo } from '../../../../dtos/admin/member/vo/member-label-all-list-vo.dto'; +import { MemberSearchParam } from '../../../../dtos/admin/member/param/member-search-param.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'; 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 5f401974..eb19bc80 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,12 +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 { MemberSignListVo } from '../../../../dtos/admin/member/vo/member-sign-list-vo.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 { SignConfigParam } from '../../../../dtos/admin/member/param/sign-config-param.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 806ba066..83fcba5f 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,10 +3,12 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService } from '@wwjBoot'; import * as fs from 'fs'; -import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; +import { HttpRequest } from '../dtos/http-request.dto'; +import { HttpResponse } from '../dtos/http-response.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 '../../../../entities/install-addon-list-vo.entity'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; @Injectable() export class CloudBuildServiceImplService { 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 b4dc3a17..d392f43d 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,13 +2,13 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; +import { GetAppVersionListParam } from '../../../../dtos/admin/niucloud/param/get-app-version-list-param.dto'; +import { SetAuthorizeParam } from '../../../../dtos/core/niucloud/param/set-authorize-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() 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 0c059989..60861834 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,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 { SysNoticeLog } from '../../../../entities/sys-notice-log.entity'; import { PageParam } from '../../../../dtos/page-param.dto'; import { NoticeLogSearchParam } from '../../../../dtos/core/notice/param/notice-log-search-param.dto'; 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 35629c1a..c0bfd8bf 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,16 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { NoticeEnumListVo } from '../../../../dtos/notice/vo/notice-enum-list-vo.dto'; import { EditMessageStatusParam } from '../../../../dtos/admin/notice/param/edit-message-status-param.dto'; +import { PayParam } from '../../../../dtos/admin/pay/param/pay-param.dto'; +import { PaySearchParam } from '../../../../dtos/core/pay/param/pay-search-param.dto'; +import { PayInfoVo } from '../../../../dtos/core/pay/vo/pay-info-vo.dto'; +import { PayListVo } from '../../../../dtos/core/pay/vo/pay-list-vo.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 { JSONObject } from '../dtos/j-s-o-n-object.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 1e1289e1..cbcffef5 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,11 +3,16 @@ 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 { 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 { HttpRequest } from '../dtos/http-request.dto'; +import { HttpResponse } from '../dtos/http-response.dto'; import { PageParam } from '../../../../dtos/page-param.dto'; +import { NoticeEnumListVo } from '../../../../dtos/notice/vo/notice-enum-list-vo.dto'; +import { TemplateListVo } from '../../../../dtos/admin/notice/vo/template-list-vo.dto'; +import { SendMobileCodeParam } from '../../../../dtos/api/login/param/send-mobile-code-param.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 { HttpServletRequest } from '../dtos/http-servlet-request.dto'; +import { RegisterAccountParam } from '../../../../dtos/admin/notice/param/register-account-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'; 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 6d3aac29..1025d52a 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,10 +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 { 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'; +import { PayChannelAllSetParam } from '../../../../dtos/admin/pay/param/pay-channel-all-set-param.dto'; +import { PayChanneltemVo } from '../../../../dtos/admin/pay/vo/pay-channeltem-vo.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.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 327e6e35..eb1ee8b4 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,11 +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 { PayRefundListVo } from '../../../../dtos/core/pay/vo/pay-refund-list-vo.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'; +import { PayRefundInfoVo } from '../../../../dtos/core/pay/vo/pay-refund-info-vo.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 4f58087e..b8a121fa 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,14 +2,14 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -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 { PageParam } from '../../../../dtos/page-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 { PayParam } from '../../../../dtos/admin/pay/param/pay-param.dto'; +import { PaySearchParam } from '../../../../dtos/core/pay/param/pay-search-param.dto'; import { FriendsPayInfoByTradeVo } from '../../../../dtos/admin/pay/vo/friends-pay-info-by-trade-vo.dto'; +import { PayInfoVo } from '../../../../dtos/core/pay/vo/pay-info-vo.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'; @Injectable() 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 fc471d5c..33d013fa 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 @@ -4,6 +4,7 @@ import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { SetSceneIdParam } from '../../../../dtos/admin/pay/param/set-scene-id-param.dto'; import { SetTradeSceneParam } from '../../../../dtos/core/pay/param/set-trade-scene-param.dto'; +import { WechatTransferSceneListVo } from '../../../../dtos/core/pay/vo/wechat-transfer-scene-list-vo.dto'; @Injectable() export class PayTransferServiceImplService { 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 1d4c5127..ecdb65b3 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,10 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; +import { SiteAccountLogParam } from '../../../../dtos/admin/site/param/site-account-log-param.dto'; +import { SiteAccountLogSearchParam } from '../../../../dtos/admin/site/param/site-account-log-search-param.dto'; import { SiteAccountLogInfoVo } from '../../../../dtos/admin/site/vo/site-account-log-info-vo.dto'; +import { SiteGroupListVo } from '../../../../dtos/admin/site/vo/site-group-list-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 d72a388a..b1488203 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,14 +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 { @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 { PageParam } from '../../../../dtos/page-param.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 { SiteGroupSearchParam } from '../../../../dtos/admin/site/param/site-group-search-param.dto'; import { InstallAddonListVo } from '../../../../entities/install-addon-list-vo.entity'; +import { @Lazy } from '../dtos/@-lazy.dto'; +import { JSONArray } from '../dtos/j-s-o-n-array.dto'; @Injectable() export class SiteGroupServiceImplService { 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 d1161fa8..b91f06b2 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,13 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -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 { PageParam } from '../../../../dtos/page-param.dto'; +import { SysUserRoleParam } from '../../../../dtos/admin/sys/param/sys-user-role-param.dto'; +import { SiteSearchParam } from '../../../../dtos/admin/site/param/site-search-param.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'; 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 8f2153e3..b5d93cef 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,10 +2,10 @@ 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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; import { SiteUserParam } from '../../../../dtos/admin/site/param/site-user-param.dto'; +import { SiteUserSearchParam } from '../../../../dtos/admin/site/param/site-user-search-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'; 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 9cce0a59..9e9bb45c 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,11 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -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 { PageParam } from '../../../../dtos/page-param.dto'; import { StatHourParam } from '../../../../dtos/admin/stat/param/stat-hour-param.dto'; +import { StatHourSearchParam } from '../../../../dtos/admin/stat/param/stat-hour-search-param.dto'; +import { StatHourInfoVo } from '../../../../dtos/admin/stat/vo/stat-hour-info-vo.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 5eb8285b..adecbb53 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,15 +2,15 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; +import { SiteSearchParam } from '../../../../dtos/admin/site/param/site-search-param.dto'; +import { CoreAddonSearchParam } from '../../../../dtos/core/addon/param/core-addon-search-param.dto'; +import { MemberStatSearchParam } from '../../../../dtos/core/member/param/member-stat-search-param.dto'; 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 { 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 67292c02..cc457bbb 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 @@ -3,6 +3,9 @@ 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 { PageParam } from '../../../../dtos/page-param.dto'; +import { SysAgreementParam } from '../../../../dtos/admin/sys/param/sys-agreement-param.dto'; +import { SysAgreementSearchParam } from '../../../../dtos/admin/sys/param/sys-agreement-search-param.dto'; import { SysAgreementInfoVo } from '../../../../dtos/admin/sys/vo/sys-agreement-info-vo.dto'; @Injectable() 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 0c667504..7d9a4fb7 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,10 +3,10 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; import * as path from 'path'; -import { SysAreaByCodeVo } from '../../../../dtos/admin/sys/vo/sys-area-by-code-vo.dto'; +import { SysAreaListVo } from '../../../../dtos/api/sys/vo/sys-area-list-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 { SysAreaByCodeVo } from '../../../../dtos/admin/sys/vo/sys-area-by-code-vo.dto'; import { SysMapVo } from '../../../../dtos/admin/sys/vo/sys-map-vo.dto'; @Injectable() 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 56aee58d..9cb4cc85 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,14 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; +import { AttachmentUploadVo } from '../../../../dtos/admin/sys/vo/attachment-upload-vo.dto'; +import { SysAttachmentCategoryListVo } from '../../../../dtos/admin/sys/vo/sys-attachment-category-list-vo.dto'; +import { SysAttachmentSearchParam } from '../../../../dtos/admin/sys/param/sys-attachment-search-param.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() 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 afa3674a..b60e32c1 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,15 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot'; import * as fs from 'fs'; -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 { PageParam } from '../../../../dtos/page-param.dto'; +import { BackupTaskVo } from '../dtos/backup-task-vo.dto'; +import { SysUpgradeRecordsListVo } from '../dtos/sys-upgrade-records-list-vo.dto'; +import { UpgradeTaskVo } from '../dtos/upgrade-task-vo.dto'; +import { SysBackupRecordsSearchParam } from '../../../../dtos/admin/sys/param/sys-backup-records-search-param.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() 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 34251554..48c940cf 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,6 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { SceneDomainVo } from '../../../../entities/scene-domain-vo.entity'; +import { HttpServletRequest } from '../dtos/http-servlet-request.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'; 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 e45bc069..2438fc79 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,9 +2,9 @@ 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 { SysExportListVo } from '../../../../dtos/admin/sys/vo/sys-export-list-vo.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'; 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 7854584e..ea41faf1 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 { SysMenuInfoVo } from '../../../../dtos/admin/sys/vo/sys-menu-info-vo.dto'; import { SysMenuParam } from '../../../../dtos/admin/sys/param/sys-menu-param.dto'; +import { SysMenuInfoVo } from '../../../../dtos/admin/sys/vo/sys-menu-info-vo.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 41186873..fe6efdb4 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,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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; +import { NoticeEnumListVo } from '../../../../dtos/notice/vo/notice-enum-list-vo.dto'; +import { SysNoticeLogParam } from '../../../../dtos/core/notice/param/sys-notice-log-param.dto'; +import { SysNoticeLogSearchParam } from '../../../../dtos/admin/sys/param/sys-notice-log-search-param.dto'; import { SysNoticeLogInfoVo } from '../../../../dtos/admin/sys/vo/sys-notice-log-info-vo.dto'; @Injectable() 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 d708bd3b..e63dad7a 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,11 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -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 { PageParam } from '../../../../dtos/page-param.dto'; import { SysNoticeParam } from '../../../../dtos/admin/sys/param/sys-notice-param.dto'; +import { SysNoticeSearchParam } from '../../../../dtos/admin/sys/param/sys-notice-search-param.dto'; +import { SysNoticeInfoVo } from '../../../../dtos/admin/sys/vo/sys-notice-info-vo.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 809bce0a..85daa64c 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,10 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; +import { NoticeEnumListVo } from '../../../../dtos/notice/vo/notice-enum-list-vo.dto'; +import { SysNoticeSmsLogParam } from '../../../../dtos/admin/sys/param/sys-notice-sms-log-param.dto'; +import { SysNoticeSmsLogSearchParam } from '../../../../dtos/core/notice/param/sys-notice-sms-log-search-param.dto'; import { SysNoticeSmsLogInfoVo } from '../../../../dtos/admin/sys/vo/sys-notice-sms-log-info-vo.dto'; @Injectable() 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 dce6c755..35bd8a4d 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,16 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; import { SysPosterInfoVo } from '../../../../dtos/admin/sys/vo/sys-poster-info-vo.dto'; +import { SysPosterInitVo } from '../../../../dtos/admin/sys/vo/sys-poster-init-vo.dto'; +import { GetPosterParam } from '../../../../dtos/core/poster/param/get-poster-param.dto'; +import { SysPosterSearchParam } from '../../../../dtos/admin/sys/param/sys-poster-search-param.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 { 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 c8530949..5a7d7a45 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,14 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; import { SysPrinterModifyStatusParam } from '../../../../dtos/admin/sys/param/sys-printer-modify-status-param.dto'; +import { SysPrinterParam } from '../../../../dtos/admin/sys/param/sys-printer-param.dto'; +import { SysPrinterSearchParam } from '../../../../dtos/admin/sys/param/sys-printer-search-param.dto'; +import { SysPrinterInfoVo } from '../../../../dtos/admin/sys/vo/sys-printer-info-vo.dto'; +import { SysPrinterAddPrinterYlyParam } from '../../../../dtos/core/sys/param/sys-printer-add-printer-yly-param.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'; import { SysPrinter } from '../../../../entities/sys-printer.entity'; @Injectable() 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 570758e5..d57c7b8e 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,11 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; import { SysPrinterTemplateParam } from '../../../../dtos/admin/sys/param/sys-printer-template-param.dto'; +import { SysPrinterTemplateSearchParam } from '../../../../dtos/admin/sys/param/sys-printer-template-search-param.dto'; +import { SysPrinterTemplateInfoVo } from '../../../../dtos/admin/sys/vo/sys-printer-template-info-vo.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 63f640bb..423478f4 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,11 +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 { 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'; +import { SysRoleSearchParam } from '../../../../dtos/admin/sys/param/sys-role-search-param.dto'; +import { SysRoleInfoVo } from '../../../../dtos/admin/sys/vo/sys-role-info-vo.dto'; +import { PageParam } from '../../../../dtos/page-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 8657d4ad..b675a353 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,16 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; +import { SysScheduleLogSearchParam } from '../../../../dtos/admin/sys/param/sys-schedule-log-search-param.dto'; +import { SysScheduleParam } from '../../../../dtos/admin/sys/param/sys-schedule-param.dto'; +import { SysScheduleSearchParam } from '../../../../dtos/admin/sys/param/sys-schedule-search-param.dto'; +import { SysScheduleStatusParam } from '../../../../dtos/admin/sys/param/sys-schedule-status-param.dto'; +import { SysScheduleInfoVo } from '../../../../dtos/admin/sys/vo/sys-schedule-info-vo.dto'; +import { SysScheduleTemplateVo } from '../../../../dtos/admin/sys/vo/sys-schedule-template-vo.dto'; +import { ApplicationContext } from '../dtos/application-context.dto'; import { SysScheduleLog } from '../../../../entities/sys-schedule-log.entity'; @Injectable() 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 aef4115a..266ebf11 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,11 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; import * as path from 'path'; -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 { PageParam } from '../../../../dtos/page-param.dto'; import { SysUpgradeRecordsDelParam } from '../dtos/sys-upgrade-records-del-param.dto'; +import { SysUpgradeRecordsParam } from '../dtos/sys-upgrade-records-param.dto'; +import { SysUpgradeRecordsSearchParam } from '../dtos/sys-upgrade-records-search-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 1f066669..0092a418 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,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 { 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 { SysUserLogParam } from '../../../../dtos/admin/sys/param/sys-user-log-param.dto'; +import { SysUserLogSearchParam } from '../../../../dtos/admin/sys/param/sys-user-log-search-param.dto'; import { SysUserLogInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-log-info-vo.dto'; +import { PageParam } from '../../../../dtos/page-param.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 18a72291..61cfe09c 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,11 +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 { 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'; +import { SysUserRoleSearchParam } from '../../../../dtos/admin/sys/param/sys-user-role-search-param.dto'; +import { SysUserRoleInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-role-info-vo.dto'; +import { PageParam } from '../../../../dtos/page-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 d3d42c9b..86d44e07 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,15 +2,15 @@ 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 { SysUserListVo } from '../../../../dtos/admin/sys/vo/sys-user-list-vo.dto'; +import { SiteUserParam } from '../../../../dtos/admin/site/param/site-user-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'; 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 5600bd5f..1921ad1f 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,11 +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 { @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 { HttpResponse } from '../dtos/http-response.dto'; import { SysUpgradeRecordsParam } from '../dtos/sys-upgrade-records-param.dto'; +import { UpgradeParam } from '../dtos/upgrade-param.dto'; +import { UpgradeContentVo } from '../dtos/upgrade-content-vo.dto'; +import { UpgradeTaskVo } from '../dtos/upgrade-task-vo.dto'; +import { @Lazy } from '../dtos/@-lazy.dto'; import { } from '../dtos/.dto'; @Injectable() 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 ccdb2629..b5977f08 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,12 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto'; import { VerifierParam } from '../../../../dtos/admin/verify/param/verifier-param.dto'; +import { VerifierSearchParam } from '../../../../dtos/admin/verify/param/verifier-search-param.dto'; +import { VerifierVo } from '../../../../dtos/admin/verify/vo/verifier-vo.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 f89a1793..6c087918 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,12 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto'; +import { VerifySearchParam } from '../../../../dtos/admin/verify/param/verify-search-param.dto'; import { VerifyInfoVo } from '../../../../dtos/admin/verify/vo/verify-info-vo.dto'; +import { VerifyVo } from '../../../../dtos/admin/verify/vo/verify-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 06aff06a..883fbfdd 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,11 +2,16 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -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 '../../../../entities/set-domain-param.entity'; -import { JSONObject } from '../dtos/j-s-o-n-object.dto'; +import { WeappStaticInfoVo } from '../../../../dtos/admin/weapp/vo/weapp-static-info-vo.dto'; +import { WechatStaticInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-static-info-vo.dto'; import { SceneDomainVo } from '../../../../entities/scene-domain-vo.entity'; +import { WeappConfigParam } from '../../../../dtos/core/weapp/param/weapp-config-param.dto'; +import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; +import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto'; +import { WechatConfigVo } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto'; +import { HttpServletRequest } from '../dtos/http-servlet-request.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.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 fd13eb47..e00af308 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,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 { WeappTemplateSyncParam } from '../../../../dtos/admin/weapp/param/weapp-template-sync-param.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 { 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 d576f72f..bc151e07 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,11 +3,13 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import * as fs from 'fs'; -import { PageParam } from '../../../../dtos/page-param.dto'; import { WeappVersionListVo } from '../../../../dtos/admin/weapp/vo/weapp-version-list-vo.dto'; +import { HttpResponse } from '../dtos/http-response.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { DiyPageListVo } from '../../../../dtos/admin/diy/vo/diy-page-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'; +import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.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 189350d6..60dac350 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,9 +2,16 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto'; -import { SceneDomainVo } from '../../../../entities/scene-domain-vo.entity'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { WechatReplyParam } from '../../../../dtos/admin/wechat/param/wechat-reply-param.dto'; +import { WechatReplySearchParam } from '../../../../dtos/admin/wechat/param/wechat-reply-search-param.dto'; +import { WechatReplyInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-reply-info-vo.dto'; +import { WechatReplyListVo } from '../../../../dtos/admin/wechat/vo/wechat-reply-list-vo.dto'; import { WechatStaticInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-static-info-vo.dto'; +import { SceneDomainVo } from '../../../../entities/scene-domain-vo.entity'; +import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto'; +import { WechatConfigVo } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto'; +import { HttpServletRequest } from '../dtos/http-servlet-request.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 c31216bb..5ec0dbbd 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,13 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; import { AttachmentUploadParam } from '../../../../dtos/admin/sys/param/attachment-upload-param.dto'; import { AttachmentUploadVo } from '../../../../dtos/admin/sys/vo/attachment-upload-vo.dto'; +import { WechatMediaSearchParam } from '../../../../dtos/admin/wechat/param/wechat-media-search-param.dto'; import { WechatMediaInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-media-info-vo.dto'; +import { MultipartFile } from '../dtos/multipart-file.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 56c85776..38bb6b0a 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,6 +2,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; +import { WechatStaticInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-static-info-vo.dto'; +import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto'; +import { WechatConfigVo } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto'; +import { HttpServletRequest } from '../dtos/http-servlet-request.dto'; import { JSONArray } from '../dtos/j-s-o-n-array.dto'; @Injectable() 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 e3cd10c7..557f3f51 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,13 +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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; import { WechatDefaultReplyParam } from '../../../../dtos/admin/wechat/param/wechat-default-reply-param.dto'; +import { WechatReplyParam } from '../../../../dtos/admin/wechat/param/wechat-reply-param.dto'; +import { WechatReplySearchParam } from '../../../../dtos/admin/wechat/param/wechat-reply-search-param.dto'; import { WechatSubscribeReplyParam } from '../../../../dtos/admin/wechat/param/wechat-subscribe-reply-param.dto'; +import { WechatReplyInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-reply-info-vo.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 4a4f1d00..2fcd7107 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,9 +2,14 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { WechatFansParam } from '../../../../dtos/admin/wechat/param/wechat-fans-param.dto'; +import { WechatFansSearchParam } from '../../../../dtos/admin/wechat/param/wechat-fans-search-param.dto'; +import { WechatTemplateSyncParam } from '../../../../dtos/admin/wechat/param/wechat-template-sync-param.dto'; +import { WechatFansInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-fans-info-vo.dto'; +import { WechatFansListVo } from '../../../../dtos/admin/wechat/vo/wechat-fans-list-vo.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 { 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 5ebf0f5c..4330358b 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 @@ -3,6 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; import { OplatformConfigParam } from '../../../../dtos/admin/wxoplatform/param/oplatform-config-param.dto'; +import { CoreOplatformStaticConfigVo } from '../../../../dtos/core/wxoplatform/vo/core-oplatform-static-config-vo.dto'; @Injectable() export class OplatformConfigServiceImplService { 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 8ea49ce4..004fe88c 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,10 +2,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils } from '@wwjBoot'; -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 { OplatformServerParam } from '../../../../dtos/admin/wxoplatform/param/oplatform-server-param.dto'; import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; +import { WxMpXmlMessage } from '../dtos/wx-mp-xml-message.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 496128e7..e462df12 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,14 +2,16 @@ 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 { OplatformRecordVo } from '../../../../dtos/admin/wxoplatform/vo/oplatform-record-vo.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { PayListVo } from '../../../../dtos/core/pay/vo/pay-list-vo.dto'; import { AuthorizationParam } from '../../../../dtos/admin/wxoplatform/param/authorization-param.dto'; +import { IOplatformAuthRecordParam } from '../../../../dtos/admin/wxoplatform/param/i-oplatform-auth-record-param.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; 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 { 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 1ec8ac54..38a234bf 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,17 +2,18 @@ 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 { @Lazy } from '../dtos/@-lazy.dto'; import { WxOplatfromWeappVersionVo } from '../../../../dtos/admin/wxoplatform/vo/wx-oplatfrom-weapp-version-vo.dto'; +import { SiteGroupWeappVersionVo } from '../../../../dtos/admin/wxoplatform/vo/site-group-weapp-version-vo.dto'; import { PageParam } from '../../../../dtos/page-param.dto'; +import { PayListVo } from '../../../../dtos/core/pay/vo/pay-list-vo.dto'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { SyncSiteGroupAuthWeappParam } from '../../../../dtos/admin/wxoplatform/param/sync-site-group-auth-weapp-param.dto'; +import { UndoAuditParam } from '../../../../dtos/admin/wxoplatform/param/undo-audit-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 '../../../../entities/wx-oplatfrom-weapp-version.entity'; 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'; +import { @Lazy } from '../dtos/@-lazy.dto'; +import { WxOplatfromWeappVersion } from '../../../../entities/wx-oplatfrom-weapp-version.entity'; @Injectable() export class WeappVersionServiceImplService { 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 5096c7fb..a7139f0f 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,13 +2,13 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; -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 { NewVersionVo } from '../../../../dtos/api/channel/vo/new-version-vo.dto'; +import { LoginVo } from '../../../../dtos/api/login/vo/login-vo.dto'; +import { AuthRegisterParam } from '../../../../dtos/api/wechat/param/auth-register-param.dto'; +import { WechatAuthParam } from '../../../../dtos/api/wechat/param/wechat-auth-param.dto'; import { AppConfigVo } from '../../../../dtos/core/channel/vo/app-config-vo.dto'; import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; 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 f570362d..eaf107ff 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,14 +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 { MemberConfigVo } from '../../../../dtos/admin/member/vo/member-config-vo.dto'; +import { DiyFormParam } from '../../../../dtos/api/diy/param/diy-form-param.dto'; +import { DiyFormRecordsParam } from '../../../../dtos/core/diy_form/param/diy-form-records-param.dto'; +import { DiyFormSubmitConfigInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-submit-config-info-vo.dto'; import { DiyFormInfoVo } from '../../../../dtos/api/diy/vo/diy-form-info-vo.dto'; import { DiyFormWriteConfig } from '../../../../entities/diy-form-write-config.entity'; -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() 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 a5e8f10b..d8de7965 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,16 +3,18 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; import * as path from 'path'; -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 { DiyInfoParam } from '../../../../dtos/api/diy/param/diy-info-param.dto'; import { DiyShareParam } from '../../../../dtos/api/diy/param/diy-share-param.dto'; +import { DiyTabbarListParam } from '../../../../dtos/api/diy/param/diy-tabbar-list-param.dto'; +import { DiyTabbarParam } from '../../../../dtos/api/diy/param/diy-tabbar-param.dto'; +import { DiyInfoVo } from '../../../../dtos/api/diy/vo/diy-info-vo.dto'; +import { DiyShareVo } from '../../../../dtos/api/diy/vo/diy-share-vo.dto'; +import { DiyTabbarInfoVo } from '../../../../dtos/api/diy/vo/diy-tabbar-info-vo.dto'; +import { DiyTabbarVo } from '../../../../dtos/api/diy/vo/diy-tabbar-vo.dto'; +import { BottomConfigVo } from '../../../../dtos/core/diy/vo/bottom-config-vo.dto'; +import { StartUpPageConfigVo } from '../../../../dtos/core/diy/vo/start-up-page-config-vo.dto'; @Injectable() export class DiyServiceImplService { 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 186cd8c2..f4d29fbd 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,17 +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 { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; +import { LoginVo } from '../../../../dtos/api/login/vo/login-vo.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'; 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 '../../../../entities/member.entity'; -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 { 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 47af0910..c647f2a6 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 @@ -5,8 +5,10 @@ import { QueueService, EventBus, Result, CommonUtils, RequestContextService } fr 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 '../../../../entities/member.entity'; +import { LoginVo } from '../../../../dtos/api/login/vo/login-vo.dto'; import { MobileCodeCacheVo } from '../../../../dtos/api/login/vo/mobile-code-cache-vo.dto'; +import { HttpServletRequest } from '../dtos/http-servlet-request.dto'; +import { Member } from '../../../../entities/member.entity'; @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 9e996142..e805410a 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,6 +2,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot'; +import { ? } from '../dtos/?.dto'; +import { PageParam } from '../../../../dtos/page-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'; 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 72688ba3..d70a5d73 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,14 +2,14 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; +import { MemberAddressGetInfoVo } from '../../../../dtos/api/member/vo/member-address-get-info-vo.dto'; +import { MemberAddressListInfoVo } from '../../../../dtos/api/member/vo/member-address-list-info-vo.dto'; import { MemberAddressAddParam } from '../../../../dtos/api/member/param/member-address-add-param.dto'; import { MemberAddress } from '../../../../entities/member-address.entity'; 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 e70e7d52..8001bdae 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,14 +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 { ? } from '../dtos/?.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { CashOutTransferParam } from '../../../../dtos/admin/member/param/cash-out-transfer-param.dto'; +import { CashOutConfigVo } from '../../../../dtos/admin/member/vo/cash-out-config-vo.dto'; +import { MemberCashOutApplyParam } from '../../../../dtos/core/member/param/member-cash-out-apply-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'; 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 3cfb4a32..0524cbcd 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,10 +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 { 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'; +import { MemberLevelInfoVo } from '../../../../dtos/api/member/vo/member-level-info-vo.dto'; +import { MemberLevelSimpleInfoVo } from '../../../../dtos/api/member/vo/member-level-simple-info-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 6ca6081e..f8f0f035 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,11 +2,12 @@ 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 { 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 { MemberInfoVo } from '../../../../dtos/api/member/vo/member-info-vo.dto'; +import { MemberQcodeVo } from '../../../../dtos/api/member/vo/member-qcode-vo.dto'; +import { MemberInfoParam } from '../../../../dtos/api/member/param/member-info-param.dto'; +import { MemberCenterParam } from '../../../../dtos/api/member/param/member-center-param.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'; 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 241618dd..79035700 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,9 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; +import { MemberSignRecordVo } from '../../../../dtos/api/member/vo/member-sign-record-vo.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'; 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 c1abb0ff..e4c29336 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,12 +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 { PayParam } from '../../../../dtos/admin/pay/param/pay-param.dto'; import { PayAsyncNotifyParam } from '../../../../dtos/common/loader/pay/param/pay-async-notify-param.dto'; +import { PayParam } from '../../../../dtos/admin/pay/param/pay-param.dto'; +import { FriendspayInfoVo } from '../../../../dtos/api/pay/vo/friendspay-info-vo.dto'; +import { GetInfoByTradeVo } from '../../../../dtos/core/pay/vo/get-info-by-trade-vo.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/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 1c40cb1e..1f87dd15 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,13 +2,13 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { SysAreaListVo } from '../../../../dtos/api/sys/vo/sys-area-list-vo.dto'; +import { SysMapVo } from '../../../../dtos/admin/sys/vo/sys-map-vo.dto'; +import { SysAreaAddressByLatlngParam } from '../../../../dtos/api/sys/param/sys-area-address-by-latlng-param.dto'; import { SysAreaLevelVo } from '../../../../dtos/api/sys/vo/sys-area-level-vo.dto'; +import { SysAreaListVo } from '../../../../dtos/api/sys/vo/sys-area-list-vo.dto'; import { Map } from '../dtos/list>.dto'; import { SysArea } from '../../../../entities/sys-area.entity'; -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 73996306..65f632a3 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,14 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; +import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { SysCopyRightVo } from '../../../../dtos/admin/sys/vo/sys-copy-right-vo.dto'; +import { SysMapVo } from '../../../../dtos/admin/sys/vo/sys-map-vo.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 '../../../../entities/sys-config-scene-domain-param.entity'; import { SysConfigMapParam } from '../../../../dtos/api/sys/param/sys-config-map-param.dto'; +import { SysConfigSceneDomainParam } from '../../../../entities/sys-config-scene-domain-param.entity'; +import { SysConfigSiteParam } from '../../../../dtos/api/sys/param/sys-config-site-param.dto'; +import { SceneDomainVo } from '../../../../entities/scene-domain-vo.entity'; @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 41bb6d02..4c9751b1 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,17 +3,17 @@ 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 { SysVerifyGetCodeParam } from '../../../../dtos/api/sys/param/sys-verify-get-code-param.dto'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto'; +import { SysVerifyDetailVo } from '../../../../dtos/api/sys/vo/sys-verify-detail-vo.dto'; import { SysVerifyGetCodeVo } from '../../../../dtos/api/sys/vo/sys-verify-get-code-vo.dto'; +import { SysVerifyRecordsVo } from '../../../../dtos/api/sys/vo/sys-verify-records-vo.dto'; +import { SysVerifyGetCodeParam } from '../../../../dtos/api/sys/param/sys-verify-get-code-param.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'; 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 183c52f5..0a8ee7ee 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 @@ -3,6 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { AttachmentUploadParam } from '../../../../dtos/admin/sys/param/attachment-upload-param.dto'; +import { AttachmentUploadVo } from '../../../../dtos/admin/sys/vo/attachment-upload-vo.dto'; @Injectable() export class UploadServiceImplService { 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 2f8a4383..bf90c696 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,10 +2,16 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; -import { WechatAuthParam } from '../../../../dtos/api/wechat/param/wechat-auth-param.dto'; -import { LoginVo } from '../../../../dtos/api/login/vo/login-vo.dto'; +import { WxMaOrderShippingIsTradeManagedResponse } from '../dtos/wx-ma-order-shipping-is-trade-managed-response.dto'; import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; +import { LoginVo } from '../../../../dtos/api/login/vo/login-vo.dto'; import { AuthRegisterParam } from '../../../../dtos/api/wechat/param/auth-register-param.dto'; +import { WechatAuthDataLoginParam } from '../../../../dtos/api/wechat/param/wechat-auth-data-login-param.dto'; +import { WechatAuthParam } from '../../../../dtos/api/wechat/param/wechat-auth-param.dto'; +import { WechatSyncParam } from '../../../../dtos/api/wechat/param/wechat-sync-param.dto'; +import { WechatCodeUrlVo } from '../../../../dtos/api/wechat/vo/wechat-code-url-vo.dto'; +import { WechatScanLoginVo } from '../../../../dtos/api/wechat/vo/wechat-scan-login-vo.dto'; +import { IsTradeManagedVo } from '../../../../dtos/core/weapp/vo/is-trade-managed-vo.dto'; @Injectable() export class WeappServiceImplService { 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 89371636..4daa5f6c 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,16 +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 { @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 { LoginVo } from '../../../../dtos/api/login/vo/login-vo.dto'; +import { WechatAuthDataLoginParam } from '../../../../dtos/api/wechat/param/wechat-auth-data-login-param.dto'; +import { WechatAuthParam } from '../../../../dtos/api/wechat/param/wechat-auth-param.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 { WechatCodeUrlVo } from '../../../../dtos/api/wechat/vo/wechat-code-url-vo.dto'; import { WechatScanLoginVo } from '../../../../dtos/api/wechat/vo/wechat-scan-login-vo.dto'; +import { WechatUserInfoVo } from '../../../../dtos/api/wechat/vo/wechat-user-info-vo.dto'; +import { @Lazy } from '../dtos/@-lazy.dto'; @Injectable() export class WechatServiceImplService { 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 50a8a697..d76fbf93 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,7 +3,9 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService } from '@wwjBoot'; import * as fs from 'fs'; +import { AddonParam } from '../../../../dtos/admin/addon/param/addon-param.dto'; import { CoreAddonSearchParam } from '../../../../dtos/core/addon/param/core-addon-search-param.dto'; +import { InstallAddonListVo } from '../../../../entities/install-addon-list-vo.entity'; import { Addon } from '../../../../entities/addon.entity'; @Injectable() 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 5b388078..16edcda9 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,9 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; -import { AliappConfigVo } from '../../../../dtos/core/aliapp/vo/aliapp-config-vo.dto'; import { AliappConfigParam } from '../../../../dtos/core/aliapp/param/aliapp-config-param.dto'; +import { AliappConfigVo } from '../../../../dtos/core/aliapp/vo/aliapp-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; @Injectable() export class CoreAliappConfigServiceImplService { 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 ec52e625..f7be2593 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 { TaskArgument } from '../dtos/task-argument.dto'; import { CoreQueueExecParam } from '../../../../dtos/core/app/param/core-queue-exec-param.dto'; +import { TaskArgument } from '../dtos/task-argument.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 01730e62..eee82565 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,8 @@ import { Injectable, UnauthorizedException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -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 { CoreCaptchaInfoVo } from '../../../../dtos/core/captcha/vo/core-captcha-info-vo.dto'; import { CaptchaVO } from '../dtos/captcha-v-o.dto'; @Injectable() 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 2b6299f8..dd835b7c 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,11 +3,13 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot'; import * as fs from 'fs'; +import { HttpResponse } from '../dtos/http-response.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'; +import { AppCompileLogVo } from '../../../../dtos/core/channel/vo/app-compile-log-vo.dto'; +import { AppConfigVo } from '../../../../dtos/core/channel/vo/app-config-vo.dto'; +import { WeappUploadParam } from '../../../../dtos/core/weapp/param/weapp-upload-param.dto'; @Injectable() export class CoreAppCloudServiceImplService { 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 d4fd500b..d77e35c3 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,9 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; -import { AppConfigVo } from '../../../../dtos/core/channel/vo/app-config-vo.dto'; import { SetAppParam } from '../../../../dtos/core/channel/param/set-app-param.dto'; +import { AppConfigVo } from '../../../../dtos/core/channel/vo/app-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; @Injectable() export class CoreAppServiceImplService { 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 5160c866..40e46811 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,9 +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 { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; -import { H5ConfigVo } from '../../../../dtos/core/channel/vo/h5-config-vo.dto'; import { SetH5Param } from '../../../../dtos/core/channel/param/set-h5-param.dto'; +import { H5ConfigVo } from '../../../../dtos/core/channel/vo/h5-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; @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 ae2e9160..afeec01d 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,9 +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 { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; -import { PcConfigVo } from '../../../../dtos/core/channel/vo/pc-config-vo.dto'; +import { AliappConfigParam } from '../../../../dtos/core/aliapp/param/aliapp-config-param.dto'; +import { AliappConfigVo } from '../../../../dtos/core/aliapp/vo/aliapp-config-vo.dto'; import { SetPcParam } from '../../../../dtos/core/channel/param/set-pc-param.dto'; +import { PcConfigVo } from '../../../../dtos/core/channel/vo/pc-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; @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 080cb581..2215ffb3 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 @@ -3,6 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, JsonUtils } from '@wwjBoot'; import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { InstallAddonListVo } from '../../../../entities/install-addon-list-vo.entity'; @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 3d3e96a7..8478db7b 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,10 +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 { DiyFormWriteConfigInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-write-config-info-vo.dto'; +import { DiyFormSubmitConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-submit-config-param.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'; +import { DiyFormWriteConfigInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-write-config-info-vo.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 16c0f511..d1aef662 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,12 +2,12 @@ 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 { 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 { PageParam } from '../../../../dtos/page-param.dto'; +import { DiyFormRecordsParam } from '../../../../dtos/core/diy_form/param/diy-form-records-param.dto'; +import { DiyFormRecordsSearchParam } from '../../../../dtos/core/diy_form/param/diy-form-records-search-param.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() 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 f3014017..354740a2 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 { MemberCashOutApplyParam } from '../../../../dtos/core/member/param/member-cash-out-apply-param.dto'; +import { CashOutTransferParam } from '../../../../dtos/admin/member/param/cash-out-transfer-param.dto'; +import { MemberCashOutAuditParam } from '../../../../dtos/admin/member/param/member-cash-out-audit-param.dto'; import { CashOutConfigVo } from '../../../../dtos/admin/member/vo/cash-out-config-vo.dto'; +import { MemberCashOutApplyParam } from '../../../../dtos/core/member/param/member-cash-out-apply-param.dto'; import { MemberCashOut } from '../../../../entities/member-cash-out.entity'; import { Member } from '../../../../entities/member.entity'; -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 { 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 006c2380..fcc50b01 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,13 +2,13 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -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 { LoginConfigParam } from '../../../../dtos/admin/member/param/login-config-param.dto'; import { MemberConfigParam } from '../../../../dtos/admin/member/param/member-config-param.dto'; +import { CashOutConfigVo } from '../../../../dtos/admin/member/vo/cash-out-config-vo.dto'; +import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; +import { MemberConfigVo } from '../../../../dtos/admin/member/vo/member-config-vo.dto'; +import { @Lazy } from '../dtos/@-lazy.dto'; import { JSONObject } from '../dtos/j-s-o-n-object.dto'; @Injectable() 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 c8107844..7ef1d48c 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 @@ -3,13 +3,13 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, StringUtils, CommonUtils } from '@wwjBoot'; import { MemberConfigVo } from '../../../../dtos/admin/member/vo/member-config-vo.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'; +import { MemberInfoDto } from '../../../../dtos/core/member/dto/member-info.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 3b6733c5..199f2d67 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,10 +2,10 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot'; -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 { NoticeInfoVo } from '../../../../dtos/core/notice/vo/notice-info-vo.dto'; +import { @Lazy } from '../dtos/@-lazy.dto'; import { JSONObject } from '../dtos/j-s-o-n-object.dto'; import { Map } from '../dtos/object>.dto'; 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 1127cf6c..08903697 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 { SysNoticeSmsLog } from '../../../../entities/sys-notice-sms-log.entity'; import { PageParam } from '../../../../dtos/page-param.dto'; import { SysNoticeSmsLogSearchParam } from '../../../../dtos/core/notice/param/sys-notice-sms-log-search-param.dto'; -import { SysNoticeSmsLog } from '../../../../entities/sys-notice-sms-log.entity'; @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 e51863fc..b412a5ad 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,11 +2,11 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -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'; +import { WechatConfigVo } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto'; +import { @Lazy } from '../dtos/@-lazy.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 42d32c8a..d19290d7 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,11 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -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 { PageParam } from '../../../../dtos/page-param.dto'; import { PayRefundParam } from '../../../../dtos/core/pay/param/pay-refund-param.dto'; +import { PayRefundSearchParam } from '../../../../dtos/core/pay/param/pay-refund-search-param.dto'; +import { PayRefundInfoVo } from '../../../../dtos/core/pay/vo/pay-refund-info-vo.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 98359736..a1c141b1 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,15 +2,15 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils } from '@wwjBoot'; -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 { PayParam } from '../../../../dtos/admin/pay/param/pay-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 '../../../../entities/pay.entity'; import { SysPrinterPrintTicketParam } from '../../../../dtos/core/sys/param/sys-printer-print-ticket-param.dto'; +import { HttpServletRequest } from '../dtos/http-servlet-request.dto'; +import { HttpServletResponse } from '../dtos/http-servlet-response.dto'; +import { Pay } from '../../../../entities/pay.entity'; import { ChannelEnum } from '../../../../enums/channel.enum'; import { BigDecimal } from '../dtos/big-decimal.dto'; 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 fcc90404..39e5122e 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,16 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -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 { PageParam } from '../../../../dtos/page-param.dto'; import { RefundNotifyParam } from '../../../../dtos/common/loader/pay/param/refund-notify-param.dto'; +import { RefundParam } from '../../../../dtos/common/loader/pay/param/refund-param.dto'; +import { PayRefundCreateParam } from '../../../../dtos/core/pay/param/pay-refund-create-param.dto'; +import { PayRefundTransferParam } from '../../../../dtos/core/pay/param/pay-refund-transfer-param.dto'; +import { PayTransferParam } from '../../../../dtos/core/pay/param/pay-transfer-param.dto'; +import { PayTransferSearchParam } from '../../../../dtos/core/pay/param/pay-transfer-search-param.dto'; +import { PayTransferInfoVo } from '../../../../dtos/core/pay/vo/pay-transfer-info-vo.dto'; +import { PayTransferListVo } from '../../../../dtos/core/pay/vo/pay-transfer-list-vo.dto'; +import { @Validated } from '../dtos/@-validated.dto'; import { PayRefund } from '../../../../entities/pay-refund.entity'; @Injectable() 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 a5fb2aca..a3c86f21 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 { 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'; +import { WechatTransferSceneListVo } from '../../../../dtos/core/pay/vo/wechat-transfer-scene-list-vo.dto'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; @Injectable() export class CoreTransferSceneServiceImplService { 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 f61a8f65..c6e5586b 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,12 +2,17 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; +import { PageParam } from '../../../../dtos/page-param.dto'; +import { TransferNotifyParam } from '../../../../dtos/common/loader/pay/param/transfer-notify-param.dto'; +import { TransferParam } from '../../../../dtos/common/loader/pay/param/transfer-param.dto'; +import { PayTransferParam } from '../../../../dtos/core/pay/param/pay-transfer-param.dto'; +import { PayTransferSearchParam } from '../../../../dtos/core/pay/param/pay-transfer-search-param.dto'; +import { PayTransferInfoVo } from '../../../../dtos/core/pay/vo/pay-transfer-info-vo.dto'; +import { PayTransferListVo } from '../../../../dtos/core/pay/vo/pay-transfer-list-vo.dto'; +import { TransferQueryVo } from '../../../../dtos/core/pay/vo/transfer-query-vo.dto'; import { PayTransfer } from '../../../../entities/pay-transfer.entity'; 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 ff67adb4..12d2839b 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 { GetPosterParam } from '../../../../dtos/core/poster/param/get-poster-param.dto'; import { AddPosterParam } from '../../../../dtos/core/poster/param/add-poster-param.dto'; +import { GetPosterParam } from '../../../../dtos/core/poster/param/get-poster-param.dto'; @Injectable() export class CorePosterServiceImplService { 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 8bd7ed6c..2e1f0f06 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,8 +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 { SiteInfoCacheVo } from '../../../../dtos/core/site/vo/site-info-cache-vo.dto'; import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { SiteInfoCacheVo } from '../../../../dtos/core/site/vo/site-info-cache-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 8e5faf23..ac11792d 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,9 +2,9 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -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'; +import { NoticeInfoVo } from '../../../../dtos/core/notice/vo/notice-info-vo.dto'; @Injectable() export class CoreSmsServiceImplService { 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 47cf97e0..4c0e6076 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,10 +2,10 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot'; -import { SysExport } from '../../../../entities/sys-export.entity'; -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 { SysExportParam } from '../../../../dtos/core/sys/param/sys-export-param.dto'; +import { SysExport } from '../../../../entities/sys-export.entity'; +import { JSONObject } from '../dtos/j-s-o-n-object.dto'; import { JSONArray } from '../dtos/j-s-o-n-array.dto'; @Injectable() 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 f0943419..2ad0b765 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,12 +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 { JSON } from '../dtos/j-s-o-n.dto'; -import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; import { SysPrinterAddPrinterYlyParam } from '../../../../dtos/core/sys/param/sys-printer-add-printer-yly-param.dto'; -import { SysPrinter } from '../../../../entities/sys-printer.entity'; import { SysPrinterPrintTicketParam } from '../../../../dtos/core/sys/param/sys-printer-print-ticket-param.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; import { SysPrinterPrintTicketVo } from '../../../../dtos/core/sys/vo/sys-printer-print-ticket-vo.dto'; +import { JSON } from '../dtos/j-s-o-n.dto'; +import { SysPrinter } from '../../../../entities/sys-printer.entity'; @Injectable() export class CorePrinterServiceImplService { 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 f737687c..2bec9b5a 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,6 +2,9 @@ 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 { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; +import { SceneDomainVo } from '../../../../entities/scene-domain-vo.entity'; +import { HttpServletRequest } from '../dtos/http-servlet-request.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'; @@ -14,8 +17,6 @@ import { SysDeveloperTokenParam } from '../../../../dtos/admin/sys/param/sys-dev 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 '../../../../entities/scene-domain-vo.entity'; @Injectable() export class CoreSysConfigServiceImplService { 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 d9dfe739..a2b55f13 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,6 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService } from '@wwjBoot'; import * as fs from 'fs'; +import { HttpResponse } from '../dtos/http-response.dto'; import { WeappUploadParam } from '../../../../dtos/core/weapp/param/weapp-upload-param.dto'; import { InputStream } from '../dtos/input-stream.dto'; 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 dbcc34c2..985bb2cf 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 @@ -3,8 +3,10 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; -import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; import { WeappConfigParam } from '../../../../dtos/core/weapp/param/weapp-config-param.dto'; +import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; +import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto'; +import { WechatConfigVo } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto'; import { WxOpenAuthorizerInfoResult } from '../dtos/wx-open-authorizer-info-result.dto'; @Injectable() 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 7c410552..ae3530d0 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,8 +2,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils } from '@wwjBoot'; -import { IsTradeManagedVo } from '../../../../dtos/core/weapp/vo/is-trade-managed-vo.dto'; +import { WxMaOrderShippingInfoBaseResponse } from '../dtos/wx-ma-order-shipping-info-base-response.dto'; +import { WxMaOrderShippingIsTradeManagedResponse } from '../dtos/wx-ma-order-shipping-is-trade-managed-response.dto'; import { WeappUploadShippingParam } from '../../../../dtos/core/weapp/param/weapp-upload-shipping-param.dto'; +import { IsTradeManagedVo } from '../../../../dtos/core/weapp/vo/is-trade-managed-vo.dto'; import { UploadShippingParam } from '../dtos/upload-shipping-param.dto'; @Injectable() 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 71959451..c085edee 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 { SysCopyRightVo } from '../../../../dtos/admin/sys/vo/sys-copy-right-vo.dto'; import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; -import { WechatConfigVo } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto'; import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto'; +import { WechatConfigVo } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto'; import { WxOpenAuthorizerInfoResult } from '../dtos/wx-open-authorizer-info-result.dto'; @Injectable() 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 fcc4d327..a30429c6 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 @@ -3,6 +3,9 @@ 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'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; +import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto'; +import { WechatConfigVo } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto'; @Injectable() export class CoreWechatReplyServiceImplService { 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 79232139..09152845 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,9 +2,10 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot'; -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'; +import { SceneDomainVo } from '../../../../entities/scene-domain-vo.entity'; +import { CoreOplatformStaticConfigVo } from '../../../../dtos/core/wxoplatform/vo/core-oplatform-static-config-vo.dto'; @Injectable() export class CoreOplatformStaticConfigServiceImplService {