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

doc/api.md

@@ -48,7 +48,7 @@
 }
 ```
 
-### 1. 获取关卡题目列表
+### 2. 上报题目答案
 
 1. Method: POST
 2. URI: /api/:accountid/puzzle/answer
@@ -65,6 +65,7 @@
 | id | 题目id  		|
 | level | 关卡id		|
 | answer | 回答的选项 |
+| type | 回答类型, 0: 正常, 1: 超时 |
 
 3. Response: JSON
 
@@ -74,4 +75,3 @@
 }
 ```
 
-

src/api/controllers/puzzle.controller.ts

@@ -33,8 +33,8 @@ class PuzzleController extends BaseController {
   @role('anon')
   @router('post /api/:accountid/puzzle/answer')
   async report(req, res) {
-    let { id, answer } = req.params
-    if (!id || !answer) {
+    let { id, answer, type } = req.params
+    if (!id) {
       throw new ZError(11, 'param mismatch')
     }
     let record = await Puzzle.findById(id)
@@ -42,7 +42,9 @@ class PuzzleController extends BaseController {
       throw new ZError(12, 'question not found')
     }
     let result = record.a1 == answer ? 1 : 0
-
+    if (type == 1) {
+      result = 0
+    }
     return {result}
   }
 }

src/models/match/PuzzleSession.ts

@@ -0,0 +1,11 @@
+import { dbconn } from '../../decorators/dbconn'
+import { getModelForClass, modelOptions } from '@typegoose/typegoose'
+import { BaseModule } from '../Base'
+
+@dbconn('second')
+@modelOptions({ schemaOptions: { collection: 'question_category' } })
+class PuzzleSessionClass extends BaseModule {
+
+}
+
+export const PuzzleSession = getModelForClass(PuzzleSessionClass, { existingConnection: PuzzleSessionClass.db })