From 8ef8418ff4e76d20953aa7588ab3aaf72d4d6e14 Mon Sep 17 00:00:00 2001
From: hackrobot <xiaoshuang.eric@gmail.com>
Date: Tue, 16 Jul 2024 07:53:56 +0800
Subject: [PATCH] update

---
 app/main.py | 67 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/app/main.py b/app/main.py
index 3d67c97..9a0c5c4 100644
--- a/app/main.py
+++ b/app/main.py
@@ -1,7 +1,7 @@
 from fastapi import FastAPI, HTTPException, Depends
-from fastapi.responses import JSONResponse
+from fastapi.responses import JSONResponse, PlainTextResponse
 from sqlalchemy.orm import Session
-from typing import List, Optional,Any
+from typing import List, Optional, Any
 
 from app import models, schemas, crud
 from app.database import SessionLocal, engine
@@ -23,6 +23,8 @@ app.add_middleware(
     allow_methods=["*"],  # 允许所有方法
     allow_headers=["*"],  # 允许所有请求头
 )
+
+
 # 依赖注入
 def get_db():
     db = SessionLocal()
@@ -32,46 +34,49 @@ def get_db():
         db.close()
 
 
-    
-    
 @app.get("/")
 def root():
     return {"message": "Hello World"}
 
+
 @app.get("/hello")
 def hello():
     return {"message": "Hello World"}
 
+
 # @app.get("/add", response_model=schemas.User)
 @app.get("/add")
+def add_user(nickname: Optional[Any] = None,
+             remark: Optional[Any] = None,
+             wechat_number: Optional[Any] = None,
+             wxid: Optional[Any] = None,
+             gender: Optional[Any] = None,
+             friendaddtime: Optional[Any] = None,
+             openid: Optional[Any] = None,
+             db: Session = Depends(get_db)):
+    crud.create_user(db=db,
+                     user=schemas.UserCreate(nickname=nickname,
+                                             remark=remark,
+                                             wechat_number=wechat_number,
+                                             wxid=wxid,
+                                             gender=gender,
+                                             friendaddtime=friendaddtime,
+                                             openid=openid))
+    # response=f'''{nickname}你好,\n我是机器人助理\n一名开发者,副业:跨境电商,#公众号:异度世界'''
+    # headers = {"Content-Type": "application/json"}
+    # return JSONResponse(content=response, headers=headers)
+    
+    response = f"{nickname}你好,\n我是机器人助理\n一名开发者,副业:跨境电商,#公众号:异度世界"
+    return PlainTextResponse(content=response)
+
+    # return '{nickname}你好,\n我是机器人助理\n一名开发者,副业:跨境电商,#公众号:异度世界'
 
-def add_user(
-    nickname: Optional[Any] = None,
-    remark: Optional[Any] = None,
-    wechat_number: Optional[Any] = None,
-    wxid: Optional[Any] = None,
-    gender: Optional[Any] = None,
-    friendaddtime: Optional[Any] = None,
-    openid: Optional[Any] = None,
-    db: Session = Depends(get_db)
-):
-    crud.create_user(db=db, user=schemas.UserCreate(
-        nickname=nickname, remark=remark, wechat_number=wechat_number,
-        wxid=wxid, gender=gender, friendaddtime=friendaddtime,
-        openid=openid))
-    response=f'''{nickname}你好,\n我是机器人助理\n一名开发者,副业:跨境电商,#公众号:异度世界'''
-    # content = {
-    #     "answer": response,
-    #     "answer_type": "text",
-    # }
-    headers = {"Content-Type": "application/json"}
-    return JSONResponse(content=response, headers=headers)
-    # return  f'''{nickname}你好,\n我是机器人助理\n一名开发者,副业:跨境电商,#公众号:异度世界'''
 
 @app.get("/users/")
 def read_users(skip: int = 0, limit: int = 10, db: Session = Depends(get_db)):
     return crud.get_users(db=db, skip=skip, limit=limit)
 
+
 @app.get("/user/{identifier}")
 def read_user(identifier: str, db: Session = Depends(get_db)):
     user = crud.get_user_by_openid_or_wxid(db, identifier=identifier)
@@ -79,6 +84,7 @@ def read_user(identifier: str, db: Session = Depends(get_db)):
         raise HTTPException(status_code=404, detail="User not found")
     return user
 
+
 @app.delete("/user/{user_id}")
 def delete_user(user_id: int, db: Session = Depends(get_db)):
     user = crud.get_user(db=db, user_id=user_id)
@@ -86,10 +92,13 @@ def delete_user(user_id: int, db: Session = Depends(get_db)):
         raise HTTPException(status_code=404, detail="User not found")
     return crud.delete_user(db=db, user=user)
 
+
 @app.put("/user/{identifier}")
-def update_user(identifier: str, user_update: schemas.UserUpdate, db: Session = Depends(get_db)):
+def update_user(identifier: str,
+                user_update: schemas.UserUpdate,
+                db: Session = Depends(get_db)):
     user = crud.get_user_by_openid_or_wxid(db, identifier=identifier)
     if user is None:
         raise HTTPException(status_code=404, detail="User not found")
-    
-    return crud.update_user(db=db, user=user, user_update=user_update)
\ No newline at end of file
+
+    return crud.update_user(db=db, user=user, user_update=user_update)