diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/converters/service-method-converter.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/converters/service-method-converter.js index ccd95157..a9dc5e50 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/converters/service-method-converter.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/converters/service-method-converter.js @@ -50,13 +50,39 @@ class ServiceMethodConverter { tsBody = this.convertDependencyCalls(tsBody, context); // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ - // 【阶段5】添加缩进 + // 【阶段5】后处理清理 + // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ + tsBody = this.postProcessCleanup(tsBody); + + // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ + // 【阶段6】添加缩进 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ tsBody = tsBody.split('\n').map(line => ' ' + line).join('\n'); return tsBody; } + /** + * 【阶段5】后处理清理 + * 修复转换后的常见语法错误 + */ + postProcessCleanup(tsBody) { + // 1. 修复 this.fs. 和 this.path. → fs. 和 path. + tsBody = tsBody.replace(/this\.fs\./g, 'fs.'); + tsBody = tsBody.replace(/this\.path\./g, 'path.'); + + // 2. 修复逻辑运算符优先级问题 + // if (!this.config.get('xxx') === "yyy") → if (this.config.get('xxx') !== "yyy") + tsBody = tsBody.replace(/if\s*\(\s*!this\.config\.get\([^)]+\)\s*===\s*([^)]+)\)/g, (match) => { + // 提取内容 + const configCall = match.match(/this\.config\.get\([^)]+\)/)[0]; + const value = match.match(/===\s*([^)]+)\)/)[1].trim(); + return `if (${configCall} !== ${value})`; + }); + + return tsBody; + } + /** * 【阶段1】基础语法转换 */ @@ -120,12 +146,24 @@ class ServiceMethodConverter { // 【配置访问】WebAppEnvs / GlobalConfig → ConfigService // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ + // WebAppEnvs.get().property.exists() → fs.existsSync(this.config.get('property')) + // 必须在WebAppEnvs.get().property之前处理 + tsBody = tsBody.replace(/WebAppEnvs\.get\(\)\.(\w+)\.exists\(\)/g, (match, prop) => { + return `fs.existsSync(this.config.get('${prop}'))`; + }); + // WebAppEnvs.get().property → this.config.get('property') tsBody = tsBody.replace(/WebAppEnvs\.get\(\)\.(\w+)/g, (match, prop) => { return `this.config.get('${prop}')`; }); tsBody = tsBody.replace(/WebAppEnvs\.get\(\)/g, 'this.config'); + // GlobalConfig.property.exists() → fs.existsSync(this.config.get('property')) + // 必须在GlobalConfig.property之前处理 + tsBody = tsBody.replace(/GlobalConfig\.(\w+)\.exists\(\)/g, (match, prop) => { + return `fs.existsSync(this.config.get('${prop}'))`; + }); + // GlobalConfig.property → this.config.get('property') tsBody = tsBody.replace(/GlobalConfig\.(\w+)/g, (match, prop) => { return `this.config.get('${prop}')`; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-build-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-build-service-impl.service.ts index 609d98c5..cb87a283 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-build-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-build-service-impl.service.ts @@ -1,12 +1,14 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as fs from 'fs'; +import * as path from 'path'; @Injectable() export class AddonDevelopBuildServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -25,11 +27,11 @@ export class AddonDevelopBuildServiceImplService { try { for (const child of this.fs.readdirSync(addonPath)) { - if (fs.lstatSync(child).isDirectory() && !path.basename(child) === "sql") FileUtils.cleanDirectory(child); + if (fs.lstatSync(child).isDirectory() && !path.basename(child) === "sql") fs.rmSync(child, { recursive: true, force: true }); } - FileUtils.copyFile(infoFile, this.addonPath + "info.json"); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + fs.copyFileSync(infoFile, this.addonPath + "info.json"); + } catch (e) { + throw new BadRequestException(e.message); } this.admin(); @@ -52,6 +54,6 @@ export class AddonDevelopBuildServiceImplService { async download(...args: any[]): Promise { const file: string = this.config.get('webRootDownResource' + "temp/" + key + ".zip"); if (!fs.existsSync(file)) throw new BadRequestException("请先打包插件"); - return file.getPath().replace(this.config.get('projectRoot'), ""); + return file.replace(this.config.get('projectRoot'), ""); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts index 0f7ae47c..3589a56d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts @@ -1,12 +1,14 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as fs from 'fs'; +import * as path from 'path'; @Injectable() export class AddonDevelopServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -105,8 +107,8 @@ export class AddonDevelopServiceImplService { if (addon != null) throw new BadRequestException("已安装的插件不允许删除"); try { - FileUtils.deleteDirectory(this.config.get('webRootDownAddon' + key)); - } catch (Exception e) { + fs.rmSync(this.config.get('webRootDownAddon', { recursive: true, force: true } + key)); + } catch (e) { e.printStackTrace(); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-log-service-impl.service.ts index 58cd4320..817b260c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-log-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class AddonLogServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts index 4c25d7c5..bc71b319 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts @@ -1,12 +1,14 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as fs from 'fs'; +import * as path from 'path'; @Injectable() export class AddonServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -72,7 +74,7 @@ export class AddonServiceImplService { } } catch (IOException e) { e.printStackTrace(); - vo.setError(e.getMessage()); + vo.setError(e.message); } vo.setList(list); @@ -246,10 +248,10 @@ export class AddonServiceImplService { try (const fos: FileOutputStream = new FileOutputStream(file)) { fos.write(response.bodyBytes()); - ZipUtil.unzip(file.getPath(), this.config.get('webRootDownAddon'), Charset.forName(System.getProperty("sun.jnu.encoding"))); - } catch (Exception e) { + ZipUtil.unzip(file, this.config.get('webRootDownAddon'), Charset.forName(System.getProperty("sun.jnu.encoding"))); + } catch (e) { e.printStackTrace(); - throw new BadRequestException(e.getMessage()); + throw new BadRequestException(e.message); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/aliapp/impl/aliapp-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/aliapp/impl/aliapp-config-service-impl.service.ts index c37e60f8..68010a64 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/aliapp/impl/aliapp-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/aliapp/impl/aliapp-config-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class AliappConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts index 33bc63c8..d1d48433 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts @@ -1,12 +1,13 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException, UnauthorizedException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class AuthServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -194,7 +195,7 @@ export class AuthServiceImplService { model.setCreateTime(System.currentTimeMillis() / 1000); model.setOperation(getDescription(request)); sysUserLogMapper.insert(model); - } catch (Exception e) { + } catch (e) { } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/config-service-impl.service.ts index 9fc43d98..ff1e0b87 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/config-service-impl.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class ConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts index 03b7499b..1a3188bf 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts @@ -1,8 +1,8 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, UnauthorizedException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class LoginServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/captcha/impl/captcha-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/captcha/impl/captcha-service-impl.service.ts index b0576e04..9c6a9bae 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/captcha/impl/captcha-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/captcha/impl/captcha-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CaptchaServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts index 0f8493ee..c1aa40a5 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class AdminAppServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/dict/impl/dict-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/dict/impl/dict-service-impl.service.ts index ad364209..35fc2024 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @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 da2df5ad..35b48569 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 a489f5b5..48c446d0 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @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 b5979895..f12a86d9 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 @@ -1,8 +1,8 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class DiyServiceImplService { 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 a27e73d6..c6caad79 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 0303aaa8..93c4ea12 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 93aa3d2c..6f9e17ff 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 @@ -1,12 +1,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class DiyFormRecordsServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -91,7 +91,7 @@ export class DiyFormRecordsServiceImplService { const obj: any = clazz.getDeclaredConstructor().newInstance(); const method: Method = clazz.getMethod("render", String.class, String.class); value.put("render_value", method.invoke(obj, value.get("field_value").toString(), value.get("field_type").toString())); - }catch (Exception e){ + }catch (e){ e.printStackTrace(); } @@ -147,7 +147,7 @@ export class DiyFormRecordsServiceImplService { const obj: any = clazz.getDeclaredConstructor().newInstance(); const method: Method = clazz.getMethod("render", String.class, String.class); value.put("render_value", method.invoke(obj, value.get("field_value").toString(), value.get("field_type").toString())); - }catch (Exception e){ + }catch (e){ e.printStackTrace(); } 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 c1108631..963a58d9 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class DiyFormServiceImplService { @@ -551,9 +550,9 @@ export class DiyFormServiceImplService { diyFormRecordsFieldsMapper.delete(fieldsQueryWrapper); return true; - } catch (Exception e) { + } catch (e) { // 事务会自动回滚，因为使用了 @Transactional 注解 - throw new BadRequestException("删除记录失败: " + e.getMessage()); + throw new BadRequestException("删除记录失败: " + e.message); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-column-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-column-service-impl.service.ts index c3b5e26e..0d73c1d7 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-column-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-column-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class GenerateColumnServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts index 8885d600..5838b2c1 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class GenerateServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -321,7 +321,7 @@ export class GenerateServiceImplService { FileTools.createDirs(packageDir); FileUtil.clean(tempDir); for (const coreGenerateTemplateVo of list) { - FileTools.createDirs(packageDir + coreGenerateTemplateVo.getPath()); + FileTools.createDirs(packageDir + coreGenerateTemplateVo); FileUtil.writeUtf8String(coreGenerateTemplateVo.getData(), packageDir + coreGenerateTemplateVo.getPath(, coreGenerateTemplateVo.getFileName())); } const zipFile: string = ZipUtil.zip(packageDir, tempDir + "package.zip"); @@ -333,7 +333,7 @@ export class GenerateServiceImplService { if (coreGenerateTemplateVo.getType() === "sql") { SQLScriptRunnerTools.execScript(coreGenerateTemplateVo.getData()); } else { - FileUtil.writeUtf8String(coreGenerateTemplateVo.getData(), this.config.get('projectRoot' + "/" + coreGenerateTemplateVo.getPath(), coreGenerateTemplateVo.getFileName())); + FileUtil.writeUtf8String(coreGenerateTemplateVo.getData(), this.config.get('projectRoot' + "/" + coreGenerateTemplateVo, coreGenerateTemplateVo.getFileName())); } } } @@ -353,7 +353,7 @@ export class GenerateServiceImplService { vo.setName(coreGenerateTemplateVo.getFileName()); vo.setType(coreGenerateTemplateVo.getType()); vo.setContent(coreGenerateTemplateVo.getData()); - vo.setFileDir(coreGenerateTemplateVo.getPath() + "/"); + vo.setFileDir(coreGenerateTemplateVo + "/"); voList.add(vo); } return voList; 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 80a6fe1f..23c9d9fa 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class AuthSiteServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} 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 c5f47791..f878ca95 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 @@ -1,12 +1,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class MemberAccountServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} 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 905e077d..6d0cc2ad 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 0a808da7..49e00e3a 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 @@ -1,12 +1,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class MemberCashOutServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-config-service-impl.service.ts index 6417d3d8..c2d87945 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-config-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class MemberConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-label-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-label-service-impl.service.ts index df776018..b20dead9 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 8e48efa0..e2e64830 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 4c65b127..10095466 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class MemberServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} 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 3c0589ab..0d343bfc 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 @@ -1,12 +1,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class MemberSignServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} 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 c5d6aeb7..4b1805b9 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 @@ -1,12 +1,13 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as fs from 'fs'; @Injectable() export class CloudBuildServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -143,8 +144,8 @@ export class CloudBuildServiceImplService { if (this.buildTask == null) return; const tempDir: string = this.config.get('webRootDownRuntime' + "cloud_build/" + this.buildTask.getStr("task_key")); try { - if (fs.existsSync(tempDir)) FileUtils.deleteDirectory(tempDir); - } catch (Exception e) { + if (fs.existsSync(tempDir)) fs.rmSync(tempDir, { recursive: true, force: true }); + } catch (e) { } cached.remove("cloud_build_task"); this.buildTask = null; 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 f2836a8d..8febb74a 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class NiuCloudServiceImplService { 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 5e633fbc..e83ec1e6 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class NoticeLogServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/notice-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/notice-service-impl.service.ts index 55e16609..adc1b237 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 9704ebd0..4f42aa89 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class NuiSmsServiceImplService { @@ -20,8 +20,8 @@ export class NuiSmsServiceImplService { //删除null值 防止序列化报错 JacksonUtils.removeNull(result); return result; - } catch (Exception e) { - log.error("获取验证码失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("获取验证码失败异常信息:{}", e.message); throw new Error(e); } } @@ -40,8 +40,8 @@ export class NuiSmsServiceImplService { //删除null值 防止序列化报错 JacksonUtils.removeNull(result); return result; - } catch (Exception e) { - log.error("发送验证码失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("发送验证码失败异常信息:{}", e.message); throw new AdminException("发送验证码失败"); } } @@ -58,8 +58,8 @@ export class NuiSmsServiceImplService { result = NiucloudUtils.Niucloud.post(ACCOUNT_REGISTER_URL, param); //删除null值 防止序列化报错 JacksonUtils.removeNull(result); - } catch (Exception e) { - log.error("注册账号失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("注册账号失败异常信息:{}", e.message); throw new AdminException("注册账号失败"); } return result; @@ -85,9 +85,9 @@ export class NuiSmsServiceImplService { //删除null值 防止序列化报错 JacksonUtils.removeNull(result); return result; - } catch (Exception e) { - log.error("登录账号失败异常信息:{}", e.getMessage()); - throw new AdminException(e.getMessage()); + } catch (e) { + log.error("登录账号失败异常信息:{}", e.message); + throw new AdminException(e.message); } } @@ -117,8 +117,8 @@ export class NuiSmsServiceImplService { const resetPasswordJson: Record = NiucloudUtils.Niucloud.put(resetPasswordUrl, resetPasswordBody); const resetPasswordDataJson: Record = resetPasswordJson.getJSONObject("data"); newPassword = resetPasswordDataJson.getStr("newPassword"); - } catch (Exception e) { - log.error("重置密码失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("重置密码失败异常信息:{}", e.message); throw new AdminException("重置密码失败"); } @@ -150,7 +150,7 @@ export class NuiSmsServiceImplService { JacksonUtils.removeNull(result); return result; } catch (JSONException e) { - log.error("获取用户信息失败异常信息:{}", e.getMessage()); + log.error("获取用户信息失败异常信息:{}", e.message); throw new AdminException("获取用户信息失败"); } } @@ -284,8 +284,8 @@ export class NuiSmsServiceImplService { result = jsonObject.getJSONObject("data"); //删除null值 防止序列化报错 JacksonUtils.removeNull(result); - } catch (Exception e) { - log.error("获取订单列表失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("获取订单列表失败异常信息:{}", e.message); throw new AdminException("获取订单列表失败"); } return result; @@ -308,8 +308,8 @@ export class NuiSmsServiceImplService { //删除null值 防止序列化报错 JacksonUtils.removeNull(result); return result; - } catch (Exception e) { - log.error("获取发送列表失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("获取发送列表失败异常信息:{}", e.message); throw new AdminException("获取发送列表失败"); } } @@ -357,8 +357,8 @@ export class NuiSmsServiceImplService { setConfig(registerAccountParam); JacksonUtils.removeNull(jsonObject); return jsonObject; - } catch (Exception e) { - log.error("修改账号信息失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("修改账号信息失败异常信息:{}", e.message); throw new AdminException("修改账号信息失败"); } } @@ -384,8 +384,8 @@ export class NuiSmsServiceImplService { editAccount(username, editAccountParam); } return failList; - } catch (Exception e) { - log.error("删除签名失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("删除签名失败异常信息:{}", e.message); throw new AdminException("删除签名失败异常"); } } @@ -406,7 +406,7 @@ export class NuiSmsServiceImplService { throw new ApiException(failList.getJSONObject(0).getStr("msg")); } } catch (ApiException e) { - log.error("创建签名失败异常信息:{}", e.getMessage()); + log.error("创建签名失败异常信息:{}", e.message); throw new AdminException("创建签名失败"); } } @@ -432,8 +432,8 @@ export class NuiSmsServiceImplService { //删除null值 防止序列化报错 JacksonUtils.removeNull(result); return result; - } catch (Exception e) { - log.error("获取套餐列表失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("获取套餐列表失败异常信息:{}", e.message); throw new AdminException("获取套餐列表失败"); } } @@ -451,8 +451,8 @@ export class NuiSmsServiceImplService { //删除null值 防止序列化报错 JacksonUtils.removeNull(result); return result; - } catch (Exception e) { - log.error("计算订单失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("计算订单失败异常信息:{}", e.message); throw new AdminException("计算订单失败"); } } @@ -470,8 +470,8 @@ export class NuiSmsServiceImplService { //删除null值 防止序列化报错 JacksonUtils.removeNull(result); return result; - } catch (Exception e) { - log.error("创建订单失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("创建订单失败异常信息:{}", e.message); throw new AdminException("创建订单失败"); } } @@ -500,8 +500,8 @@ export class NuiSmsServiceImplService { //删除null值 防止序列化报错 JacksonUtils.removeNull(result); return result; - } catch (Exception e) { - log.error("获取支付信息失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("获取支付信息失败异常信息:{}", e.message); throw new AdminException("获取支付信息失败"); } } @@ -517,8 +517,8 @@ export class NuiSmsServiceImplService { //删除null值 防止序列化报错 JacksonUtils.removeNull(result); return result; - } catch (Exception e) { - log.error("获取订单信息失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("获取订单信息失败异常信息:{}", e.message); throw new AdminException("获取订单信息失败"); } } @@ -534,8 +534,8 @@ export class NuiSmsServiceImplService { //删除null值 防止序列化报错 JacksonUtils.removeNull(result); return result; - } catch (Exception e) { - log.error("获取订单状态失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("获取订单状态失败异常信息:{}", e.message); throw new AdminException("获取订单状态失败"); } } @@ -583,8 +583,8 @@ export class NuiSmsServiceImplService { const jsonObject: Record = NiucloudUtils.Niucloud.post(templateCreateUrl, templateCreateBody); result = jsonObject.getJSONObject("data"); JacksonUtils.removeNull(result); // 删除null值，防止序列化报错 - } catch (Exception e) { - log.error("创建模版失败异常信息:{}，", e.getMessage()); + } catch (e) { + log.error("创建模版失败异常信息:{}，", e.message); throw new AdminException("创建模版失败"); } @@ -629,8 +629,8 @@ export class NuiSmsServiceImplService { try { sendHttp(TEMPLATE_DELETE, deleteBody); niuSmsTemplateMapper.delete(new QueryWrapper().eq("template_id", templateId)); - } catch (Exception e) { - log.error("删除模版失败异常信息:{}，", e.getMessage()); + } catch (e) { + log.error("删除模版失败异常信息:{}，", e.message); throw new AdminException("删除模版失败"); } } @@ -660,8 +660,8 @@ export class NuiSmsServiceImplService { niuSmsTemplate.setAuditStatus(auditStatus); niuSmsTemplateMapper.updateById(niuSmsTemplate); return niuSmsTemplate; - } catch (Exception e) { - log.error("获取模版信息失败异常信息:{}", e.getMessage()); + } catch (e) { + log.error("获取模版信息失败异常信息:{}", e.message); throw new AdminException("获取模版信息失败"); } } 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 6649ff63..cabe4aff 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class PayChannelServiceImplService { @@ -85,8 +84,8 @@ export class PayChannelServiceImplService { if (ObjectUtil.isNotEmpty(value)) { try { config.set(key, StringUtils.hide(value, 0, value.length())); - } catch (Exception e) { - log.error("字段:{},值:{},支付设置脱敏失败{}", key, value, e.getMessage()); + } catch (e) { + log.error("字段:{},值:{},支付设置脱敏失败{}", key, value, e.message); } } } 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 a35da740..c441db96 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 ef05429f..1df7dcd0 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class PayServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-transfer-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-transfer-service-impl.service.ts index 5a8115dc..bf5a4017 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 87e76148..80272be3 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 e6c6ccbd..b3f1303b 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class SiteGroupServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -51,7 +51,7 @@ export class SiteGroupServiceImplService { iconAndTitle.setTitle(addon.getTitle()); try { iconAndTitle.setIcon(ImageToBase64ConverterUtil.convertToBase64(addon.getIcon())); - } catch (Exception e) { + } catch (e) { iconAndTitle.setIcon(""); } addonListResult.add(iconAndTitle); @@ -62,7 +62,7 @@ export class SiteGroupServiceImplService { iconAndTitle.setTitle(addon.getTitle()); try { iconAndTitle.setIcon(ImageToBase64ConverterUtil.convertToBase64(addon.getIcon())); - } catch (Exception e) { + } catch (e) { iconAndTitle.setIcon(""); } 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 970fc3f9..c5131131 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 @@ -1,12 +1,13 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class SiteServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -244,10 +245,10 @@ export class SiteServiceImplService { const wrapper: any = wrapperConstructor.newInstance(entityClass); eqMethod.invoke(wrapper, true, "site_id", id); deleteMethod.invoke(mapper, wrapper); - } catch (Exception e) { + } catch (e) { log.error("删除表数据失败: {} | 原因: {}", entityClass.getSimpleName(), - e.getCause() != null ? e.getCause().getMessage() : e.getMessage()); + e.getCause() != null ? e.getCause().getMessage() : e.message); } } @@ -259,9 +260,9 @@ export class SiteServiceImplService { // 删除站点主表 siteMapper.deleteById(id); - } catch (Exception e) { - log.error("删除站点失败: {}", e.getMessage(), e); - throw new BadRequestException("删除失败: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); + } catch (e) { + log.error("删除站点失败: {}", e.message, e); + throw new BadRequestException("删除失败: " + (e.getCause() != null ? e.getCause().getMessage() : e.message)); } // 清理缓存 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 9570fc7e..04dc2bf5 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class SiteUserServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -91,8 +91,8 @@ export class SiteUserServiceImplService { sysUserRoleParam.setUid(uid); sysUserRoleParam.setStatus(siteUserParam.getStatus()); sysUserRoleService.edit(sysUserRoleParam); - }catch (Exception e){ - throw new AdminException(e.getMessage()); + }catch (e){ + throw new AdminException(e.message); } } 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 3a3e6fcc..6bfaf6ed 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 1e96c9ca..8919411e 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @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 eebd42fb..164c6c0a 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class SysAgreementServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-area-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-area-service-impl.service.ts index ae30ff17..f2d2fb31 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class SysAreaServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-attachment-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-attachment-service-impl.service.ts index b681685c..0378f316 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 @@ -1,8 +1,8 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class SysAttachmentServiceImplService { @@ -29,7 +29,7 @@ export class SysAttachmentServiceImplService { for (const item of iPage.getRecords()) { const vo: SysAttachmentListVo = new SysAttachmentListVo(); BeanUtils.copyProperties(item, vo); - vo.setThumb(CommonUtils.thumbImageSmall(item.getSiteId(), item.getPath())); + vo.setThumb(CommonUtils.thumbImageSmall(item.getSiteId(), item)); list.add(vo); } return PageResult.build(page, limit, iPage.getTotal()).setData(list); @@ -90,7 +90,7 @@ export class SysAttachmentServiceImplService { throw new BadRequestException("请选择要删除的附件"); } for (const sysAttachment of sysAttachmentList) { - coreUploadService.delete(sysAttachment.getSiteId(), sysAttachment.getStorageType(), sysAttachment.getPath()); + coreUploadService.delete(sysAttachment.getSiteId(), sysAttachment.getStorageType(), sysAttachment); } sysAttachmentMapper.delete(new QueryWrapper().eq("site_id", RequestUtils.siteId()).in("att_id", param.getAttIds())); } 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 7516b990..5b7723cd 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 @@ -1,12 +1,13 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as fs from 'fs'; @Injectable() export class SysBackupRecordsServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -95,8 +96,8 @@ export class SysBackupRecordsServiceImplService { const file: string = backupDir(item.getBackupKey(), "backup"); if (fs.existsSync(file)) { try { - FileUtils.deleteDirectory(file); - } catch (Exception e) { + fs.rmSync(file, { recursive: true, force: true }); + } catch (e) { } } } @@ -155,10 +156,10 @@ export class SysBackupRecordsServiceImplService { vo.setParams(null); } setBackupRestoreTaskCache(vo); - } catch (Exception e) { + } catch (e) { vo.setStep(step); vo.setTask("fail"); - vo.setContent("备份恢复失败，稍后请手动恢复，备份文件路径：webroot/runtime/upgrade/"+ record.getBackupKey() +"/backup，失败原因：" + e.getMessage()); + vo.setContent("备份恢复失败，稍后请手动恢复，备份文件路径：webroot/runtime/upgrade/"+ record.getBackupKey() +"/backup，失败原因：" + e.message); setBackupRestoreTaskCache(vo); // 删除备份记录 sysBackupRecordsMapper.delete(new QueryWrapper().eq("backup_key", vo.getKey())); @@ -208,10 +209,10 @@ export class SysBackupRecordsServiceImplService { vo.setParams(null); } setBackupTaskCache(vo); - } catch (Exception e) { + } catch (e) { vo.setStep(step); vo.setTask("fail"); - vo.setContent("备份失败，稍后请重新手动备份，失败原因：" + e.getMessage()); + vo.setContent("备份失败，稍后请重新手动备份，失败原因：" + e.message); setBackupTaskCache(vo); // 删除备份记录 sysBackupRecordsMapper.delete(new QueryWrapper().eq("backup_key", vo.getKey())); @@ -279,7 +280,7 @@ export class SysBackupRecordsServiceImplService { if (delayed > 0) { try { Thread.sleep(delayed * 1000); - } catch (Exception e) { + } catch (e) { } } const cache: Cached = CacheFactory.getCacheOperator(); @@ -293,7 +294,7 @@ export class SysBackupRecordsServiceImplService { if (delayed > 0) { try { Thread.sleep(delayed * 1000); - } catch (Exception e) { + } catch (e) { } } const cache: Cached = CacheFactory.getCacheOperator(); 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 ad77055e..e166b194 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class SysConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-export-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-export-service-impl.service.ts index 3aa2539e..61fd95e0 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class SysExportServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-menu-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-menu-service-impl.service.ts index 3a6d500e..215f3202 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class SysMenuServiceImplService { @@ -228,7 +227,7 @@ export class SysMenuServiceImplService { } //排除菜单 menuList = sysMenuMapper.selectList(queryWrapper); - } catch (Exception e) { + } catch (e) { throw new BaseException("查询菜单错误"); } return menuList; 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 53456c37..7b40e7d1 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class SysNoticeLogServiceImplService { 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 9544222f..578a124f 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 c2006e51..99c81ae4 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class SysNoticeSmsLogServiceImplService { 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 3547bee8..3e925f72 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @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 f6c046e7..8e49373e 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class SysPrinterServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-template-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-template-service-impl.service.ts index df99ac96..05b152c3 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 d737d984..1cf7bb49 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 8c982731..fcf9735f 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 @@ -1,8 +1,8 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class SysScheduleServiceImplService { @@ -285,9 +285,9 @@ export class SysScheduleServiceImplService { .job(classPath) .build()); - } catch (Exception e) { + } catch (e) { // 获取任务名称（即使在异常情况下也尝试获取） - const errorMsg: string = "计划任务：" + path.basename(sysSchedule) + "发生错误, 错误原因：" + e.getMessage() + + const errorMsg: string = "计划任务：" + path.basename(sysSchedule) + "发生错误, 错误原因：" + e.message + " at " + e.getStackTrace()[0].toString(); addLog(SysScheduleLog.builder() .key(jobKey) 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 a38690b5..23f4ac47 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @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 ef616c56..8b58ab9b 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 51a3f4c6..c5faec12 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class SysUserRoleServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} 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 5553b984..31f882c2 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class SysUserServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -252,8 +252,8 @@ export class SysUserServiceImplService { sysUserRoleParam.setStatus(siteUserParam.getStatus()); sysUserRoleParam.setIsAdmin(isAdmin); sysUserRoleService.add(sysUserRoleParam); - } catch (Exception e) { - throw new AdminException(e.getMessage()); + } catch (e) { + throw new AdminException(e.message); } return uid; } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts index 4781b6f6..a426a6e5 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class SystemServiceImplService { @@ -49,7 +48,7 @@ export class SystemServiceImplService { } const dir: string = "upload/qrcode/" + RequestUtils.siteId() + "/" + param.getFolder(); vo.setWeappPath(QrcodeUtils.qrcodeToFile(RequestUtils.siteId(), "weapp", "", param.getPage(), data, dir)); - } catch (Exception e) { + } catch (e) { } return vo; 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 535c92b4..ca4ec472 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 @@ -1,12 +1,13 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as fs from 'fs'; @Injectable() export class UpgradeServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -223,7 +224,7 @@ export class UpgradeServiceImplService { if (delayed > 0) { try { Thread.sleep(delayed * 1000); - } catch (Exception e) { + } catch (e) { } } const cache: Cached = CacheFactory.getCacheOperator(); @@ -258,12 +259,12 @@ export class UpgradeServiceImplService { vo.setAddon(vo.getUpgradeApps().get(0)); } setUpgradeTaskCache(vo); - } catch (Exception e) { - if (e.getMessage().includes("队列")) { + } catch (e) { + if (e.message.includes("队列")) { throw e; } else { vo.setStep(step); - vo.getError().add(e.getMessage()); + vo.getError().add(e.message); setUpgradeTaskCache(vo); this.upgradeErrorHandle(vo); e.printStackTrace(); @@ -304,7 +305,7 @@ export class UpgradeServiceImplService { // 移除新版本删除的文件 const change: string[] = null; try { - change = Arrays.asList(FileUtils.readFileToString(changeRecord, "UTF-8").split("\n")); + change = Arrays.asList(fs.readFileSync(changeRecord, "UTF-8", 'utf-8').split("\n")); } catch (IOException e) { throw new Error(e); } @@ -351,7 +352,7 @@ export class UpgradeServiceImplService { vo.setStep("coverCode"); vo.setStatus("restarting"); setUpgradeTaskCache(vo); - FileUtils.writeStringToFile(upgradeDir(vo, "upgrade.json"), JSONUtil.parseObj(vo.getUpgradeContent()).toString(), "UTF-8"); + fs.writeFileSync(upgradeDir(vo, "upgrade.json", 'utf-8'), JSONUtil.parseObj(vo.getUpgradeContent()).toString(), "UTF-8"); PipeNameUtils.noticeBootRestartByUpgrade(this.config.get('applicationName'), vo.getKey(), vo.getUpgradeContent().getLastBackup().getBackupKey()); Thread.sleep(3000); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upload/impl/storage-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upload/impl/storage-config-service-impl.service.ts index d7c45eef..1e8e460b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upload/impl/storage-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upload/impl/storage-config-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class StorageConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verifier-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verifier-service-impl.service.ts index 0430b893..00f2a798 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 @@ -1,12 +1,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class VerifierServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} 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 45813d6e..2e8d55f9 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 @@ -1,12 +1,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class VerifyServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} 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 8971e1db..3f5345fa 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class WeappConfigServiceImplService { @@ -29,7 +28,7 @@ export class WeappConfigServiceImplService { domain.setDownloaddomain(String.join(";", domainResult.getDownloadDomain())); weappConfigVo.setDomain(domain); } - } catch (Exception e) { + } catch (e) { } } @@ -58,8 +57,8 @@ export class WeappConfigServiceImplService { ObjectUtil.isNotEmpty(param.getTcpdomain())? Arrays.asList(param.getTcpdomain().split(";")) : [], ObjectUtil.isNotEmpty(param.getUdpdomain())? Arrays.asList(param.getUdpdomain().split(";")) : [] ); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -70,8 +69,8 @@ export class WeappConfigServiceImplService { try { const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(RequestUtils.siteId()); return wxOpenMaService.getPrivacyService().getPrivacySetting(2); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -84,8 +83,8 @@ export class WeappConfigServiceImplService { const setPrivacySetting: SetPrivacySetting = JSONUtil.toBean(privacySetting, SetPrivacySetting.class); setPrivacySetting.setPrivacyVer(2); wxOpenMaService.getPrivacyService().setPrivacySetting(setPrivacySetting); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } } 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 9fdc24a0..aabb98b2 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 0505838a..c3711072 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 @@ -1,8 +1,8 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as fs from 'fs'; @Injectable() export class WeappVersionServiceImplService { @@ -124,7 +124,7 @@ export class WeappVersionServiceImplService { return "data:image/jpeg;base64," + Base64.getEncoder().encodeToString(FileUtils.readFileToByteArray(qrcode)); } return ""; - } catch (Exception e) { + } catch (e) { return ""; } } 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 ca5f3915..1146f60b 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 1e61cf6f..9115539b 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class WechatMediaServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -63,8 +63,8 @@ export class WechatMediaServiceImplService { const vo: WechatMediaInfoVo = new WechatMediaInfoVo(); BeanUtils.copyProperties(model, vo); return vo; - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -100,8 +100,8 @@ export class WechatMediaServiceImplService { const vo: WechatMediaInfoVo = new WechatMediaInfoVo(); BeanUtils.copyProperties(model, vo); return vo; - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -136,8 +136,8 @@ export class WechatMediaServiceImplService { offset++; this.syncNews(offset); } - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } } 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 613b30cf..50c83896 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class WechatMenuServiceImplService { @@ -27,7 +26,7 @@ export class WechatMenuServiceImplService { WechatUtils.mp(RequestUtils.siteId()).getMenuService().menuCreate(JSONUtil.parseObj(params).toString()) ; coreConfigService.setConfig(RequestUtils.siteId(), "WECHAT_MENU", data); }catch (WxErrorException e){ - throw new AdminException(e.getMessage()); + throw new AdminException(e.message); } } } 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 3dd57695..d2a2d4ff 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @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 030c614b..2a76afda 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 363735e4..63af0ed9 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @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 c21a2b07..c60e154e 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class OplatformServerServiceImplService { @@ -38,7 +37,7 @@ export class OplatformServerServiceImplService { authorizationParam.setAuthCode(inMessage.getAuthorizationCode()); oplatformService.authorization(authorizationParam); } - } catch (Exception e) { + } catch (e) { log.error("处理开放平台授权事件消息异常", e); } } 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 c45b7f5a..1c845707 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 @@ -1,8 +1,8 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class OplatformServiceImplService { @@ -17,8 +17,8 @@ export class OplatformServiceImplService { try { const url: string = RequestUtils.getDomain(true) + "/site/wxoplatform/callback"; return WechatUtils.WxOpen().getWxOpenComponentService().getPreAuthUrl(url); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -61,8 +61,8 @@ export class OplatformServiceImplService { coreWechatConfigService.setWechatAuthorizationInfo(RequestUtils.siteId(), result); } - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } 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 d4d63c36..870ec071 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 @@ -1,12 +1,13 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class WeappVersionServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -149,7 +150,7 @@ export class WeappVersionServiceImplService { } } } - } catch (Exception e) { + } catch (e) { console.log("小程序模板上传成功获取模板id异常"); e.printStackTrace(); } @@ -210,10 +211,10 @@ export class WeappVersionServiceImplService { // 提交审核 weappVersionService.submitAudit(siteId, model.getId()); - } catch (Exception e) { + } catch (e) { console.log("小程序提交代码异常"); e.printStackTrace(); - throw new BadRequestException(e.getMessage()); + throw new BadRequestException(e.message); } } @@ -267,7 +268,7 @@ export class WeappVersionServiceImplService { console.log("小程序提交审核异常"); e.printStackTrace(); - throw new BadRequestException(e.getMessage()); + throw new BadRequestException(e.message); } } } @@ -319,8 +320,8 @@ export class WeappVersionServiceImplService { try { const commitResult: WxOpenResult = WechatUtils.WxOpen().getWxOpenComponentService() .getWxMaServiceByAppid(weappCofig.getAppId()).undoCodeAudit(); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } version.setStatus(WeappVersionStatusEnum.APPLET_AUDIT_UNDO.getStatus()); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/agreement/impl/agreement-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/agreement/impl/agreement-service-impl.service.ts index 924f714b..c6feaca6 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/agreement/impl/agreement-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/agreement/impl/agreement-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class AgreementServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/channel/impl/app-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/channel/impl/app-service-impl.service.ts index dfafc251..bde11d93 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class AppServiceImplService { @@ -27,8 +26,8 @@ export class AppServiceImplService { ObjectUtil.defaultIfNull(wxUser.getHeadImgUrl(), ""), param.getPid() ); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -104,8 +103,8 @@ export class AppServiceImplService { registerMember.setWxUnionid(param.getUnionid()); registerMember.setPid(param.getPid()); return registerService.register(registerMember); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } } 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 e3022bd6..892afe62 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 @@ -1,12 +1,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class DiyFormServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} 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 fa9713af..7432f13e 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class DiyServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/auth-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/auth-service-impl.service.ts index 48ae2dc7..d2ce53b6 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/auth-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/auth-service-impl.service.ts @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, UnauthorizedException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class AuthServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts index 7ad66723..627eda9b 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 e4fc1f7b..a8222511 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 d11fd868..5dd74ee4 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class MemberAccountServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts index 641b6fd6..23877abc 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class MemberAddressServiceImplService { @@ -20,8 +19,8 @@ export class MemberAddressServiceImplService { if (param.getIsDefault() != null && param.getIsDefault() == 1) { try { this.deleteDefaultAddress(param.memberId()); - } catch (Exception e) { - log.error("更新会员默认地址数据库操作错误：", e.getMessage()); + } catch (e) { + log.error("更新会员默认地址数据库操作错误：", e.message); throw new BaseException("添加会员收货地址错误."); } } @@ -64,8 +63,8 @@ export class MemberAddressServiceImplService { if (param.getIsDefault() != null && param.getIsDefault() == 1) { try { deleteDefaultAddress(param.memberId()); - } catch (Exception e) { - log.error("更新会员默认地址数据库操作错误：", e.getMessage()); + } catch (e) { + log.error("更新会员默认地址数据库操作错误：", e.message); throw new BaseException("添加会员收货地址错误."); } } 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 9ed87165..b5aa33d0 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class MemberCashOutServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} 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 49da61b9..fe8871c6 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class MemberLevelServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -123,8 +123,8 @@ export class MemberLevelServiceImplService { const vo: MemberGetMobileVo = new MemberGetMobileVo(); vo.setMobile(mobile); return vo; - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } } 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 0aa50559..1f026b4e 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class MemberServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -122,8 +122,8 @@ export class MemberServiceImplService { try { const phoneInfo: WxMaPhoneNumberInfo = WechatUtils.miniapp(RequestUtils.siteId()).getUserService().getPhoneNoInfo(param.getMobileCode()); param.setMobile(phoneInfo.getPurePhoneNumber()); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } else { throw new BadRequestException("手机号不存在"); 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 6ce10c0a..b278e632 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class MemberSignServiceImplService { 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 48936960..077b26b7 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class PayServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/base64-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/base64-service-impl.service.ts index 569746d3..0912b35e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/base64-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/base64-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class Base64ServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts index a192c8ff..c895ca9b 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class SysAreaServiceImplService { @@ -43,8 +42,8 @@ export class SysAreaServiceImplService { queryWrapper.eq("pid", pid); const sysAreaList: SysArea[] = sysAreaMapper.selectList(queryWrapper); sysAreaVoList = CollectUtils.convert(sysAreaList, SysAreaListVo.class); - } catch (Exception e) { - log.error("查询区域错误：", e.getMessage()); + } catch (e) { + log.error("查询区域错误：", e.message); throw new BaseException("查询区域错误"); } return sysAreaVoList; 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 8e8f00fe..9f5beaf9 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 12ecf581..84163081 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class SysVerifyServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -27,8 +27,8 @@ export class SysVerifyServiceImplService { const qrcodeDir: string = this.config.get('webRootDownResource') + "upload/temp/"; const barcodePath: string = BarcodeUtils.generateBarcode(verifyCode, qrcodeDir); barcode = ImageUtils.imageToBase64(barcodePath); - } catch (Exception e) { - log.error("条形码生成失败:{}", e.getMessage(), e); + } catch (e) { + log.error("条形码生成失败:{}", e.message, e); throw new BadRequestException("条形码生成失败"); } sysVerifyGetCodeVo.setBarcode(barcode); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/task-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/task-service-impl.service.ts index 53622f69..c4b0d3a1 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/task-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/task-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class TaskServiceImplService { 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 10af7e90..6cfac1ba 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class UploadServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/serve-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/serve-service-impl.service.ts index 9626742b..4d26ed1a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/serve-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/serve-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class ServeServiceImplService { @@ -60,7 +59,7 @@ export class ServeServiceImplService { } return; } - } catch (Exception e) { + } catch (e) { e.printStackTrace(); } } 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 cdd71851..f63359ac 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class WeappServiceImplService { @@ -72,8 +71,8 @@ export class WeappServiceImplService { } return loginVo; - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -111,8 +110,8 @@ export class WeappServiceImplService { registerMember.setNickname(param.getNickname()); registerMember.setHeadimg(param.getHeadimg()); return registerService.register(registerMember); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -130,8 +129,8 @@ export class WeappServiceImplService { updateMember.setMemberId(RequestUtils.memberId()); updateMember.setWxOpenid(wxUser.getOpenid()); this.memberMapper.updateById(updateMember); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/serve-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/serve-service-impl.service.ts index e2cda7cd..3402f59d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/serve-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/serve-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class ServeServiceImplService { @@ -61,7 +60,7 @@ export class ServeServiceImplService { } return; } - } catch (Exception e) { + } catch (e) { e.printStackTrace(); } } 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 02312cd9..b44e959e 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class WechatServiceImplService { @@ -42,8 +41,8 @@ export class WechatServiceImplService { ObjectUtil.defaultIfNull(wxUser.getHeadImgUrl(), ""), param.getPid() ); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -88,8 +87,8 @@ export class WechatServiceImplService { registerMember.setWxUnionid(param.getUnionid()); registerMember.setPid(param.getPid()); return registerService.register(registerMember); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -106,8 +105,8 @@ export class WechatServiceImplService { member.setNickname(ObjectUtil.defaultIfNull(wxUser.getNickname(), "")); member.setHeadimg(ObjectUtil.defaultIfNull(wxUser.getHeadImgUrl(), "")); this.memberMapper.updateById(member); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -131,8 +130,8 @@ export class WechatServiceImplService { vo.setAvatar(ObjectUtil.defaultIfNull(userInfo.getHeadImgUrl(), "")); } return vo; - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -150,8 +149,8 @@ export class WechatServiceImplService { vo.setUrl(url); return vo; - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -170,8 +169,8 @@ export class WechatServiceImplService { updateMember.setMemberId(RequestUtils.memberId()); updateMember.setWxOpenid(wxUser.getOpenid()); this.memberMapper.updateById(updateMember); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/cached-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/cached-service-impl.service.ts index 4aa02c1b..0ede1d60 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/cached-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/cached-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CachedServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-install-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-install-service-impl.service.ts index 68cc429d..2ff158d3 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-install-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-install-service-impl.service.ts @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class CoreAddonInstallServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -94,11 +94,11 @@ export class CoreAddonInstallServiceImplService { this.cloudInstall(); } return installTask; - } catch (Exception e) { + } catch (e) { e.printStackTrace(); this.installExceptionHandle(); this.cancleInstall(); - throw new BadRequestException(e.getMessage()); + throw new BadRequestException(e.message); } } @@ -150,8 +150,8 @@ export class CoreAddonInstallServiceImplService { data.put("is_need_restart", 1); } return data; - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } 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 05e281d6..304519fc 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 @@ -1,12 +1,14 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as fs from 'fs'; +import * as path from 'path'; @Injectable() export class CoreAddonServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -34,7 +36,7 @@ export class CoreAddonServiceImplService { localAddonCount++; } } - } catch (Exception e) { + } catch (e) { } return localAddonCount; } 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 7863cad4..2b5b2bf6 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreAliappConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-app-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-app-service-impl.service.ts index 07aa735c..4797f968 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-app-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-app-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreAppServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-async-task-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-async-task-service-impl.service.ts index 189e5ad6..69f079db 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-async-task-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-async-task-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreAsyncTaskServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-queue-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-queue-service-impl.service.ts index 363be263..401847ea 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 de8442f1..787de5c9 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, UnauthorizedException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreCaptchaImgServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/default-captcha-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/default-captcha-service-impl.service.ts index 29b7a2f3..aedbfd1f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/default-captcha-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/default-captcha-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class DefaultCaptchaServiceImplService { @@ -78,9 +77,9 @@ export class DefaultCaptchaServiceImplService { return ResponseModel.errorMsg(RepCodeEnum.API_CAPTCHA_INVALID); } CaptchaServiceFactory.getCache(cacheType).delete(codeKey); - } catch (Exception var3) { + } catch (var3) { this.logger.error("验证码坐标解析失败", var3); - return ResponseModel.errorMsg(var3.getMessage()); + return ResponseModel.errorMsg(var3.message); } return ResponseModel.success(); } 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 6bedc5d0..99b01079 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 @@ -1,12 +1,13 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as fs from 'fs'; @Injectable() export class CoreAppCloudServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -54,20 +55,20 @@ export class CoreAppCloudServiceImplService { try { // 写入build.json文件 - FileUtils.writeStringToFile(packageDir, "build.json", build.toString(), "UTF-8"); + fs.writeFileSync(packageDir, "build.json", 'utf-8', build.toString(), "UTF-8"); // 拷贝证书文件 if (param.getCert().getType() === "private"){ const certFile: string = this.config.get('webRootDownResource', param.getCert().getFile()); if (!fs.existsSync(certFile)) throw new BadRequestException("证书文件不存在"); - FileUtils.copyFile(certFile, packageDir, "cert.jks"); + fs.copyFileSync(certFile, packageDir, "cert.jks"); } // 拷贝icon文件 const iconFile: string = this.config.get('webRootDownResource', param.getBuild().getIcon()); if (!fs.existsSync(iconFile)) throw new BadRequestException("icon文件不存在"); - FileUtils.copyFile(iconFile, packageDir, "drawable.zip"); + fs.copyFileSync(iconFile, packageDir, "drawable.zip"); // 将临时目录下文件生成压缩包 const zipFile: string = ZipUtil.zip(packageDir, tempDir + "app.zip"); @@ -94,8 +95,8 @@ export class CoreAppCloudServiceImplService { if (!res.getInt("code", 0) === 1) throw new BadRequestException(res.getStr("msg")); return taskKey; - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -131,7 +132,7 @@ export class CoreAppCloudServiceImplService { } return vo; - } catch (Exception e) { + } catch (e) { return null; } } @@ -164,9 +165,9 @@ export class CoreAppCloudServiceImplService { const fos: FileOutputStream = new FileOutputStream(file, true); fos.write(response.bodyBytes()); return "upload/download/cert/" + param.getKeyAlias() + ".zip"; - } catch (Exception e) { + } catch (e) { e.printStackTrace(); - throw new BadRequestException(e.getMessage()); + throw new BadRequestException(e.message); } } } 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 e1cea1e2..5eaa0dd1 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @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 9066f1dd..2b708b9b 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 d411edcc..01ede4c8 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 3436d257..c3355e84 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 d70a8a2f..93e6c40c 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 c02ee378..69d7c577 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class CoreDiyFormRecordsServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-account-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-account-service-impl.service.ts index 2417d201..f10d7352 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-account-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-account-service-impl.service.ts @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreMemberAccountServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts index 536506ec..2d289eae 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 ae461f61..22153240 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreMemberConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-level-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-level-service-impl.service.ts index 0922ae82..0950b474 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-level-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-level-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreMemberLevelServiceImplService { @@ -46,7 +45,7 @@ export class CoreMemberLevelServiceImplService { member.setMemberLevel(end.getLevelId()); memberMapper.updateById(member); } - } catch (Exception e) { + } catch (e) { log.info("会员检测升级异常"); e.printStackTrace(); } 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 d9afab36..52899bd5 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreMemberServiceImplService { @@ -102,7 +101,7 @@ export class CoreMemberServiceImplService { const content: any = method.invoke(obj, params); gifts.putByPath(key + ".content", content); } - } catch (Exception e) { + } catch (e) { e.printStackTrace(); } } @@ -129,7 +128,7 @@ export class CoreMemberServiceImplService { const content: any = method.invoke(obj, params); benefits.putByPath(key + ".content", content); } - } catch (Exception e) { + } catch (e) { e.printStackTrace(); } } @@ -155,7 +154,7 @@ export class CoreMemberServiceImplService { const content: any = method.invoke(obj, params); rules.putByPath(key + ".content", content); } - } catch (Exception e) { + } catch (e) { e.printStackTrace(); } } @@ -181,7 +180,7 @@ export class CoreMemberServiceImplService { const content: any = method.invoke(obj, params); rules.putByPath(key + ".content", content); } - } catch (Exception e) { + } catch (e) { e.printStackTrace(); } } @@ -207,7 +206,7 @@ export class CoreMemberServiceImplService { const content: any = method.invoke(obj, params); rules.putByPath(key + ".content", content); } - } catch (Exception e) { + } catch (e) { e.printStackTrace(); } } @@ -242,7 +241,7 @@ export class CoreMemberServiceImplService { const accountData: number = number.parseDouble(growth.toString()); coreMemberAccountService.addLog(siteId, memberId, AccountTypeEnum.GROWTH.getType(), accountData, String.valueOf(ObjectUtil.defaultIfNull(data.get("from_type"), "")), String.valueOf(ObjectUtil.defaultIfNull(data.get("memo"), "")), String.valueOf(ObjectUtil.defaultIfNull(data.get("related_id"), ""))); } - } catch (Exception e) { + } catch (e) { console.log("成长值发放异常"); e.printStackTrace(); } @@ -275,7 +274,7 @@ export class CoreMemberServiceImplService { const accountData: number = number.parseDouble(growth.toString()); coreMemberAccountService.addLog(siteId, memberId, AccountTypeEnum.POINT.getType(), accountData, String.valueOf(ObjectUtil.defaultIfNull(data.get("from_type"), "")), String.valueOf(ObjectUtil.defaultIfNull(data.get("memo"), "")), String.valueOf(ObjectUtil.defaultIfNull(data.get("related_id"), ""))); } - } catch (Exception e) { + } catch (e) { console.log("积分发放异常"); e.printStackTrace(); } @@ -301,7 +300,7 @@ export class CoreMemberServiceImplService { method.invoke(obj, params); } } - } catch (Exception e) { + } catch (e) { e.printStackTrace(); console.log("会员礼包发放失败"); } @@ -332,8 +331,8 @@ export class CoreMemberServiceImplService { try { label = memberLabelService.info(memberId); level = memberLevelService.info(memberId); - } catch (Exception e) { - log.error("获取会员标签或会员等级失败:{}", e.getMessage()); + } catch (e) { + log.error("获取会员标签或会员等级失败:{}", e.message); } finally { result.setLabelInfo(label); result.setLevelInfo(level); 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 8053b29d..0803dc67 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreNoticeServiceImplService { 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 5d2e1c5c..5bdef685 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 9f3b4e03..fe1dfced 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 6bdc8d39..43e15059 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 2ff273dd..b69dcca4 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CorePayServiceImplService { 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 46c29926..eec5cb44 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreRefundServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-scene-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-scene-service-impl.service.ts index 5640e1b6..dabe6370 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @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 4a170986..cdb06cf2 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @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 65273ddd..666abcbf 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class CorePosterServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -61,10 +61,10 @@ export class CorePosterServiceImplService { // 绘制海报 create(param.getSiteId(), poster, posterData.getData(), dir, posterName); return dir + posterName; - } catch (Exception e) { + } catch (e) { console.log("海报生成错误"); e.printStackTrace(); - if (param.getIsThrowException()) throw new BadRequestException(e.getMessage()); + if (param.getIsThrowException()) throw new BadRequestException(e.message); return ""; } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/schedule/impl/core-schedule-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/schedule/impl/core-schedule-service-impl.service.ts index 91a8a52a..77838833 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/schedule/impl/core-schedule-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/schedule/impl/core-schedule-service-impl.service.ts @@ -1,12 +1,13 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as fs from 'fs'; @Injectable() export class CoreScheduleServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -39,7 +40,7 @@ export class CoreScheduleServiceImplService { try { QuartzJobManager.stopJob(sysScheduleVo.getKey()); QuartzJobManager.startJob(sysScheduleVo); - } catch (Exception e) { + } catch (e) { } } super.saveBatch(list); @@ -67,11 +68,11 @@ export class CoreScheduleServiceImplService { const file: string = this.config.get('webRootDownAddon' + addon + "/java/src/main/resources/"+ addon +"/loader/schedule.json"); if (fs.existsSync(file)) { try { - const content: string = FileUtils.readFileToString(file); + const content: string = fs.readFileSync(file, 'utf-8'); if (ObjectUtil.isNotEmpty(content)) { schedule = JSONUtil.parseArray(content); } - } catch (Exception e) { + } catch (e) { } } } @@ -98,7 +99,7 @@ export class CoreScheduleServiceImplService { try { QuartzJobManager.stopJob(sysScheduleVo.getKey()); QuartzJobManager.startJob(sysScheduleVo); - } catch (Exception e) { + } catch (e) { } } super.saveBatch(list); @@ -124,8 +125,8 @@ export class CoreScheduleServiceImplService { addonList.forEach(addon => { installAddonSchedule(addon.getKey()); }); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-account-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-account-service-impl.service.ts index b75cabb1..24489fe3 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-account-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-account-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreSiteAccountServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-service-impl.service.ts index 1f45f8ad..c98bc68d 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 @@ -1,12 +1,12 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class CoreSiteServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -174,8 +174,8 @@ export class CoreSiteServiceImplService { // 清除缓存 cached.getAllKeys().stream().forEach(key => cached.remove(key)); return true; - } catch (Exception e) { - throw new BadRequestException("站点初始化失败: " + e.getMessage()); + } catch (e) { + throw new BadRequestException("站点初始化失败: " + e.message); } } } 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 6d8cdbd8..76a40111 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 @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreSmsServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-agreement-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-agreement-service-impl.service.ts index f8a9439f..fad313cc 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-agreement-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-agreement-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreAgreementServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-config-service-impl.service.ts index a111293a..34781528 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-config-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts index 038a2a87..6ecf9dd5 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 @@ -1,12 +1,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class CoreExportServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-menu-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-menu-service-impl.service.ts index 5f8ce13b..f2e3caf1 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-menu-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-menu-service-impl.service.ts @@ -1,12 +1,13 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as fs from 'fs'; @Injectable() export class CoreMenuServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} 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 c22831ef..c821209a 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CorePrinterServiceImplService { @@ -73,7 +72,7 @@ export class CorePrinterServiceImplService { if (error.isPresent()) { const result: SysPrinterPrintTicketResult = error.get(); vo.setCode(result.getCode()); - vo.setMessage(result.getMessage()); + vo.setMessage(result.message); return vo; } @@ -102,10 +101,10 @@ export class CorePrinterServiceImplService { sdk.printIndex(printer.getPrinterCode(), item.getContent(), String.valueOf(item.getOriginId())); } } - } catch (Exception e) { - log.error(e.getMessage()); + } catch (e) { + log.error(e.message); vo.setCode(-1); - vo.setMessage(e.getMessage()); + vo.setMessage(e.message); } return vo; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-scan-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-scan-service-impl.service.ts index 273ca7d8..669253a9 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-scan-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-scan-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreScanServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-sys-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-sys-config-service-impl.service.ts index 45e236ef..44e5f6c8 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 @@ -1,12 +1,12 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; @Injectable() export class CoreSysConfigServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-upload-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-upload-service-impl.service.ts index e57a1d2e..5964a44d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-upload-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-upload-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreUploadServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-base64-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-base64-service-impl.service.ts index 424e5da4..2ff03348 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-base64-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-base64-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreBase64ServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-fetch-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-fetch-service-impl.service.ts index 795d0323..b57e9546 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-fetch-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-fetch-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreFetchServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-storage-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-storage-service-impl.service.ts index 542e9a82..1608c299 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-storage-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-storage-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreStorageServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/user/impl/core-user-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/user/impl/core-user-service-impl.service.ts index 01aaaa6d..5cbf0c88 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/user/impl/core-user-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/user/impl/core-user-service-impl.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreUserServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-cloud-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-cloud-service-impl.service.ts index 84a5f0cc..05f0c014 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 @@ -1,12 +1,13 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result, ConfigService } from '@wwjBoot'; +import * as fs from 'fs'; @Injectable() export class CoreWeappCloudServiceImplService { constructor( + private readonly config: ConfigService, private readonly eventBus: EventBus, private readonly queueService: QueueService, ) {} @@ -29,9 +30,9 @@ export class CoreWeappCloudServiceImplService { } try { - FileUtils.copyFile(this.config.get('webRootDownResource' + param.getUploadPrivateKey()), packageDir + "private.key"); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + fs.copyFileSync(this.config.get('webRootDownResource' + param.getUploadPrivateKey()), packageDir + "private.key"); + } catch (e) { + throw new BadRequestException(e.message); } const zipFile: string = ZipUtil.zip(packageDir, tempDir + "build.zip"); @@ -79,7 +80,7 @@ export class CoreWeappCloudServiceImplService { try { const res: Record = JSONUtil.parseObj(response.body()); return res; - } catch (Exception e) { + } catch (e) { return null; } } @@ -98,7 +99,7 @@ export class CoreWeappCloudServiceImplService { if (JSONUtil.isJson(response.body()) && JSONUtil.parseObj(response.body()).getInt("code") === "0") return ""; if (checkImageType(response.bodyStream()) === "unknown") return ""; return "data:image/"+ checkImageType(response.bodyStream()) +";base64," + Base64.getEncoder().encodeToString(response.bodyBytes()); - } catch (Exception e) { + } catch (e) { return ""; } } 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 516302ad..5f81af56 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class CoreWeappConfigServiceImplService { 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 9cbdb5a7..d3e00b97 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreWeappDeliveryServiceImplService { @@ -23,7 +22,7 @@ export class CoreWeappDeliveryServiceImplService { console.log("小程序未开通发货信息管理服务" + res.getErrMsg()); } vo.setIsTradeManaged(res.getTradeManaged()); - } catch (Exception e) { + } catch (e) { } return vo; } @@ -46,10 +45,10 @@ export class CoreWeappDeliveryServiceImplService { const response: WxMaOrderShippingInfoBaseResponse = new WxMaOrderShippingInfoBaseResponse(); response.setErrCode(0); return response; - } catch (Exception e) { + } catch (e) { const response: WxMaOrderShippingInfoBaseResponse = new WxMaOrderShippingInfoBaseResponse(); response.setErrCode(1); - response.setErrMsg(e.getMessage()); + response.setErrMsg(e.message); return response; } } @@ -135,9 +134,9 @@ export class CoreWeappDeliveryServiceImplService { return response; - } catch (Exception e) { + } catch (e) { const errorMsg: string = String.format("uploadShippingInfo报错: %s, File: %s, line: %d", - e.getMessage(), e.getStackTrace()[0].getFileName(), e.getStackTrace()[0].getLineNumber()); + e.message, e.getStackTrace()[0].getFileName(), e.getStackTrace()[0].getLineNumber()); log.error(errorMsg, e); const errorResult: WxMaOrderShippingInfoBaseResponse = new WxMaOrderShippingInfoBaseResponse(); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts index 981d3e9a..9c64db0c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts @@ -1,8 +1,7 @@ -import { Injectable } from '@nestjs/common'; +import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreWeappServiceImplService { @@ -30,8 +29,8 @@ export class CoreWeappServiceImplService { null, false ); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } @@ -56,8 +55,8 @@ export class CoreWeappServiceImplService { null, false ); - } catch (Exception e) { - throw new BadRequestException(e.getMessage()); + } catch (e) { + throw new BadRequestException(e.message); } } } 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 9b2b8aaf..da9f7a28 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class CoreWechatConfigServiceImplService { 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 09fb5355..797d8a8b 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 @@ -1,8 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; @Injectable() export class CoreWechatReplyServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wxoplatform/impl/core-oplatform-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wxoplatform/impl/core-oplatform-service-impl.service.ts index 97bcf984..73969d4f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wxoplatform/impl/core-oplatform-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wxoplatform/impl/core-oplatform-service-impl.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class CoreOplatformServiceImplService { 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 3754c17c..92713f02 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 @@ -1,8 +1,8 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; -import { QueueService, EventBus } from '@wwjBoot'; -import { Result } from '@wwjBoot'; +import { QueueService, EventBus, Result } from '@wwjBoot'; +import * as path from 'path'; @Injectable() export class CoreOplatformStaticConfigServiceImplService { @@ -21,7 +21,7 @@ export class CoreOplatformStaticConfigServiceImplService { coreOplatformStaticConfigVo.setWechatAuthDomain(RequestUtils.getDomain(false)); try { coreOplatformStaticConfigVo.setUploadIp(InetAddress.getByName("java.oss.niucloud.com").getHostAddress()); - } catch (Exception e) { + } catch (e) { coreOplatformStaticConfigVo.setUploadIp(""); } return coreOplatformStaticConfigVo;