From 02077be18d765473fa6f2c8eb228a71dbb63cfea Mon Sep 17 00:00:00 2001 From: zhl Date: Thu, 4 Feb 2021 20:27:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B9=BF=E5=91=8Aid?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ActivityController.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/ActivityController.ts b/src/controllers/ActivityController.ts index 617a7a6..97906ca 100644 --- a/src/controllers/ActivityController.ts +++ b/src/controllers/ActivityController.ts @@ -41,8 +41,8 @@ export default class ActivityController extends BaseController { if (cfg.interval && (Date.now() - record.lasttime) < cfg.interval) { throw new ZError(14, '操作太快了') } - if (cfg.id == 9003 && record.count == 0) { - cfg = cfg.get(9004) + if (cfg.id == 90003 && record.count == 0) { + cfg = cfg.get(90004) } record.count += 1 rest = cfg.frequency - record.count From 8f62ae4124ba00499b7b21abecf93525e2d21767 Mon Sep 17 00:00:00 2001 From: zhl Date: Thu, 4 Feb 2021 20:29:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ActivityController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/ActivityController.ts b/src/controllers/ActivityController.ts index 97906ca..6a9bb5c 100644 --- a/src/controllers/ActivityController.ts +++ b/src/controllers/ActivityController.ts @@ -42,7 +42,7 @@ export default class ActivityController extends BaseController { throw new ZError(14, '操作太快了') } if (cfg.id == 90003 && record.count == 0) { - cfg = cfg.get(90004) + cfg = cfgMap.get(90004) } record.count += 1 rest = cfg.frequency - record.count From 14af09316bc3e18cb413447d05ebb911ed9f145b Mon Sep 17 00:00:00 2001 From: zhl Date: Thu, 4 Feb 2021 20:32:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1rest=E6=95=B0=E5=80=BC=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=94=99=E8=AF=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ActivityController.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/ActivityController.ts b/src/controllers/ActivityController.ts index 6a9bb5c..2e2b4ee 100644 --- a/src/controllers/ActivityController.ts +++ b/src/controllers/ActivityController.ts @@ -41,11 +41,11 @@ export default class ActivityController extends BaseController { if (cfg.interval && (Date.now() - record.lasttime) < cfg.interval) { throw new ZError(14, '操作太快了') } + rest = cfg.frequency - record.count + record.count += 1 if (cfg.id == 90003 && record.count == 0) { cfg = cfgMap.get(90004) } - record.count += 1 - rest = cfg.frequency - record.count rest = rest <= 0 ? 0 : rest record.lasttime = Date.now() await record.save() From fdcc0380f45d499ca0713f05f060707b792c0caf Mon Sep 17 00:00:00 2001 From: zhl Date: Thu, 4 Feb 2021 20:37:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E5=B9=BF=E5=91=8A=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ActivityController.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/ActivityController.ts b/src/controllers/ActivityController.ts index 2e2b4ee..b4bf738 100644 --- a/src/controllers/ActivityController.ts +++ b/src/controllers/ActivityController.ts @@ -41,9 +41,9 @@ export default class ActivityController extends BaseController { if (cfg.interval && (Date.now() - record.lasttime) < cfg.interval) { throw new ZError(14, '操作太快了') } - rest = cfg.frequency - record.count record.count += 1 - if (cfg.id == 90003 && record.count == 0) { + rest = cfg.frequency - record.count + if (cfg.id == 90003 && record.count == 1) { cfg = cfgMap.get(90004) } rest = rest <= 0 ? 0 : rest From f46889619cf1b57894e33e5e7529b3bec4bbbb64 Mon Sep 17 00:00:00 2001 From: zhl Date: Fri, 5 Feb 2021 12:10:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E7=9A=84?= =?UTF-8?q?=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/apiauth.ts | 8 +++++++- src/service/mail.ts | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/plugins/apiauth.ts b/src/plugins/apiauth.ts index b70aea9..3a75e84 100644 --- a/src/plugins/apiauth.ts +++ b/src/plugins/apiauth.ts @@ -8,6 +8,9 @@ import fastifyPlugin from 'fastify-plugin' import { User } from '../models/User' import { ZError } from '../common/ZError' +const isProd = process.env.NODE_ENV === 'production' +const SERVER_TOKEN = 'ibDbuTmpQn3f48uJr2mBMkGrqvIhSbIg' + declare module 'fastify' { interface FastifyInstance { apiAuth: (request: FastifyRequest, reply: FastifyReply) => {}; @@ -29,7 +32,10 @@ const apiAuthPlugin: FastifyPluginAsync = async function ( fastify.decorate('apiAuth', async function (request: FastifyRequest, reply: FastifyReply) { if (request.url.startsWith('/svr')) { // @ts-ignore - let { accountid } = request.params + let { accountid, token } = request.params + if (isProd && (!token || token != SERVER_TOKEN)) { + throw new ZError(403, 'no auth') + } if (accountid) { request.user = await User.findById(accountid) } diff --git a/src/service/mail.ts b/src/service/mail.ts index 47ae0b9..3646215 100644 --- a/src/service/mail.ts +++ b/src/service/mail.ts @@ -1,7 +1,8 @@ import axios from 'axios' import { generateKeyValStr } from '../utils/string.util' -const MAIL_ATTACHMENT_URL = 'https://gamemail.kingsome.cn/webapp/index.php?c=Mail&a=getAttachment' +const isProd = process.env.NODE_ENV === 'production' +const MAIL_ATTACHMENT_URL = `https://gamemail${isProd ? '' : '-test'}.kingsome.cn/webapp/index.php?c=Mail&a=getAttachment` /** * 领取邮件附件