From fe30e85ad48a5fd787940cf9d58fb87a12b0b562 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 26 十二月 2024 10:28:55 +0800
Subject: [PATCH] 注册用户权限同步
---
app/service/service_token.py | 2 ++
app/config/env_conf/config2.yaml | 26 ++++++++++++++++++++++++++
app/task/fetch_agent.py | 27 +++++++++++++++++++++++++--
3 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/app/config/env_conf/config2.yaml b/app/config/env_conf/config2.yaml
new file mode 100644
index 0000000..5bdca69
--- /dev/null
+++ b/app/config/env_conf/config2.yaml
@@ -0,0 +1,26 @@
+secret_key: your-secret-key
+sgb_base_url: http://192.168.20.116:13001
+sgb_websocket_url: ws://192.168.20.116:13001
+fwr_base_url: http://192.168.20.116:11080
+database_url: mysql+pymysql://root:rag_gateway@192.168.20.116:23306/rag_gateway
+sgb_db_url: mysql+pymysql://root:1234@192.168.20.119:13306/bisheng
+fwr_db_url: mysql+pymysql://root:infini_rag_flow@192.168.20.116:15455/rag_flow
+PUBLIC_KEY: |
+ -----BEGIN PUBLIC KEY-----
+ MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq9XTUSeYr2+N1h3Afl/z8Dse/2yD0ZGrKwx+EEEcdsBLca9Ynmx3nIB5obmLlSfmskLpBo0UACBmB5rEjBp2Q2f3AG3Hjd4B+gNCG6BDaawuDlgANIhGnaTLrIqWrrcm4EMzJOnAOI1fgzJRsOOUEfaS318Eq9OVO3apEyCCt0lOQK6PuksduOjVxtltDav+guVAA068NrPYmRNabVKRNLJpL8w4D44sfth5RvZ3q9t+6RTArpEtc5sh5ChzvqPOzKGMXW83C95TxmXqpbK6olN4RevSfVjEAgCydH6HN6OhtOQEcnrU97r9H0iZOWwbw3pVrZiUkuRD1R56Wzs2wIDAQAB
+ -----END PUBLIC KEY-----
+PRIVATE_KEY: str
+fetch_sgb_agent: 鎶ュ憡鐢熸垚,鏂囨。鏅鸿兘
+fetch_fwr_agent: 鐭ヨ瘑闂瓟,鏅鸿兘闂瓟
+PASSWORD_KEY: VKinqB-8XMrwCLLrcf_PyHyo12_4PVKvWzaHjNFions=
+basic_base_url: http://192.168.20.231:8000
+basic_paper_url: http://192.168.20.231:8000
+dify_base_url: http://192.168.20.116
+dify_api_token: app-YmOAMDsPpDDlqryMHnc9TzTO
+postgresql_database_url: postgresql+asyncpg://kong:kongpass@192.168.20.116:15433/kong
+dify_workflow_clean: app-OpF0drPu0XcgqcekQpT4FA8a
+dify_workflow_report: app-0MAkdFWqh9zxwmU69O0BFU1s
+dify_database_url: postgresql+psycopg2://postgres:difyai123456@192.168.20.116:15432/dify
+
+
+
diff --git a/app/service/service_token.py b/app/service/service_token.py
index 604946c..236a0d7 100644
--- a/app/service/service_token.py
+++ b/app/service/service_token.py
@@ -8,6 +8,7 @@
from app.service.bisheng import BishengService
from app.service.difyService import DifyService
from app.service.ragflow import RagflowService
+from app.task.fetch_agent import update_ragflow_user_tenant
async def get_bisheng_token(db, user_id: int):
@@ -117,3 +118,4 @@
await ragflow_service.add_user_tenant(token, user.app_id,
u.email,
u.app_id)
+ update_ragflow_user_tenant(sync_user.id)
diff --git a/app/task/fetch_agent.py b/app/task/fetch_agent.py
index 00d2cc6..8507bee 100644
--- a/app/task/fetch_agent.py
+++ b/app/task/fetch_agent.py
@@ -62,6 +62,15 @@
status = Column(String(1)) # 鐘舵��
doc_num = Column(Integer) # 鏂囨。
+
+class RgUserTenant(Base):
+ __tablename__ = 'user_tenant'
+ id = Column(String(36), primary_key=True) # id
+ tenant_id = Column(String(32)) # 鍚嶇О
+ user_id = Column(String(32))
+ role = Column(String(32)) # 鍒涘缓浜篿d
+
+
# 瑙ｆ瀽鍚嶅瓧
def parse_names(names_str: str) -> List[str]:
return [name.strip() for name in names_str.split(',')]
@@ -392,6 +401,20 @@
db.close()
+def update_ragflow_user_tenant(user_id: str):
+ db = SessionRagflow()
+ try:
+ if user_id:
+ db.query(RgUserTenant).filter( RgUserTenant.user_id==user_id, RgUserTenant.role=="invite").update({"role": "normal"})
+ db.query(RgUserTenant).filter( RgUserTenant.tenant_id==user_id, RgUserTenant.role=="invite").update({"role": "normal"})
+ else:
+ db.query(RgUserTenant).filter(RgUserTenant.role=="invite").update({"role": "normal"})
+ db.commit()
+ finally:
+ db.close()
+
+
if __name__ == "__main__":
- a = get_data_from_dify_v2([])
- print(a)
+ # a = get_data_from_dify_v2([])
+ # print(a)
+ update_ragflow_user_tenant("")
--
Gitblit v1.8.0