Merge branch 'feat/1.1.1/ai' into test

apache · Jul 24, 2023 · 7bb7f84 · 7bb7f84
2 parents 64c9721 + 2cbb9d0
commit 7bb7f84
Show file tree

Hide file tree

Showing 28 changed files with 865 additions and 223 deletions.
diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
diff --git a/docs/docs.go b/docs/docs.go
diff --git a/docs/swagger.json b/docs/swagger.json
@@ -7153,7 +7153,7 @@
                     }
                 },
                 "selected_level": {
-                    "type": "integer"
+                    "$ref": "#/definitions/schema.PrivilegeLevel"
                 }
             }
         },
@@ -7652,11 +7652,24 @@
                 }
             }
         },
+        "schema.PrivilegeLevel": {
+            "type": "integer",
+            "enum": [
+                1,
+                2,
+                3
+            ],
+            "x-enum-varnames": [
+                "PrivilegeLevel1",
+                "PrivilegeLevel2",
+                "PrivilegeLevel3"
+            ]
+        },
         "schema.PrivilegeOption": {
             "type": "object",
             "properties": {
                 "level": {
-                    "type": "integer"
+                    "$ref": "#/definitions/schema.PrivilegeLevel"
                 },
                 "level_desc": {
                     "type": "string"
@@ -7742,11 +7755,11 @@
         "schema.QuestionPageReq": {
             "type": "object",
             "properties": {
-                "inDays": {
+                "in_days": {
                     "type": "integer",
                     "minimum": 1
                 },
-                "orderCond": {
+                "order": {
                     "type": "string",
                     "enum": [
                         "newest",
@@ -7760,7 +7773,7 @@
                     "type": "integer",
                     "minimum": 1
                 },
-                "pageSize": {
+                "page_size": {
                     "type": "integer",
                     "minimum": 1
                 },
@@ -8071,7 +8084,11 @@
                 },
                 "user_info": {
                     "description": "user info",
-                    "$ref": "#/definitions/schema.UserBasicInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/schema.UserBasicInfo"
+                        }
+                    ]
                 },
                 "vote_count": {
                     "type": "integer"
@@ -8083,7 +8100,11 @@
             "properties": {
                 "object": {
                     "description": "this object",
-                    "$ref": "#/definitions/schema.SearchObject"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/schema.SearchObject"
+                        }
+                    ]
                 },
                 "object_type": {
                     "description": "object_type",
@@ -8725,7 +8746,11 @@
             "properties": {
                 "avatar": {
                     "description": "avatar",
-                    "$ref": "#/definitions/schema.AvatarInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/schema.AvatarInfo"
+                        }
+                    ]
                 },
                 "bio": {
                     "description": "bio",
@@ -8792,9 +8817,13 @@
             ],
             "properties": {
                 "level": {
-                    "type": "integer",
                     "maximum": 3,
-                    "minimum": 1
+                    "minimum": 1,
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/schema.PrivilegeLevel"
+                        }
+                    ]
                 }
             }
         },

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -730,7 +730,7 @@ definitions:
           $ref: '#/definitions/schema.PrivilegeOption'
         type: array
       selected_level:
-        type: integer
+        $ref: '#/definitions/schema.PrivilegeLevel'
     type: object
   schema.GetRankPersonalPageResp:
     properties:
@@ -1081,10 +1081,20 @@ definitions:
       content:
         type: string
     type: object
+  schema.PrivilegeLevel:
+    enum:
+    - 1
+    - 2
+    - 3
+    type: integer
+    x-enum-varnames:
+    - PrivilegeLevel1
+    - PrivilegeLevel2
+    - PrivilegeLevel3
   schema.PrivilegeOption:
     properties:
       level:
-        type: integer
+        $ref: '#/definitions/schema.PrivilegeLevel'
       level_desc:
         type: string
       privileges:
@@ -1147,10 +1157,10 @@ definitions:
     type: object
   schema.QuestionPageReq:
     properties:
-      inDays:
+      in_days:
         minimum: 1
         type: integer
-      orderCond:
+      order:
         enum:
         - newest
         - active
@@ -1161,7 +1171,7 @@ definitions:
       page:
         minimum: 1
         type: integer
-      pageSize:
+      page_size:
         minimum: 1
         type: integer
       tag:
@@ -1374,15 +1384,17 @@ definitions:
       title:
         type: string
       user_info:
-        $ref: '#/definitions/schema.UserBasicInfo'
+        allOf:
+        - $ref: '#/definitions/schema.UserBasicInfo'
         description: user info
       vote_count:
         type: integer
     type: object
   schema.SearchResp:
     properties:
       object:
-        $ref: '#/definitions/schema.SearchObject'
+        allOf:
+        - $ref: '#/definitions/schema.SearchObject'
         description: this object
       object_type:
         description: object_type
@@ -1824,7 +1836,8 @@ definitions:
   schema.UpdateInfoRequest:
     properties:
       avatar:
-        $ref: '#/definitions/schema.AvatarInfo'
+        allOf:
+        - $ref: '#/definitions/schema.AvatarInfo'
         description: avatar
       bio:
         description: bio
@@ -1871,9 +1884,10 @@ definitions:
   schema.UpdatePrivilegesConfigReq:
     properties:
       level:
+        allOf:
+        - $ref: '#/definitions/schema.PrivilegeLevel'
         maximum: 3
         minimum: 1
-        type: integer
     required:
     - level
     type: object