Merge branch 'master' of http://git.kingsome.cn/node/card_info_svr

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, '操作太快了')
     }
-    if (cfg.id == 9003 && record.count == 0) {
-      cfg = cfg.get(9004)
-    }
     record.count += 1
     rest = cfg.frequency - record.count
+    if (cfg.id == 90003 && record.count == 1) {
+      cfg = cfgMap.get(90004)
+    }
     rest = rest <= 0 ? 0 : rest
     record.lasttime = Date.now()
     await record.save()

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

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`
 
 /**
  * 领取邮件附件