chg: User模型新增name字段

likaiguo · likaiguo · commit 5dab1a01e505 · 2018-05-16T19:10:58.000+08:00
- User模型新增name字段,nick_name很多时候不如name备注来的直接
- 搜索页面扩宽范围,考虑到数据量不多,暂不做优化
- 修复一些bug
diff --git a/config.py b/config.py
@@ -1,3 +1,4 @@
+# coding: utf-8
 import os
 
 HERE = os.path.abspath(os.path.dirname(__file__))
diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="utf-8">
-  <title>vueadmin</title>
+  <title>vue-admin</title>
 </head>
 
 <body>
diff --git a/libs/wx.py b/libs/wx.py
@@ -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__))
 
@@ -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 = {
diff --git a/models/core.py b/models/core.py
@@ -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='')
diff --git a/src/views/common/User.vue b/src/views/common/User.vue
@@ -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>
diff --git a/static/css/app.css b/static/css/app.css
diff --git a/static/js/app.js b/static/js/app.js
diff --git a/static/js/vendor.js b/static/js/vendor.js
diff --git a/templates/index.html b/templates/index.html
@@ -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>
diff --git a/views/api.py b/views/api.py
@@ -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
@@ -131,8 +131,12 @@ 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:
@@ -149,8 +153,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()
diff --git a/wechat/tasks.py b/wechat/tasks.py
@@ -1,3 +1,4 @@
+# coding: utf-8
 from datetime import timedelta
 from celery.task import periodic_task
 from celery.task.control import revoke
@@ -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()
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# coding: utf-8`
`1`	`2`	`import os`
`2`	`3`
`3`	`4`	`HERE = os.path.abspath(os.path.dirname(__file__))`
Original file line number	Diff line number	Diff 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>`