From 08c8e8c9a4d65677de6a493446a605d70efee631 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 10 十二月 2024 16:32:07 +0800
Subject: [PATCH] 12.10 16
---
app/models/user_model.py | 69 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 11 deletions(-)
diff --git a/app/models/user_model.py b/app/models/user_model.py
index 96d2d32..a1d61dd 100644
--- a/app/models/user_model.py
+++ b/app/models/user_model.py
@@ -1,8 +1,10 @@
from datetime import datetime
-from sqlalchemy import Column, Integer, String, Table, ForeignKey, DateTime
+from cryptography.fernet import Fernet
+from sqlalchemy import Column, Integer, String, Table, ForeignKey, DateTime, UniqueConstraint
from sqlalchemy.orm import relationship, backref
+from app.config.config import settings
from app.models.base_model import Base
user_organization_table = Table('user_organization',Base.metadata
@@ -16,7 +18,7 @@
user_group_table = Table('user_group', Base.metadata
, Column('user_id', Integer, ForeignKey('user.id', ondelete='CASCADE'))
, Column('group_id', Integer, ForeignKey('group.id', ondelete='CASCADE')))
-
+cipher_suite = Fernet(settings.PASSWORD_KEY.encode("utf-8"))
class UserModel(Base):
@@ -24,20 +26,22 @@
id = Column(Integer, primary_key=True, index=True)
username = Column(String(255), unique=True, index=True)
hashed_password = Column(String(255))
- compellation = Column(String(255), nullable=False, default="")
- phone = Column(String(255), nullable=False, default="")
- email = Column(String(255), nullable=False, default="")
- description = Column(String(255), nullable=False, default="")
- ragflow_id = Column(String(32), unique=True, index=True)
- bisheng_id = Column(Integer, unique=True, index=True)
+ password = Column(String(255))
+ compellation = Column(String(255), default="")
+ phone = Column(String(255), default="")
+ email = Column(String(255), default="")
+ description = Column(String(255), default="")
+ ragflow_id = Column(String(32))
+ bisheng_id = Column(Integer)
login_name = Column(String(100))
- status = Column(String(10), nullable=False, default="1")
+ status = Column(String(10), default="1")
creator = Column(String(36))
sex = Column(String(1))
- permission = Column(String(16), nullable=False, default="1")
+ permission = Column(String(16), default="general")
age = Column(Integer)
created_at = Column(DateTime, default=datetime.now())
updated_at = Column(DateTime, default=datetime.now(), onupdate=datetime.now())
+
organizations = relationship('OrganizationModel',
@@ -78,6 +82,9 @@
'userName': self.username,
'loginName': self.login_name if self.login_name else "",
'status': self.status,
+ 'email': self.email,
+ 'phone': self.phone,
+ 'permission':self.permission
}
def to_json(self):
@@ -162,4 +169,44 @@
user_id_list = [user.ID for user in users]
for user in users:
user_id_list.extend(user.get_children())
- return user_id_list
\ No newline at end of file
+ return user_id_list
+
+
+ def encrypted_password(self, password):
+ return cipher_suite.encrypt(password.encode("utf-8")).decode("utf-8")
+
+ def decrypted_password(self):
+ return cipher_suite.decrypt(self.password).decode("utf-8")
+
+
+
+class UserAppModel(Base):
+ __tablename__ = "user_app"
+ __table_args__ = (UniqueConstraint('user_id', 'app_type', name='user_app_id_ix'),)
+ id = Column(Integer, primary_key=True, index=True)
+ username = Column(String(255))
+ password = Column(String(255))
+ email = Column(String(255), default="")
+ user_id = Column(Integer)
+ app_id = Column(String(36))
+ app_type = Column(String(16))
+ status = Column(String(10), default="1")
+ access_token = Column(String(1000))
+ refresh_token = Column(String(1000))
+ token_at = Column(DateTime, default=datetime.now())
+ created_at = Column(DateTime, default=datetime.now())
+ updated_at = Column(DateTime, default=datetime.now(), onupdate=datetime.now())
+
+ def to_json(self):
+ return {
+ 'id': self.id,
+ 'userName': self.username,
+ 'createTime': self.created_at.strftime('%Y-%m-%d %H:%M:%S') if self.created_at else "",
+ 'updateTime': self.updated_at.strftime('%Y-%m-%d %H:%M:%S') if self.created_at else "",
+ 'password': self.password,
+ 'email': self.email,
+ 'user_id': self.user_id,
+ 'app_id': self.app_id,
+ "app_type": self.app_type,
+ 'status': self.status,
+ }
--
Gitblit v1.8.0