bwadmin/pear-admin-flask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

继续è°workflowï:调整目录结构

Browse Source
This commit is contained in:
zhengxinonly
2021-06-22 03:18:44 +08:00
parent d7c7237cd4
commit 05dff28523
43 changed files with 203 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/models/__init__.py
+1 -2
View File
@@ -1,9 +1,8 @@
from .dept import Dept, DeptSchema
from applications.models.company import Dept, DeptSchema, User, UserSchema
from .dict_models import DictType, DictData, DictTypeSchema, DictDataSchema
from .log import AdminLog, LogSchema
from applications.models.file.photo import Photo, PhotoSchema
from applications.models.rights.power import Power, PowerSchema, PowerSchema2
from applications.models.rights.role import Role, RoleSchema
from applications.models.rights.role_power import role_power
from applications.models.users.employee import User, UserSchema
from applications.models.rights.user_role import user_role
applications/models/company/__init__.py
+2
View File
@@ -0,0 +1,2 @@
from .dept import Dept, DeptSchema
from .users import User, UserSchema
applications/models/dept.py → applications/models/company/dept.py
+1 -1
View File
@@ -4,7 +4,7 @@ from marshmallow import fields, validate
class Dept(db.Model):
__tablename__ = 'admin_dept'
__tablename__ = 'cp_dept'
id = db.Column(db.Integer, primary_key=True, comment="部门ID")
parent_id = db.Column(db.Integer, comment="父级编号")
dept_name = db.Column(db.String(50), comment="部门名称")
applications/models/users/employee.py → applications/models/company/users.py
+4 -3
View File
@@ -3,14 +3,14 @@ from flask_login import UserMixin
from werkzeug.security import generate_password_hash, check_password_hash
from applications.extensions import db, ma
from marshmallow import fields
from applications.models import Dept
class User(db.Model, UserMixin):
__tablename__ = 'admin_user'
__tablename__ = 'cp_user'
id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='用户ID')
username = db.Column(db.String(20), comment='用户名')
realname = db.Column(db.String(20), comment='真实名字')
mobile = db.Column(db.String(11), comment='电话号码')
avatar = db.Column(db.String(255), comment='头像', default="/static/admin/admin/images/avatar.jpg")
remark = db.Column(db.String(255), comment='备注')
password_hash = db.Column(db.String(128), comment='哈希密码')
@@ -18,7 +18,7 @@ class User(db.Model, UserMixin):
dept_id = db.Column(db.Integer, comment='部门id')
create_at = db.Column(db.DateTime, default=datetime.datetime.now, comment='创建时间')
update_at = db.Column(db.DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now, comment='创建时间')
role = db.relationship('Role', secondary="admin_user_role", backref=db.backref('user'), lazy='dynamic')
role = db.relationship('Role', secondary="rt_user_role", backref=db.backref('user'), lazy='dynamic')
def set_password(self, password):
self.password_hash = generate_password_hash(password)
@@ -38,6 +38,7 @@ class UserSchema(ma.Schema):
dept = fields.Method("get_dept")
def get_dept(self, obj):
from applications.models import Dept
if obj.dept_id != None:
return Dept.query.filter_by(id=obj.dept_id).first().dept_name
else:
applications/models/file/photo.py
+1 -1
View File
@@ -5,7 +5,7 @@ from marshmallow import fields
class Photo(db.Model):
__tablename__ = 'admin_photo'
__tablename__ = 'file_photo'
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(255), nullable=False)
href = db.Column(db.String(255))
applications/models/log.py
+2 -2
View File
@@ -1,4 +1,4 @@
import datetime
from datetime import datetime
from applications.extensions import db, ma
from marshmallow import fields
@@ -13,7 +13,7 @@ class AdminLog(db.Model):
ip = db.Column(db.String(255))
success = db.Column(db.Integer)
user_agent = db.Column(db.Text)
create_time = db.Column(db.DateTime, default=datetime.datetime.now)
create_time = db.Column(db.DateTime, default=datetime.now)
class LogSchema(ma.Schema): # 序列化类
applications/models/rights/power.py
+4 -4
View File
@@ -4,14 +4,14 @@ from marshmallow import fields
class Power(db.Model):
__tablename__ = 'admin_power'
__tablename__ = 'rt_power'
id = db.Column(db.Integer, primary_key=True, comment='权限编号')
name = db.Column(db.String(255), comment='权限名称')
type = db.Column(db.String(1), comment='权限类型')
type = db.Column(db.SMALLINT, comment='权限类型')
code = db.Column(db.String(30), comment='权限标识')
url = db.Column(db.String(255), comment='权限路径')
open_type = db.Column(db.String(10), comment='打开方式')
parent_id = db.Column(db.Integer, db.ForeignKey("admin_power.id"), comment='父类编号')
parent_id = db.Column(db.Integer, db.ForeignKey("rt_power.id"), comment='父类编号')
icon = db.Column(db.String(128), comment='图标')
sort = db.Column(db.Integer, comment='排序')
create_time = db.Column(db.DateTime, default=datetime.datetime.now, comment='创建时间')
@@ -21,7 +21,7 @@ class Power(db.Model):
parent = db.relationship("Power", remote_side=[id]) # 自关联
# 权限models序列化类
# 权限 models 序列化类
class PowerSchema(ma.Schema):
id = fields.Integer()
title = fields.Str(attribute="name")
applications/models/rights/role.py
+2 -2
View File
@@ -4,7 +4,7 @@ from marshmallow import fields
class Role(db.Model):
__tablename__ = 'admin_role'
__tablename__ = 'rt_role'
id = db.Column(db.Integer, primary_key=True, comment='角色ID')
name = db.Column(db.String(255), comment='角色名称')
code = db.Column(db.String(255), comment='角色标识')
@@ -14,7 +14,7 @@ class Role(db.Model):
sort = db.Column(db.Integer, comment='排序')
create_time = db.Column(db.DateTime, default=datetime.datetime.now, comment='创建时间')
update_time = db.Column(db.DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now, comment='更新时间')
power = db.relationship('Power', secondary="admin_role_power", backref=db.backref('role'))
power = db.relationship('Power', secondary="rt_role_power", backref=db.backref('role'))
class RoleSchema(ma.Schema):
applications/models/rights/role_power.py
+3 -3
View File
@@ -2,8 +2,8 @@ from applications.extensions import db
# 创建中间表
role_power = db.Table(
"admin_role_power", # 中间表名称
"rt_role_power", # 中间表名称
db.Column("id", db.Integer, primary_key=True, autoincrement=True, comment='标识'), # 主键
db.Column("power_id", db.Integer, db.ForeignKey("admin_power.id"), comment='用户编号'), # 属性 外键
db.Column("role_id", db.Integer, db.ForeignKey("admin_role.id"), comment='角色编号'), # 属性 外键
db.Column("power_id", db.Integer, db.ForeignKey("rt_power.id"), comment='用户编号'), # 属性 外键
db.Column("role_id", db.Integer, db.ForeignKey("rt_role.id"), comment='角色编号'), # 属性 外键
)
applications/models/rights/user_role.py
+3 -3
View File
@@ -2,8 +2,8 @@ from applications.extensions import db
# 创建中间表
user_role = db.Table(
"admin_user_role", # 中间表名称
"rt_user_role", # 中间表名称
db.Column("id", db.Integer, primary_key=True, autoincrement=True, comment='标识'), # 主键
db.Column("user_id", db.Integer, db.ForeignKey("admin_user.id"), comment='用户编号'), # 属性 外键
db.Column("role_id", db.Integer, db.ForeignKey("admin_role.id"), comment='角色编号'), # 属性 外键
db.Column("user_id", db.Integer, db.ForeignKey("cp_user.id"), comment='用户编号'), # 属性 外键
db.Column("role_id", db.Integer, db.ForeignKey("rt_role.id"), comment='角色编号'), # 属性 外键
)
applications/models/users/__init__.py
View File