From b8c1b8f63cdf928efb91dd836f02a4608f246036 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Tue, 1 Nov 2022 10:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(37=E5=9B=9E=E8=B0=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3):=20=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=A4=A7=E5=8C=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web-server/app/service/Sdk.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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
             }
         })