From b6f799706f7b6569f029b9193a027f2b4ecea9b0 Mon Sep 17 00:00:00 2001 From: eric Date: Tue, 9 Sep 2025 19:21:30 +0800 Subject: [PATCH] 's' --- app/__pycache__/__init__.cpython-312.pyc | Bin 0 -> 132 bytes app/__pycache__/main.cpython-312.pyc | Bin 0 -> 4484 bytes app/main.py | 49 +++++++++++++---------- run.py | 2 +- 4 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 app/__pycache__/__init__.cpython-312.pyc create mode 100644 app/__pycache__/main.cpython-312.pyc diff --git a/app/__pycache__/__init__.cpython-312.pyc b/app/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4a27336e64390e3f7608357d9c3f32c2e70b1dfd GIT binary patch literal 132 zcmX@j%ge<81UDb;&j8VnK?FMZ%mNgd&QQsq$>_I|p@<2{`wUX^OWD~frl2T4D>bPO4oID^L$35Ep|OADI~$8H<>K FEC7189*h70 literal 0 HcmV?d00001 diff --git a/app/__pycache__/main.cpython-312.pyc b/app/__pycache__/main.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..aae9c5eebf9d2c2289436814706def83dc2a1b6b GIT binary patch literal 4484 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 Zj#ZF&57)5L)czPj%?31XvK9k2{|A9FDSH3_ literal 0 HcmV?d00001 diff --git a/app/main.py b/app/main.py index a56a6fe..3a7efdf 100644 --- a/app/main.py +++ b/app/main.py @@ -90,27 +90,32 @@ async def payh5(item: dict): # 返回结果中包含`jsapi`字段，该字段的值即是前端发起时所需的6个支付参数 headers = {"content-type": "application/x-www-form-urlencoded"} response = requests.post(request_url, data=order, headers=headers) - # if response: - # print(response.json()) - # return response.json() + print('response.json()----',response.json()) + if response: + print(response.json()) + return response.json() - payjs_result = response.json() - # 判断支付是否成功（这里根据 PayJS 返回结果自行判断） - if payjs_result.get("return_code") == "SUCCESS": - # 支付成功，新增 memos 用户 - memos_data = { - "username": item.get("username", f"user{timenew}"), - "password": item.get("password", "123456"), - "role": "USER", - "state": "NORMAL" - } - memos_headers = { - "Content-Type": "application/json", - "Authorization": f"Bearer {MEMOS_TOKEN}" - } - memos_resp = requests.post(MEMOS_API, json=memos_data, headers=memos_headers) - memos_result = memos_resp.json() - return JSONResponse({"payjs": payjs_result, "memos": memos_result}) + + +class CreateUserRequest(BaseModel): + username: str = None + password: str = None + +@app.post("/create_user") +async def create_user(item: CreateUserRequest): + timenew = str(int(time.time())) + memos_data = { + "username": item.username or f"user{timenew}", + "password": item.password or "123456", + "role": "USER", + "state": "NORMAL" + } + memos_headers = { + "Content-Type": "application/json", + "Authorization": f"Bearer {MEMOS_TOKEN}" + } + memos_resp = requests.post(MEMOS_API, json=memos_data, headers=memos_headers) + memos_result = memos_resp.json() + print('memos_result-',memos_result) + return memos_result - # 支付未成功，直接返回 PayJS 信息 - return JSONResponse({"payjs": payjs_result}) \ No newline at end of file diff --git a/run.py b/run.py index dd31e82..66ccfa3 100644 --- a/run.py +++ b/run.py @@ -2,5 +2,5 @@ import uvicorn if __name__ == "__main__": # uvicorn.run("app.main:app", host="0.0.0.0", port=8700, reload=True) - uvicorn.run("app.main:app", host="127.0.0.1", port=8700, reload=True) + uvicorn.run("app.main:app", host="0.0.0.0", port=8200, reload=True)