diff --git a/src/ai/Prompt.ts b/src/ai/Prompt.ts index 5303fbc..ec88411 100644 --- a/src/ai/Prompt.ts +++ b/src/ai/Prompt.ts @@ -1 +1 @@ -export const PromptString: string = `先给我说你统计了多少个项目。我只对辽宁、山东、江苏、浙江、福建、广东、广西、河北这些地方的海上风电、海上光伏、漂浮式光伏、滩涂光伏、滩涂风电、渔光互补项目感兴趣。从我提供的这些工程里面找到我感兴趣的工程,无论如何至少推荐10个工程。如果没有推荐的,也要给出思考过程。`; +export const PromptString: string = `先给我说你统计了多少个项目。我只对辽宁、山东、江苏、浙江、福建、广东、广西、海南、河北这些地方的海上风电、海上光伏、漂浮式光伏、滩涂光伏、滩涂风电、渔光互补项目感兴趣。从我提供的这些工程里面找到我感兴趣的工程,无论如何至少推荐10个工程。如果没有推荐的,也要给出思考过程。`; diff --git a/src/bids/bids.module.ts b/src/bids/bids.module.ts index a1586a5..bbbf1a5 100644 --- a/src/bids/bids.module.ts +++ b/src/bids/bids.module.ts @@ -3,9 +3,10 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { BidItem } from './entities/bid-item.entity'; import { BidsService } from './services/bid.service'; import { BidsController } from './controllers/bid.controller'; +import { CrawlInfoAdd } from '../crawler/entities/crawl-info-add.entity'; @Module({ - imports: [TypeOrmModule.forFeature([BidItem])], + imports: [TypeOrmModule.forFeature([BidItem, CrawlInfoAdd])], providers: [BidsService], controllers: [BidsController], exports: [BidsService], diff --git a/src/bids/services/bid.service.ts b/src/bids/services/bid.service.ts index 0967098..acb356e 100644 --- a/src/bids/services/bid.service.ts +++ b/src/bids/services/bid.service.ts @@ -2,12 +2,15 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository, LessThan, MoreThanOrEqual } from 'typeorm'; import { BidItem } from '../entities/bid-item.entity'; +import { CrawlInfoAdd } from '../../crawler/entities/crawl-info-add.entity'; @Injectable() export class BidsService { constructor( @InjectRepository(BidItem) private bidRepository: Repository, + @InjectRepository(CrawlInfoAdd) + private crawlInfoRepository: Repository, ) {} async findAll(query?: any) { @@ -117,11 +120,7 @@ export class BidsService { } async getCrawlInfoAddStats() { - const { InjectRepository } = require('@nestjs/typeorm'); - const { Repository } = require('typeorm'); - const { CrawlInfoAdd } = require('../../crawler/entities/crawl-info-add.entity'); - - // 获取每个来源的最新一次爬虫记录 + // 获取每个来源的最新一次爬虫记录(按 createdAt 降序) const query = ` SELECT source, @@ -130,15 +129,15 @@ export class BidsService { error, createdAt as latestUpdate FROM crawl_info_add - WHERE id IN ( - SELECT MAX(id) + WHERE (source, createdAt) IN ( + SELECT source, MAX(createdAt) FROM crawl_info_add GROUP BY source ) ORDER BY source ASC `; - const results = await this.bidRepository.query(query); + const results = await this.crawlInfoRepository.query(query); return results.map((item: any) => ({ source: item.source, diff --git a/src/main.ts b/src/main.ts index 7730424..c5a45be 100644 --- a/src/main.ts +++ b/src/main.ts @@ -3,12 +3,22 @@ import { AppModule } from './app.module'; import { CustomLogger } from './common/logger/logger.service'; async function bootstrap() { - const app = await NestFactory.create(AppModule); + const app = await NestFactory.create(AppModule, { + bodyParser: true, + }); // 使用自定义日志服务 const logger = await app.resolve(CustomLogger); app.useLogger(logger); + // 增加请求体大小限制(默认 100kb,增加到 50mb) + const express = require('express'); + app.use(express.json({ limit: '50mb' })); + app.use(express.urlencoded({ limit: '50mb', extended: true })); + + // 启用 CORS + app.enableCors(); + await app.listen(process.env.PORT ?? 3000); } bootstrap(); diff --git a/src/scripts/deploy.ps1 b/src/scripts/deploy.ps1 index be03bc5..91a0ecf 100644 --- a/src/scripts/deploy.ps1 +++ b/src/scripts/deploy.ps1 @@ -6,7 +6,7 @@ $remotePort = "1122" $remoteUser = "cubie" $keyPath = "d:\163" $serverDest = "/home/cubie/down/document/bidding/publish/server" -$frontendDest = "/home/cubie/down/document/bidding/publish/" +$frontendDest = "/home/cubie/down/document/bidding/publish/frontend" $srcDest = "/home/cubie/down/document/bidding/" # Check if key file exists @@ -50,7 +50,7 @@ Write-Host "dist directory uploaded successfully" -ForegroundColor Green # Upload entire frontend directory to publish directory Write-Host "`nUploading frontend directory to ${frontendDest}..." -ForegroundColor Yellow -scp -i $keyPath -P $remotePort -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r frontend "${remoteUser}@${remoteHost}:${frontendDest}" +scp -i $keyPath -P $remotePort -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r frontend/dist "${remoteUser}@${remoteHost}:${frontendDest}" if ($LASTEXITCODE -ne 0) { Write-Error "Failed to upload frontend directory"