Merge branch 'master' of git.gengmei.cc:zhangyunyu/swagger

ascle.yaml

@@ -82,7 +82,7 @@ paths:
         - Account
       responses:
         '200':
-          responses: ok
+          description: ok
           schema: {}
           examples:
             application/json:
@@ -897,10 +897,17 @@ paths:
                   - name: 眼睛
                     id: 123
 
-  /topic/<topic_id>:
+  /topic/{topic_id}:
     get:
       summary: 帖子详情
       description: 帖子详情
+      parameters:
+        - name: topic_id
+          in: path
+          description: 帖子ID
+          required: true
+          type: integer
+          format: integer
       tags:
         - Topic
       responses:
@@ -928,11 +935,17 @@ paths:
                     image: "http://pic.gengmei.cc/2015/05/25/35fe857608-w"
 
 
-  /topic/<topic_id>/reply:
+  /topic/{topic_id}/reply:
     get:
       summary: 帖子回复
       description: 帖子回复
       parameters:
+        - name: topic_id
+          in: path
+          description: 帖子ID
+          required: false
+          type: integer
+          format: integer
         - name: page
           in: query
           description: 请求第几页的数据，默认为1
@@ -971,11 +984,23 @@ paths:
                     comment_user_type: 2
                 reply_date: 128833445
 
-  /topic/<topic_id>/reply/<reply_id>:
+  /topic/{topic_id}/reply/{reply_id}:
     post:
       summary: 回复
       description: 回复话题，回复话题的回复
       parameters:
+        - name: topic_id
+          in: path
+          description: 话题ID
+          required: true
+          type: integer
+          format: integer
+        - name: reply_id
+          in: path
+          description: 回复ID
+          required: true
+          type: integer 
+          format: integer 
         - name: content
           in: query
           description: 回复的内容
@@ -988,13 +1013,13 @@ paths:
         '200':
           description: OK
 
-  /topic/<topic_id>/sink:
+  /topic/{topic_id}/sink:
     post:
       summary: 话题下沉
       description: 更改话题分值，话题往后排
       parameters:
         - name: topic_id
-          in: query
+          in: path
           description: 话题ID
           required: true
           type: integer 
@@ -1039,10 +1064,17 @@ paths:
                   last_reply_time: 145554334
                   text: "呵呵大"
 
-  /conversation/<target_user_id>:
+  /conversation/{target_user_id}:
     get:
       summary: 私信详情 
       description: 私信详情
+      parameters:
+        - name: target_user_id
+          in: path
+          description: 私信用户ID
+          required: true
+          type: integer
+          format: integer
       tags:
         - Conversation
       responses: