From 6846a4c98a793e74ae17b47f04a0ff8b210aeb24 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 01 四月 2025 16:52:51 +0800
Subject: [PATCH] 授权license
---
app/api/auth.py | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index 3637cda..7cbfdcf 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -1,31 +1,24 @@
+# -*- coding: utf-8 -*-
import json
-import time
from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
from sqlalchemy.ext.asyncio import AsyncSession
-
-from Log import logger
from app.api import Response, pwd_context, get_current_user
-from app.api.user import reset_user_pwd
from app.config.config import settings
-from app.config.const import RAGFLOW, BISHENG, DIFY
+from app.config.const import chat_server, RAGFLOW, workflow_server, DIFY, TMP_DICT, SYSTEM_ID, SYSTEM_STATUS_ON
+from app.models import SystemDataModel
from app.models.app_token_model import AppToken
from app.models.base_model import get_db
from app.models.postgresql_base_model import get_pdb
-from app.models.token_model import upsert_token, update_token
+from app.models.token_model import upsert_token
from app.models.user import UserCreate, LoginData
-from app.models.user_model import UserModel, UserAppModel
-from app.service.auth import authenticate_user, create_access_token, is_valid_password, save_register_user, \
- update_user_token, UserAppDao, update_user_info, password_rsa
-from app.service.bisheng import BishengService
-from app.service.service_token import get_new_token, get_token, update_user_group
-from app.service.v2.app_register import AppRegisterDao
-from app.service.difyService import DifyService
+from app.models.user_model import UserModel, UserTokenModel
+from app.service.auth import authenticate_user, create_access_token, is_valid_password, save_register_user, password_rsa
+from app.service.service_token import get_token
from app.service.ragflow import RagflowService
from sqlalchemy.future import select
-from app.utils.password_handle import generate_password
router = APIRouter()
@@ -138,20 +131,24 @@
except Exception as e:
return Response(code=500, msg=f"Failed to login with {app['id']}: {str(e)}")
"""
+ system = db.query(SystemDataModel).filter_by(id=SYSTEM_ID).first()
+ if not system or system.status != SYSTEM_STATUS_ON:
+ return Response(code=400, msg="绯荤粺鐘舵�佸紓甯革紝璇锋巿鏉冩縺娲诲悗鎿嶄綔锛�")
# 鍒涘缓鏈湴token
- access_token = create_access_token(data={"sub": user.username, "user_id": user.id})
+ access_token = create_access_token(data={"sub": user.username, "user_id": user.id, "lex": system.expired_at.strftime('%Y-%m-%d %H:%M:%S')})
# await update_token(db, user.id, access_token, token_dict)
# await update_user_token(db, user.id, token_dict)
- '''
+ token_dict = {}
+ user_tokens = db.query(UserTokenModel).all()
+ for user_token in user_tokens:
+ token_dict[TMP_DICT[user_token.id]] = user_token.access_token
result = await pdb.execute(select(AppToken).where(AppToken.id == user.id))
db_app_token = result.scalars().first()
if isinstance(access_token, bytes):
access_token = access_token.decode()
if not db_app_token:
- app_token_str = json.dumps(token_dict)
- # print(app_token_str)
- app_token = AppToken(id=user.id, token=access_token, app_token=app_token_str)
+ app_token = AppToken(id=user.id, token=access_token, app_token=json.dumps(token_dict))
pdb.add(app_token)
await pdb.commit()
await pdb.refresh(app_token)
@@ -160,7 +157,7 @@
db_app_token.app_token = json.dumps(token_dict)
await pdb.commit()
await pdb.refresh(db_app_token)
- '''
+
return Response(code=200, msg="Login successful", data={
"access_token": access_token,
"token_type": "bearer",
@@ -173,6 +170,8 @@
@router.post("/v2/register", response_model=Response)
async def register_v2(user: UserCreate, db=Depends(get_db)):
+ if "@" in user.username:
+ return Response(code=400, msg="Username cannot contain @")
password = await password_rsa(user.password)
if not is_valid_password(password):
return Response(code=400, msg="The password must be at least 8 and contain both numbers and letters")
@@ -215,7 +214,7 @@
@router.get("/v2/sync", response_model=Response)
async def sync_user_tenant(userFlag: str, db=Depends(get_db)):
- app_register = AppRegisterDao(db).get_app_by_id(RAGFLOW)
- if app_register:
- is_update = await update_user_group(db, userFlag)
+ # app_register = AppRegisterDao(db).get_app_by_id(RAGFLOW)
+ # if app_register:
+ # is_update = await update_user_group(db, userFlag)
return Response(code=200, msg="success", data={})
\ No newline at end of file
--
Gitblit v1.8.0