diff --git a/web-server/app/service/Sdk.ts b/web-server/app/service/Sdk.ts index d56b7e50e..c4826b7f7 100644 --- a/web-server/app/service/Sdk.ts +++ b/web-server/app/service/Sdk.ts @@ -14,6 +14,7 @@ import { UserGuildModel } from '@db/UserGuild'; import { GuildModel } from '@db/Guild'; import { ServerlistModel } from '@db/Serverlist'; import moment = require('moment'); +import { RegionModel } from '@db/Region'; /** * Test Service @@ -341,6 +342,7 @@ export default class Sdk extends Service { } let servers = await ServerlistModel.getAllServerList(); + let regions = await RegionModel.getAllRegion(); let data = servers.map(server => { let statue = 0; switch(server.status) { @@ -352,10 +354,11 @@ export default class Sdk extends Service { case SERVER_STATUS.HOT: statue = 2; break; } + let region = regions.find(cur => cur.env == server.env); return { dsid: server.id, - dsname: server.name, - start_time: moment(server.openTime).format('YYYY-MM-DD HH:mm:ss'), + dsname: region? `${region.name} ${server.name}`: server.name, + start_time: moment(server.openTime * 1000).format('YYYY-MM-DD HH:mm:ss'), statue } })