From 9626ae5ecd122797f32d1f965b4b84b552a9a7fc Mon Sep 17 00:00:00 2001 From: wanwu Date: Wed, 29 Oct 2025 13:56:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E5=90=8E=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=B8=85=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ postProcessCleanup 增强: - 修复 !xxx === 'yyy' → xxx !== 'yyy' (通用) - 修复 this.config.get('xxx' + yyy).exists() → fs.existsSync(...) 🎯 效果: - 解决更多逻辑运算符优先级问题 - 正确处理复杂表达式的exists()调用 --- .../converters/service-method-converter.js | 7 +++++++ .../addon/impl/addon-develop-build-service-impl.service.ts | 4 ++-- .../admin/generator/impl/generate-service-impl.service.ts | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) 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 a9dc5e50..9ffcb324 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 @@ -80,6 +80,13 @@ class ServiceMethodConverter { return `if (${configCall} !== ${value})`; }); + // 3. 修复 !xxx === "yyy" → xxx !== "yyy" (通用) + tsBody = tsBody.replace(/!\s*([a-zA-Z_$.()[\]]+)\s*===\s*([^;)\n]+)/g, '$1 !== $2'); + + // 4. 修复复杂表达式的 .exists() + // this.config.get('xxx' + yyy).exists() → fs.existsSync(this.config.get('xxx' + yyy)) + tsBody = tsBody.replace(/(this\.config\.get\([^)]+\))\.exists\(\)/g, 'fs.existsSync($1)'); + return tsBody; } 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 cb87a283..a28d37a7 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 @@ -16,7 +16,7 @@ export class AddonDevelopBuildServiceImplService { * build */ async build(...args: any[]): Promise { - if (!this.config.get('runActive') === "dev") throw new BadRequestException("只有在开发环境下才可以进行打包操作"); + if (this.config.get('runActive') !== "dev") throw new BadRequestException("只有在开发环境下才可以进行打包操作"); if (!this.config.get('projectNiucloudAddon' + addon).exists()) throw new BadRequestException("插件不存在"); const infoFile: string = this.config.get('projectNiucloudAddon' + addon + "/src/main/resources/info.json"); @@ -26,7 +26,7 @@ export class AddonDevelopBuildServiceImplService { this.addonPath = this.config.get('webRootDownAddon') + addon + "/"; try { - for (const child of this.fs.readdirSync(addonPath)) { + for (const child of fs.readdirSync(addonPath)) { if (fs.lstatSync(child).isDirectory() && !path.basename(child) === "sql") fs.rmSync(child, { recursive: true, force: true }); } fs.copyFileSync(infoFile, this.addonPath + "info.json"); 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 5838b2c1..cab91789 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 @@ -327,7 +327,7 @@ export class GenerateServiceImplService { const zipFile: string = ZipUtil.zip(packageDir, tempDir + "package.zip"); } else { // 同步 - if (!this.config.get('envType') === "dev") throw new BadRequestException("只有在开发模式下才能进行同步代码"); + if (this.config.get('envType') !== "dev") throw new BadRequestException("只有在开发模式下才能进行同步代码"); for (const coreGenerateTemplateVo of list) { if (coreGenerateTemplateVo.getType() === "sql") {