From 351cd801ebf0da665c521448c978da100b4aaf03 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 05 十二月 2024 15:21:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/models/user_model.py | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/models/user_model.py b/app/models/user_model.py
index 9d6acdb..77d8a4b 100644
--- a/app/models/user_model.py
+++ b/app/models/user_model.py
@@ -1,6 +1,6 @@
from datetime import datetime
-# from cryptography.fernet import Fernet
+from cryptography.fernet import Fernet
from sqlalchemy import Column, Integer, String, Table, ForeignKey, DateTime
from sqlalchemy.orm import relationship, backref
@@ -18,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"))
+cipher_suite = Fernet(settings.PASSWORD_KEY.encode("utf-8"))
class UserModel(Base):
@@ -81,6 +81,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):
--
Gitblit v1.8.0