From e6c5e89f09637b8d9ebca6895d781663f12646d6 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期二, 17 十二月 2024 16:43:55 +0800 Subject: [PATCH] dify 文档智能 --- app/models/user_model.py | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/models/user_model.py b/app/models/user_model.py index eeaf3e6..dcbb612 100644 --- a/app/models/user_model.py +++ b/app/models/user_model.py @@ -39,6 +39,7 @@ sex = Column(String(1)) permission = Column(String(16), default="general") age = Column(Integer) + sync_flag = Column(String(36)) created_at = Column(DateTime, default=datetime.now()) updated_at = Column(DateTime, default=datetime.now(), onupdate=datetime.now()) @@ -115,6 +116,7 @@ for ogt in self.organizations: if ogt.id in ogt_set: continue + print(ogt.id) ogt_set.add(ogt.id) for role in ogt.roles: roles[role.id] = role.to_dict() @@ -122,9 +124,12 @@ while parent_ogt: if parent_ogt.id not in ogt_set: ogt_set.add(ogt.id) - for role in ogt.roles: + for role in parent_ogt.roles: roles[role.id] = role.to_dict() - parent_ogt = ogt.parent + parent_ogt = parent_ogt.parent + else: + break + json['roles'] = list(roles.values()) return json @@ -220,9 +225,10 @@ "app_type": self.app_type, 'status': self.status, } - - def encrypted_password(self, password): + @staticmethod + def encrypted_password(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") \ No newline at end of file + @staticmethod + def decrypted_password(password): + return cipher_suite.decrypt(password).decode("utf-8") \ No newline at end of file -- Gitblit v1.8.0