Skip to content

Commit abbfee6

Browse files
likaiguolikaiguo
committed
chg: User模型新增name字段
- User模型新增name字段,nick_name很多时候不如name备注来的直接 - 搜索页面扩宽范围,考虑到数据量不多,暂不做优化 - 修复一些bug
1 parent 3515fa6 commit abbfee6

File tree

11 files changed

+40
-20
lines changed

11 files changed

+40
-20
lines changed

‎config.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# coding: utf-8
12
import os
23

34
HERE = os.path.abspath(os.path.dirname(__file__))

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<head>
55
<meta charset="utf-8">
6-
<title>vueadmin</title>
6+
<title>vue-admin</title>
77
</head>
88

99
<body>

‎libs/wx.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1+
# coding: utf-8
12
# TODO:
23
# 1. puid过期后顺便也删掉对应的头像
34

45
import os
56
from datetime import datetime, timedelta
67

8+
from gunicorn._compat import FileNotFoundError
79
from itchat.signals import scan_qr_code, confirm_login, logged_out
810

911
from ext import sse
1012
from config import avatar_tmpl
13+
try:
14+
FileNotFoundError
15+
except NameError:
16+
FileNotFoundError = OSError
1117

1218
here = os.path.abspath(os.path.dirname(__file__))
1319

@@ -53,7 +59,7 @@ def get_logged_in_user(bot):
5359
url, path, need_update = gen_avatar_path(id, force=True)
5460
try:
5561
bot.core.get_head_img(picDir=path)
56-
except FileNotFoundError:
62+
except (FileNotFoundError, IOError) as e:
5763
os.mkdir(os.path.dirname(path))
5864
bot.core.get_head_img(picDir=path)
5965
user = {

‎models/core.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ class User(CoreMixin, db.Model):
5050
id = db.Column(db.String(20), primary_key=True) # puid
5151
sex = db.Column(db.SmallInteger, default=2)
5252
nick_name = db.Column(db.String(60), index=True)
53+
name = db.Column(db.String(60), index=True)
5354
signature = db.Column(db.String(512), default='')
5455
province = db.Column(db.String(20), default='')
5556
city = db.Column(db.String(20), default='')

‎src/views/common/User.vue‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
</el-table-column>
3333
<el-table-column prop="nick_name" label="昵称" width="150" sortable>
3434
</el-table-column>
35+
<el-table-column prop="name" label="备注名" width="150" sortable>
36+
</el-table-column>
3537
<el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" sortable>
3638
</el-table-column>
3739
<el-table-column prop="province" label="省份" width="100" sortable>

‎static/css/app.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/js/app.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/js/vendor.js‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html><head><meta charset=utf-8><title>vueadmin</title><link href=/static/css/app.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.js></script><script type=text/javascript src=/static/js/vendor.js></script><script type=text/javascript src=/static/js/app.js></script></body></html>
1+
<!DOCTYPE html><html><head><meta charset=utf-8><title>vue-admin</title><link href=/static/css/app.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.js></script><script type=text/javascript src=/static/js/vendor.js></script><script type=text/javascript src=/static/js/app.js></script></body></html>

‎views/api.py‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from flask import Flask, request
55
from flask.views import MethodView
66
from flask_sqlalchemy import get_debug_queries
7-
from sqlalchemy import and_
7+
from sqlalchemy import and_, or_
88

99
import config
1010
import views.errors as errors
@@ -131,8 +131,13 @@ def get(self):
131131
}
132132
if q:
133133
users = query(User).outerjoin(
134-
friendship, friendship.c.user_id == User.id).filter(and_(
135-
User.nick_name.like('%{}%'.format(q)),
134+
friendship, friendship.c.user_id == User.id).filter(
135+
and_(or_(
136+
User.name.like('%{}%'.format(q)),
137+
User.signature.like('%{}%'.format(q)),
138+
User.city.like('%{}%'.format(q)),
139+
User.province.like('%{}%'.format(q)),
140+
User.nick_name.like('%{}%'.format(q))),
136141
friendship.c.friend_id == user.id)
137142
)
138143
else:
@@ -149,8 +154,12 @@ def get(self):
149154
if q:
150155
users = query(User).outerjoin(
151156
group_relationship,
152-
group_relationship.c.user_id == User.id).filter(and_(
153-
User.nick_name.like('%{}%'.format(q)),
157+
group_relationship.c.user_id == User.id).filter(and_(or_(
158+
User.name.like('%{}%'.format(q)),
159+
User.signature.like('%{}%'.format(q)),
160+
User.city.like('%{}%'.format(q)),
161+
User.province.like('%{}%'.format(q)),
162+
User.nick_name.like('%{}%'.format(q))),
154163
group_relationship.c.group_id == group.id)
155164
)
156165
total = users.count()

0 commit comments

Comments
 (0)