Skip to content

chg: User模型新增name字段 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chg: User模型新增name字段 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# coding: utf-8
import os

HERE = os.path.abspath(os.path.dirname(__file__))
Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<head>
<meta charset="utf-8">
<title>vueadmin</title>
<title>vue-admin</title>
</head>

<body>
Expand Down
8 changes: 7 additions & 1 deletion libs/wx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
# coding: utf-8
# TODO:
# 1. puid过期后顺便也删掉对应的头像

import os
from datetime import datetime, timedelta

from gunicorn._compat import FileNotFoundError
from itchat.signals import scan_qr_code, confirm_login, logged_out

from ext import sse
from config import avatar_tmpl
try:
FileNotFoundError
except NameError:
FileNotFoundError = OSError

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

Expand Down Expand Up @@ -53,7 +59,7 @@ def get_logged_in_user(bot):
url, path, need_update = gen_avatar_path(id, force=True)
try:
bot.core.get_head_img(picDir=path)
except FileNotFoundError:
except (FileNotFoundError, IOError) as e:
os.mkdir(os.path.dirname(path))
bot.core.get_head_img(picDir=path)
user = {
Expand Down
1 change: 1 addition & 0 deletions models/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class User(CoreMixin, db.Model):
id = db.Column(db.String(20), primary_key=True) # puid
sex = db.Column(db.SmallInteger, default=2)
nick_name = db.Column(db.String(60), index=True)
name = db.Column(db.String(60), index=True)
signature = db.Column(db.String(512), default='')
province = db.Column(db.String(20), default='')
city = db.Column(db.String(20), default='')
Expand Down
2 changes: 2 additions & 0 deletions src/views/common/User.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
</el-table-column>
<el-table-column prop="nick_name" label="昵称" width="150" sortable>
</el-table-column>
<el-table-column prop="name" label="备注名" width="150" sortable>
</el-table-column>
<el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" sortable>
</el-table-column>
<el-table-column prop="province" label="省份" width="100" sortable>
Expand Down
4 changes: 2 additions & 2 deletions static/css/app.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/js/app.js
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions static/js/vendor.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
<!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>
19 changes: 14 additions & 5 deletions views/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from flask import Flask, request
from flask.views import MethodView
from flask_sqlalchemy import get_debug_queries
from sqlalchemy import and_
from sqlalchemy import and_, or_

import config
import views.errors as errors
Expand Down Expand Up @@ -131,8 +131,13 @@ def get(self):
}
if q:
users = query(User).outerjoin(
friendship, friendship.c.user_id == User.id).filter(and_(
User.nick_name.like('%{}%'.format(q)),
friendship, friendship.c.user_id == User.id).filter(
and_(or_(
User.name.like('%{}%'.format(q)),
User.signature.like('%{}%'.format(q)),
User.city.like('%{}%'.format(q)),
User.province.like('%{}%'.format(q)),
User.nick_name.like('%{}%'.format(q))),
friendship.c.friend_id == user.id)
)
else:
Expand All @@ -149,8 +154,12 @@ def get(self):
if q:
users = query(User).outerjoin(
group_relationship,
group_relationship.c.user_id == User.id).filter(and_(
User.nick_name.like('%{}%'.format(q)),
group_relationship.c.user_id == User.id).filter(and_(or_(
User.name.like('%{}%'.format(q)),
User.signature.like('%{}%'.format(q)),
User.city.like('%{}%'.format(q)),
User.province.like('%{}%'.format(q)),
User.nick_name.like('%{}%'.format(q))),
group_relationship.c.group_id == group.id)
)
total = users.count()
Expand Down
3 changes: 2 additions & 1 deletion wechat/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# coding: utf-8
from datetime import timedelta
from celery.task import periodic_task
from celery.task.control import revoke
Expand Down Expand Up @@ -27,7 +28,7 @@ def restart_listener(sender, **kw):
from models.messaging import Notification

stopped.connect(restart_listener)
MP_FIELD = ['nick_name', 'signature', 'province', 'city']
MP_FIELD = ['nick_name', 'name', 'signature', 'province', 'city']
USER_FIELD = MP_FIELD + ['sex']
bot = get_bot()

Expand Down