Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
PyFund
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈涛
PyFund
Commits
4d4ae359
Commit
4d4ae359
authored
Mar 22, 2023
by
Confusion-ymc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改创建 默认id的bug
parent
4b3670fb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
__init__.py
model/__init__.py
+1
-1
fund.py
model/fund.py
+2
-2
node.py
model/node.py
+2
-2
No files found.
model/__init__.py
View file @
4d4ae359
...
@@ -33,7 +33,7 @@ class ErrorResponse(BaseModel):
...
@@ -33,7 +33,7 @@ class ErrorResponse(BaseModel):
class
BaseCreateModel
(
BaseModel
):
class
BaseCreateModel
(
BaseModel
):
id
:
str
=
Field
(
default_factory
=
uuid
.
uuid1
()
.
__str__
,
description
=
'唯一ID'
)
id
:
str
=
Field
(
default_factory
=
lambda
:
uuid
.
uuid1
()
.
__str__
()
,
description
=
'唯一ID'
)
create_time
:
int
=
Field
(
default_factory
=
lambda
:
int
(
datetime
.
datetime
.
utcnow
()
.
timestamp
()),
create_time
:
int
=
Field
(
default_factory
=
lambda
:
int
(
datetime
.
datetime
.
utcnow
()
.
timestamp
()),
description
=
'创建时间'
)
description
=
'创建时间'
)
update_time
:
int
=
Field
(
default_factory
=
lambda
:
int
(
datetime
.
datetime
.
utcnow
()
.
timestamp
()),
update_time
:
int
=
Field
(
default_factory
=
lambda
:
int
(
datetime
.
datetime
.
utcnow
()
.
timestamp
()),
...
...
model/fund.py
View file @
4d4ae359
...
@@ -14,7 +14,7 @@ class FundType(str, Enum):
...
@@ -14,7 +14,7 @@ class FundType(str, Enum):
class
BaseFundItem
(
BaseModel
):
class
BaseFundItem
(
BaseModel
):
name
:
str
=
Field
(
...
,
description
=
'基金名称'
)
name
:
str
=
Field
(
...
,
description
=
'基金名称'
)
fund_type
:
str
=
Field
(
default
=
FundType
.
staking
.
value
,
description
=
'基金类型'
)
fund_type
:
FundType
=
Field
(
default
=
FundType
.
staking
,
description
=
'基金类型'
)
base_coin
:
str
=
Field
(
default
=
'USD'
,
description
=
'基准币种'
)
base_coin
:
str
=
Field
(
default
=
'USD'
,
description
=
'基准币种'
)
base_nav
:
float
=
Field
(
default
=
1
,
description
=
'初始净值'
)
base_nav
:
float
=
Field
(
default
=
1
,
description
=
'初始净值'
)
settlement_time
:
str
=
Field
(
default
=
'08:00'
,
description
=
'结算时间'
)
settlement_time
:
str
=
Field
(
default
=
'08:00'
,
description
=
'结算时间'
)
...
@@ -25,7 +25,7 @@ class CreateFund(BaseFundItem):
...
@@ -25,7 +25,7 @@ class CreateFund(BaseFundItem):
nodes
:
List
[
BaseNode
]
=
Field
(
default
=
[],
description
=
'绑定节点'
)
nodes
:
List
[
BaseNode
]
=
Field
(
default
=
[],
description
=
'绑定节点'
)
# 传入数据库类型
# 传入数据库类型
/ 接口返回类型
class
NormalFund
(
BaseFundItem
,
BaseCreateModel
):
class
NormalFund
(
BaseFundItem
,
BaseCreateModel
):
user_id
:
str
user_id
:
str
user_email
:
str
user_email
:
str
...
...
model/node.py
View file @
4d4ae359
...
@@ -12,5 +12,5 @@ class NodeStatus(str, Enum):
...
@@ -12,5 +12,5 @@ class NodeStatus(str, Enum):
class
BaseNode
(
BaseCreateModel
):
class
BaseNode
(
BaseCreateModel
):
pub_key
:
str
=
Field
(
...
,
description
=
'
创建人
'
)
pub_key
:
str
=
Field
(
...
,
description
=
'
绑定的key
'
)
status
:
NodeStatus
=
Field
(
default
=
NodeStatus
.
pending
,
description
=
'
创建人
'
)
status
:
NodeStatus
=
Field
(
default
=
NodeStatus
.
pending
,
description
=
'
状态
'
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment