字典表添加 接口路由地址修改

dbgpt/app/apps/vadmin/auth/utils/login.py

@@ -40,7 +40,7 @@ import jwt
 router = APIRouter()
 
 
-@router.post("/v2/login", summary="API 手机号密码登录", description="Swagger API 文档登录认证")
+@router.post("/api/login", summary="API 手机号密码登录", description="Swagger API 文档登录认证")
 async def api_login_for_access_token(
     request: Request,
     data: OAuth2PasswordRequestForm = Depends(),
@@ -63,14 +63,52 @@ async def api_login_for_access_token(
     # await VadminLoginRecord.create_login_record(db, record, True, request, resp)
     return resp
 
+@router.post("/login", summary="手机号密码登录", description="员工登录通道，限制最多输错次数，达到最大值后将is_active=False")
+async def login_for_access_token(
+    request: Request,
+    data: LoginForm,
+    manage: LoginManage = Depends(),
+    db: AsyncSession = Depends(db_getter)
+):
+    try:
+        if data.method == "0":
+            result = await manage.password_login(data, db, request)
+        # elif data.method == "1":
+        #     result = await manage.sms_login(data, db, request)
+        else:
+            raise ValueError("无效参数")
+
+        if not result.status:
+            raise ValueError(result.msg)
+
+        access_token = LoginManage.create_token(
+            {"sub": result.user.telephone, "is_refresh": False, "password": result.user.password}
+        )
+        expires = timedelta(minutes=settings.REFRESH_TOKEN_EXPIRE_MINUTES)
+        refresh_token = LoginManage.create_token(
+            payload={"sub": result.user.telephone, "is_refresh": True, "password": result.user.password},
+            expires=expires
+        )
+        resp = {
+            "access_token": access_token,
+            "refresh_token": refresh_token,
+            "token_type": "bearer",
+            "is_reset_password": result.user.is_reset_password,
+            "is_wx_server_openid": result.user.is_wx_server_openid
+        }
+       # await VadminLoginRecord.create_login_record(db, data, True, request, resp)
+        return SuccessResponse(resp)
+    except ValueError as e:
+# await VadminLoginRecord.create_login_record(db, data, False, request, {"message": str(e)})
+        return ErrorResponse(msg=str(e))
 
 
-@router.get("/v2/getMenuList", summary="获取当前用户菜单树")
+@router.get("/getMenuList", summary="获取当前用户菜单树")
 async def get_menu_list(auth: Auth = Depends(FullAdminAuth())):
     return SuccessResponse(await MenuDal(auth.db).get_routers(auth.user))
 
 
-@router.post("/v2/token/refresh", summary="刷新Token")
+@router.post("/token/refresh", summary="刷新Token")
 async def token_refresh(refresh: str = Body(..., title="刷新Token")):
     error_code = status.HTTP_401_UNAUTHORIZED
     try:

dbgpt/app/dbgpt_server.py

@@ -96,6 +96,7 @@ def mount_routers(app: FastAPI):
     from dbgpt.serve.agent.app.endpoints import router as app_v2
     from dbgpt.app.apps.vadmin.auth.utils.login import router as login
     from dbgpt.app.apps.vadmin.auth.views import router as views
+    from dbgpt.app.apps.system.views import router as system_views
 
     app.include_router(api_v1, prefix="/api", tags=["Chat"])
     app.include_router(api_v2, prefix="/api", tags=["ChatV2"])
@@ -105,8 +106,9 @@ def mount_routers(app: FastAPI):
     app.include_router(gpts_v1, prefix="/api", tags=["GptsApp"])
     app.include_router(app_v2, prefix="/api", tags=["App"])
     app.include_router(knowledge_router, tags=["Knowledge"])
-    app.include_router(login, prefix="/api", tags=["System"])
-    app.include_router(views, prefix="/api", tags=["System"])
+    app.include_router(login, prefix="/api/v2/auth", tags=["System"])
+    app.include_router(views, prefix="/api/v2/vadmin/auth", tags=["System"])
+    app.include_router(system_views, prefix="/api/v2/vadmin/system", tags=["System"])
 
 
 def mount_static_files(app: FastAPI):