Skip to content

Commit

Permalink
Merge branch 'dev' into test
Browse files Browse the repository at this point in the history 
# Conflicts:
#	ui/src/pages/Users/Personal/components/Overview/index.tsx
  • Loading branch information
@LinkinStars
LinkinStars committed Oct 16, 2024
2 parents 88b52d8 + 2372950 commit 6da9d71
Show file tree
Hide file tree
Showing 86 changed files with 1,804 additions and 181 deletions.
4 changes: 3 additions & 1 deletion cmd/wire_gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

87 changes: 86 additions & 1 deletion docs/docs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4462,6 +4462,90 @@ const docTemplate = `{
}
}
},
"/answer/api/v1/question/link": {
"get": {
"description": "get question link",
"tags": [
"Question"
],
"summary": "get question link",
"parameters": [
{
"minimum": 1,
"type": "integer",
"name": "in_days",
"in": "query"
},
{
"enum": [
"newest",
"active",
"hot",
"score",
"unanswered",
"recommend"
],
"type": "string",
"name": "order",
"in": "query"
},
{
"minimum": 1,
"type": "integer",
"name": "page",
"in": "query"
},
{
"maximum": 100,
"minimum": 1,
"type": "integer",
"name": "page_size",
"in": "query"
},
{
"type": "string",
"name": "question_id",
"in": "query",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"allOf": [
{
"$ref": "#/definitions/handler.RespBody"
},
{
"type": "object",
"properties": {
"data": {
"allOf": [
{
"$ref": "#/definitions/pager.PageModel"
},
{
"type": "object",
"properties": {
"list": {
"type": "array",
"items": {
"$ref": "#/definitions/schema.QuestionPageResp"
}
}
}
}
]
}
}
}
]
}
}
}
}
},
"/answer/api/v1/question/operation": {
"put": {
"security": [
Expand Down Expand Up @@ -11456,7 +11540,8 @@ const docTemplate = `{
},
"name": {
"type": "string",
"maxLength": 30
"maxLength": 30,
"minLength": 2
},
"pass": {
"type": "string",
Expand Down
87 changes: 86 additions & 1 deletion docs/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4435,6 +4435,90 @@
}
}
},
"/answer/api/v1/question/link": {
"get": {
"description": "get question link",
"tags": [
"Question"
],
"summary": "get question link",
"parameters": [
{
"minimum": 1,
"type": "integer",
"name": "in_days",
"in": "query"
},
{
"enum": [
"newest",
"active",
"hot",
"score",
"unanswered",
"recommend"
],
"type": "string",
"name": "order",
"in": "query"
},
{
"minimum": 1,
"type": "integer",
"name": "page",
"in": "query"
},
{
"maximum": 100,
"minimum": 1,
"type": "integer",
"name": "page_size",
"in": "query"
},
{
"type": "string",
"name": "question_id",
"in": "query",
"required": true
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"allOf": [
{
"$ref": "#/definitions/handler.RespBody"
},
{
"type": "object",
"properties": {
"data": {
"allOf": [
{
"$ref": "#/definitions/pager.PageModel"
},
{
"type": "object",
"properties": {
"list": {
"type": "array",
"items": {
"$ref": "#/definitions/schema.QuestionPageResp"
}
}
}
}
]
}
}
}
]
}
}
}
}
},
"/answer/api/v1/question/operation": {
"put": {
"security": [
Expand Down Expand Up @@ -11429,7 +11513,8 @@
},
"name": {
"type": "string",
"maxLength": 30
"maxLength": 30,
"minLength": 2
},
"pass": {
"type": "string",
Expand Down
52 changes: 52 additions & 0 deletions docs/swagger.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2844,6 +2844,7 @@ definitions:
type: string
name:
maxLength: 30
minLength: 2
type: string
pass:
maxLength: 32
Expand Down Expand Up @@ -5585,6 +5586,57 @@ paths:
summary: update question invite user
tags:
- Question
/answer/api/v1/question/link:
get:
description: get question link
parameters:
- in: query
minimum: 1
name: in_days
type: integer
- enum:
- newest
- active
- hot
- score
- unanswered
- recommend
in: query
name: order
type: string
- in: query
minimum: 1
name: page
type: integer
- in: query
maximum: 100
minimum: 1
name: page_size
type: integer
- in: query
name: question_id
required: true
type: string
responses:
"200":
description: OK
schema:
allOf:
- $ref: '#/definitions/handler.RespBody'
- properties:
data:
allOf:
- $ref: '#/definitions/pager.PageModel'
- properties:
list:
items:
$ref: '#/definitions/schema.QuestionPageResp'
type: array
type: object
type: object
summary: get question link
tags:
- Question
/answer/api/v1/question/operation:
put:
consumes:
Expand Down
4 changes: 2 additions & 2 deletions i18n/af_ZA.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ ui:
label: Name
msg:
empty: Name cannot be empty.
range: Name must between 4 to 30 characters in length.
range: Name must be between 2 to 30 characters in length.
character: 'Must use the character set "a-z", "A-Z", "0-9", " - . _"'
email:
label: Email
Expand Down Expand Up @@ -1136,7 +1136,7 @@ ui:
fields:
display_name:
label: Display Name
msg: Display Name must be at 4-30 characters in length.
msg: Display name must be 2-30 characters in length.
email:
label: Email
msg: Email is not valid.
Expand Down
4 changes: 2 additions & 2 deletions i18n/ar_SA.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ ui:
label: Name
msg:
empty: Name cannot be empty.
range: Name must between 4 to 30 characters in length.
range: Name must be between 2 to 30 characters in length.
character: 'Must use the character set "a-z", "A-Z", "0-9", " - . _"'
email:
label: Email
Expand Down Expand Up @@ -1136,7 +1136,7 @@ ui:
fields:
display_name:
label: Display Name
msg: Display Name must be at 4-30 characters in length.
msg: Display name must be 2-30 characters in length.
email:
label: Email
msg: Email is not valid.
Expand Down
4 changes: 2 additions & 2 deletions i18n/az_AZ.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ ui:
label: Name
msg:
empty: Name cannot be empty.
range: Name must between 4 to 30 characters in length.
range: Name must be between 2 to 30 characters in length.
character: 'Must use the character set "a-z", "A-Z", "0-9", " - . _"'
email:
label: Email
Expand Down Expand Up @@ -1123,7 +1123,7 @@ ui:
fields:
display_name:
label: Display Name
msg: display_name must be at 4 - 30 characters in length.
msg: display_name must be at 2 - 30 characters in length.
email:
label: Email
msg: Email is not valid.
Expand Down
4 changes: 2 additions & 2 deletions i18n/bal_BA.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ ui:
label: Name
msg:
empty: Name cannot be empty.
range: Name must between 4 to 30 characters in length.
range: Name must be between 2 to 30 characters in length.
character: 'Must use the character set "a-z", "A-Z", "0-9", " - . _"'
email:
label: Email
Expand Down Expand Up @@ -1123,7 +1123,7 @@ ui:
fields:
display_name:
label: Display Name
msg: display_name must be at 4 - 30 characters in length.
msg: display_name must be at 2 - 30 characters in length.
email:
label: Email
msg: Email is not valid.
Expand Down
4 changes: 2 additions & 2 deletions i18n/ban_ID.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ ui:
label: Name
msg:
empty: Name cannot be empty.
range: Name must between 4 to 30 characters in length.
range: Name must be between 2 to 30 characters in length.
character: 'Must use the character set "a-z", "A-Z", "0-9", " - . _"'
email:
label: Email
Expand Down Expand Up @@ -1123,7 +1123,7 @@ ui:
fields:
display_name:
label: Display Name
msg: display_name must be at 4 - 30 characters in length.
msg: display_name must be at 2 - 30 characters in length.
email:
label: Email
msg: Email is not valid.
Expand Down
4 changes: 2 additions & 2 deletions i18n/bn_BD.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ ui:
label: Name
msg:
empty: Name cannot be empty.
range: Name must between 4 to 30 characters in length.
range: Name must be between 2 to 30 characters in length.
character: 'Must use the character set "a-z", "A-Z", "0-9", " - . _"'
email:
label: Email
Expand Down Expand Up @@ -1123,7 +1123,7 @@ ui:
fields:
display_name:
label: Display Name
msg: display_name must be at 4 - 30 characters in length.
msg: display_name must be at 2 - 30 characters in length.
email:
label: Email
msg: Email is not valid.
Expand Down
Loading

0 comments on commit 6da9d71

Please sign in to comment.