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

ascle.yaml

@@ -47,6 +47,8 @@ paths:
     post:
       summary: 修改用户信息
       description: 修改用户信息
+      consumes:
+        - application/x-www-form-urlencoded
       parameters:
         - name: good_at
           in: formData
@@ -94,6 +96,8 @@ paths:
     post:
       summary: 登录
       description: 登录
+      consumes:
+        - application/x-www-form-urlencoded
       parameters:
         - name: name
           in: formData
@@ -157,6 +161,8 @@ paths:
     post:
       summary: 登录出去
       description: 登录出去
+      consumes:
+        - application/x-www-form-urlencoded
       tags:
         - Account
       responses:
@@ -172,13 +178,27 @@ paths:
   /account/code:
     post:
       summary: 发送手机验证码
-      description: 发送手机验证码
+      description: 未登录情况下，发送手机验证码
+      consumes:
+        - application/x-www-form-urlencoded
       tags:
         - Account
       parameters:
         - name: type
           in: formData
-          description: 是那种类型要求发送的(1, LOGIN, u登陆) (3, UPDATE,修改属性) (4, REGISTER,提交注册)
+          description: 要求发送的类型(1,登陆)  (4,提交注册)
+          required: true
+          type: integer
+          format: integer
+        - name: phone
+          in: formData
+          description: 手机号
+          required: true
+          type: integer
+          format: integer
+        - name: image_code
+          in: formData
+          description: 验证码
           required: true
           type: integer
           format: integer
@@ -191,11 +211,30 @@ paths:
               error: 0
               message: ''
               data: null
+  /account/code/online:
+    post:
+      summary: 登陆之后,发送手机验证码
+      description: 登陆之后，发送手机验证码(只在更改密码的时候需要,不需要任何参数)
+      consumes:
+        - application/x-www-form-urlencoded
+      tags:
+        - Account
+      responses:
+        '200':
+          description: OK
+          schema: {}
+          examples:
+            application/json:
+              error: 0
+              message: ''
+              data: null
 # ------------------------
   /account/password:
     post:
       summary: 更改密码
       description: 更改密码
+      consumes:
+        - application/x-www-form-urlencoded
       tags:
         - Account
       parameters:
@@ -246,6 +285,9 @@ paths:
     post:
       summary: 接受协议
       description: 医生点击同意协议
+      consumes:
+        - application/x-www-form-urlencoded
+
       tags:
         - Agreement
       responses:
@@ -511,6 +553,9 @@ paths:
     post:
       summary: 订单验证
       description: 订单验证
+      consumes:
+        - application/x-www-form-urlencoded
+
       parameters:
         - name: order_id
           in: formData
@@ -675,6 +720,9 @@ paths:
     post:
       summary: 同意退款
       description: 同意退款
+      consumes:
+        - application/x-www-form-urlencoded
+
       tags:
         - Refund
       responses:
@@ -872,6 +920,12 @@ paths:
           required: false
           type: integer
           format: integer
+        - name: query
+          in: query
+          description: 过滤关键词？
+          required: false
+          type: str
+          format: str
       tags:
         - Topic
       responses:
@@ -882,6 +936,8 @@ paths:
             application/json:
               data:
                 total: 1235
+                size: 10
+                page: 1
                 topics:
                   - title: '颜医生，请问玻尿酸丰下巴怎样收费'
                     doctor_num: 4
@@ -912,6 +968,8 @@ paths:
           examples:
             application/json:
               data:
+                page: 1
+                size: 10
                 total: 1235
                 topics:
                   - title: '颜医生，请问玻尿酸丰下巴怎样收费'
@@ -1038,6 +1096,8 @@ paths:
     post:
       summary: 回复
       description: 回复话题，回复话题的回复
+      consumes:
+        - application/x-www-form-urlencoded
       parameters:
         - name: topic_id
           in: path
@@ -1067,6 +1127,9 @@ paths:
     post:
       summary: 话题下沉
       description: 更改话题分值，话题往后排
+      consumes:
+        - application/x-www-form-urlencoded
+
       parameters:
         - name: topic_id
           in: path
@@ -1102,17 +1165,21 @@ paths:
               message: ''
               error: 0
               data:
-                - jump_value: "111549_602329"
-                  is_new: false
-                  user_key: "111549_602329"
-                  doctor_id: ""
-                  id: 1270639
-                  jump_type: "6"
-                  nickname: "发疯了的猫"
-                  portrait: "http://pic.gengmei.cc/2015/09/08/1226facfe0"
-                  hospital_id: ""
-                  last_reply_time: 145554334
-                  text: "呵呵大"
+                size: 10
+                page: 1
+                total: 6
+                conversations:
+                  - jump_value: "111549_602329"
+                    is_new: false
+                    user_key: "111549_602329"
+                    doctor_id: ""
+                    id: 1270639
+                    jump_type: "6"
+                    nickname: "发疯了的猫"
+                    portrait: "http://pic.gengmei.cc/2015/09/08/1226facfe0"
+                    hospital_id: ""
+                    last_reply_time: 145554334
+                    text: "呵呵大"
 
   /conversation/{user_key}:
     get:
@@ -1167,6 +1234,8 @@ paths:
     post:
       summary: 回复私信
       description: 回复私信
+      consumes:
+        - application/x-www-form-urlencoded
       parameters:
         - name: type
           in: formData
@@ -1227,6 +1296,8 @@ paths:
     post:
       summary: 确认/取消预约
       description: 确认/取消预约
+      consumes:
+        - application/x-www-form-urlencoded
       parameters:
         - name: id
           in: path
@@ -1274,6 +1345,8 @@ paths:
     post:
       summary: 添加地址
       description: 添加地址
+      consumes:
+        - application/x-www-form-urlencoded
       parameters:
         - name: lng
           in: formData
@@ -1353,6 +1426,8 @@ paths:
     post:
       summary: 设置预约时间
       description: 设置预约时间
+      consumes:
+        - application/x-www-form-urlencoded
       parameters:
         - name: data
           in: formData