diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/scanners/java-scanner.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/scanners/java-scanner.js index 04c83b42..bbb4e08f 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/scanners/java-scanner.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/scanners/java-scanner.js @@ -353,10 +353,23 @@ class JavaScanner { // 3. 从import语句提取DTO/VO/Param const importRegex = /import\s+[\w.]+\.(\w+(?:Dto|Vo|Param|Request|Response));/g; while ((match = importRegex.exec(content)) !== null) { - dtos.add(match[1]); + let typeName = match[1]; + // ✅ 也需要清理(虽然import一般不带泛型) + typeName = this.cleanGenericType(typeName); + if (!this.shouldSkipType(typeName)) { + dtos.add(typeName); + } } - return Array.from(dtos); + // ✅ 返回前再次过滤,双重保险 + return Array.from(dtos).filter(dto => { + // 最后检查:确保没有泛型符号、没有数组符号 + if (dto.includes('<') || dto.includes('[')) { + console.warn(`⚠️ Scanner发现未清理的类型: ${dto}`); + return false; + } + return !this.shouldSkipType(dto); + }); } /** diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-develop.controller.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-develop.controller.ts index 0d35517e..dcb01f9e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-develop.controller.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/controllers/adminapi/addon/addon-develop.controller.ts @@ -5,9 +5,7 @@ import { AddonDevelopBuildServiceImplService } from '../../../services/admin/add import { AddonDevelopServiceImplService } from '../../../services/admin/addon/impl/addon-develop-service-impl.service'; import { NiuCloudServiceImplService } from '../../../services/admin/niucloud/impl/niu-cloud-service-impl.service'; import { AddonDevelopAddParam } from '../../../dtos/admin/addon/param/addon-develop-add-param.dto'; -import { List