Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
fj-livekit
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
xianyang
fj-livekit
Commits
e7ec5d5e
Commit
e7ec5d5e
authored
Dec 11, 2023
by
xianyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
12-11: 优化朋友圈列表,增加返回字段
parent
65f81741
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
data_delte.py
src/app/api/friends/data_delte.py
+6
-1
views.py
src/app/api/friends/views.py
+1
-1
No files found.
src/app/api/friends/data_delte.py
View file @
e7ec5d5e
...
...
@@ -37,7 +37,11 @@ def get_infoname(data):
result
=
[]
uids
=
[
item
.
get
(
"uid"
,
""
)
for
item
in
data
]
if
uids
:
sql
=
f
"SELECT nickname,user_avatar_file_name,bg_image,user_uid FROM `missu_users` where user_uid in{tuple(uids)}"
if
len
(
uids
)
==
1
:
sql
=
f
"SELECT nickname,user_avatar_file_name,bg_image,user_uid,energy_ball_image FROM missu_users where user_uid={uids[0]}"
else
:
sql
=
f
"SELECT nickname,user_avatar_file_name,bg_image,user_uid,energy_ball_image FROM missu_users where user_uid in{tuple(uids)}"
user_info
=
LinkMysql
(
env
.
BUSINESS
)
.
query_mysql
(
sql
)
for
i
in
range
(
len
(
data
)):
for
s
in
range
(
len
(
user_info
)):
...
...
@@ -46,6 +50,7 @@ def get_infoname(data):
data
[
i
][
'nick_name'
]
=
user_info
[
s
]
.
get
(
"nickname"
,
""
)
data
[
i
][
'user_avatar_file_name'
]
=
user_info
[
s
]
.
get
(
"user_avatar_file_name"
,
""
)
data
[
i
][
'bg_image'
]
=
data
[
s
]
.
get
(
"bg_image"
,
""
)
data
[
i
][
'energy_ball_image'
]
=
data
[
s
]
.
get
(
"energy_ball_image"
,
""
)
result
.
append
(
data
[
i
])
return
result
...
...
src/app/api/friends/views.py
View file @
e7ec5d5e
...
...
@@ -30,7 +30,7 @@ def friends_list():
form
=
FriendsListFrom
(
request
.
args
)
.
validate_
()
page
=
request
.
args
.
get
(
'page'
,
default
=
1
,
type
=
int
)
limit
=
request
.
args
.
get
(
'size'
,
default
=
10
,
type
=
int
)
query_user
=
FriendMessage
.
query
.
filter
(
audit_status
=
2
)
.
order_by
(
FriendMessage
.
id
.
desc
())
query_user
=
FriendMessage
.
query
.
filter
()
.
order_by
(
FriendMessage
.
id
.
desc
())
if
form
.
params
:
query_user
=
query_user
.
filter
(
*
form
.
params
)
paginate
=
query_user
.
paginate
(
page
=
page
,
per_page
=
limit
,
error_out
=
True
)
...
...
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