model

modules/sys/models/photo.py

@@ -17,4 +17,4 @@ class AdminLogSchema(SQLAlchemyAutoSchema):
     class Meta:
         model = Photo
         include_fk = True
-        load_instance = True
+        load_instance = True

modules/sys/models/role.py

@@ -1,5 +1,5 @@
 import datetime
-from common.model import BaseModel, Column, String, Integer, DateTime, relationship, SQLAlchemyAutoSchema
+from common.model import BaseModel, Column, String, Integer, DateTime, relationship, SQLAlchemyAutoSchema, backref
 
 
 class Role(BaseModel):
@@ -13,10 +13,11 @@ class Role(BaseModel):
     sort = Column(Integer, comment='排序')
     create_time = Column(DateTime, default=datetime.datetime.now, comment='创建时间')
     update_time = Column(DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now, comment='更新时间')
-    power = relationship('Power', secondary="admin_role_power", backref=backref('role'))
+    power = relationship('Power', secondary="sys_role_power", backref=backref('role'))
+
 
 class RoleSchema(SQLAlchemyAutoSchema):
     class Meta:
         model = Role
         include_fk = True
-        load_instance = True
+        load_instance = True

modules/sys/models/role_power.py

@@ -3,6 +3,6 @@ from common.model import Column, Table, Integer, ForeignKey
 role_power = Table(
     "sys_role_power",
     Column("id", Integer, primary_key=True, autoincrement=True, comment='标识'),
-    Column("power_id", Integer, ForeignKey("admin_power.id"), comment='用户编号'),
-    Column("role_id", Integer, ForeignKey("admin_role.id"), comment='角色编号'),
+    Column("power_id", Integer, ForeignKey("sys_power.id"), comment='用户编号'),
+    Column("role_id", Integer, ForeignKey("sys_role.id"), comment='角色编号'),
 )

modules/sys/models/user.py

@@ -17,7 +17,7 @@ class User(BaseModel, UserMixin):
     dept_id = Column(Integer, comment='部门id')
     create_at = Column(DateTime, default=datetime.datetime.now, comment='创建时间')
     update_at = Column(DateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now, comment='创建时间')
-    role = relationship('Role', secondary="admin_user_role", backref=backref('user'), lazy='dynamic')
+    role = relationship('Role', secondary="sys_user_role", backref=backref('user'), lazy='dynamic')
 
     def set_password(self, password):
         self.password_hash = generate_password_hash(password)

modules/sys/models/user_role.py

@@ -3,6 +3,6 @@ from common.model import Table, Column, Integer, ForeignKey
 user_role = Table(
     "sys_user_role",
     Column("id", Integer, primary_key=True, autoincrement=True, comment='标识'),
-    Column("user_id", Integer, ForeignKey("admin_user.id"), comment='用户编号'),
-    Column("role_id", Integer, ForeignKey("admin_role.id"), comment='角色编号'),
+    Column("user_id", Integer, ForeignKey("sys_user.id"), comment='用户编号'),
+    Column("role_id", Integer, ForeignKey("sys_role.id"), comment='角色编号'),
 )