Tony/node-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG

Browse Source
This commit is contained in:
Tony 2024-09-04 15:21:31 +08:00
parent 7c117d0440
commit 0c65c8f0d4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tdtmap/tdtmap.controller.ts
View File

@ -70,6 +70,7 @@ export class TdtmapController {
// minio 中存在，从 minio 取出 // minio 中存在，从 minio 取出
const dbItem:Buffer = await this.tdtmapService.getTileFromLocal(tileFormattedName) // 从 minio 取出来 const dbItem:Buffer = await this.tdtmapService.getTileFromLocal(tileFormattedName) // 从 minio 取出来
cacheMap.set(tileFormattedName, dbItem) cacheMap.set(tileFormattedName, dbItem)
Buffer.from(dbItem as any, 'utf-8')
return new StreamableFile(dbItem); return new StreamableFile(dbItem);
} else { } else {
// 如果本地数据库都不存在 // 如果本地数据库都不存在
@ -85,7 +86,6 @@ export class TdtmapController {
cacheMap.set(tileFormattedName, res.data) cacheMap.set(tileFormattedName, res.data)
const saveSuccess = await this.tdtmapService.setTileToLocal(tileFormattedName, res.data); const saveSuccess = await this.tdtmapService.setTileToLocal(tileFormattedName, res.data);
if (saveSuccess) bloomFilter.add(tileFormattedName); if (saveSuccess) bloomFilter.add(tileFormattedName);
Buffer.from(res.data, 'utf-8') Buffer.from(res.data, 'utf-8')
return new StreamableFile(res.data); // 请求成功 return new StreamableFile(res.data); // 请求成功
} else { } else {

8
src/tdtmap/tdtmap.service.ts
View File

@ -30,10 +30,12 @@ export class TdtmapService {
async getTileFromLocal(tile_name:string):Promise<Buffer> { async getTileFromLocal(tile_name:string):Promise<Buffer> {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
const stream = await this.minioClient.getObject("nestfiles", tile_name) const stream = await this.minioClient.getObject("nestfiles", tile_name)
let res:any = null const res:any[] = []
stream.on("data", (data) => { res = data }) stream.on("data", (data:Buffer) => {
if (Buffer.isBuffer(data)) res.push(data)
})
stream.on("end", () => { stream.on("end", () => {
if (res) resolve(res) if (res.length > 0) resolve(Buffer.concat(res))
else reject() else reject()
}) })
stream.on("error", () => { reject() }) stream.on("error", () => { reject() })