From a651254821b772252cb5e754ca63ed84ea5eae62 Mon Sep 17 00:00:00 2001 From: liangtongchuan Date: Fri, 5 May 2023 20:47:19 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(web-server):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=A1=E6=A0=B8=E6=9C=8D=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=B8=BA=EF=BC=9A=E6=8C=87=E5=AE=9A=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=AE=A1=E6=A0=B8=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web-server/app/controller/update.ts | 6 ++++-- web-server/app/service/Update.ts | 15 +++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/web-server/app/controller/update.ts b/web-server/app/controller/update.ts index 58bcc5335..d64e5de8f 100644 --- a/web-server/app/controller/update.ts +++ b/web-server/app/controller/update.ts @@ -6,8 +6,10 @@ import { checkWhiteList } from 'app/pubUtils/sysUtil'; export default class UpdateController extends Controller { public async getversion() { const { ctx } = this; - const { version } = ctx.request.body; - ctx.body = await ctx.service.update.getVersion(version); + // const { version } = ctx.request.body; + // ctx.body = await ctx.service.update.getVersion(version); + // ! 接口已废弃 + ctx.body = ctx.service.utils.resResult(STATUS.REQUEST_FAIL); } public async getUpdateUrl() { diff --git a/web-server/app/service/Update.ts b/web-server/app/service/Update.ts index 76265253d..680d1f6ae 100644 --- a/web-server/app/service/Update.ts +++ b/web-server/app/service/Update.ts @@ -37,11 +37,18 @@ export default class Update extends Service { } public async checkReview(curRegion: RegionType, version: string) { - const ctx = this.ctx; + try { + const ctx = this.ctx; - if(!curRegion || !curRegion.reviewVersion || !version) return false; - let reviewVersionFlag = ctx.service.utils.compareVersion(version, curRegion.reviewVersion); - return `${ctx.clientIp}`.startsWith('17.') || reviewVersionFlag > 0; + if(!curRegion || !curRegion.reviewVersion || !version) return false; + const versionsInReview = curRegion.reviewVersion.split(','); + if (!versionsInReview || versionsInReview.length <= 0) return false; + let reviewVersionFlag = versionsInReview.includes(version) ? true : false; + return `${ctx.clientIp}`.startsWith('17.') || reviewVersionFlag; + } catch(e) { + console.log('checkReview error: ', e); + return false; + } } }