diff --git a/app/__pycache__/__init__.cpython-312.pyc b/app/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000..4a27336 Binary files /dev/null and b/app/__pycache__/__init__.cpython-312.pyc differ diff --git a/app/__pycache__/main.cpython-312.pyc b/app/__pycache__/main.cpython-312.pyc new file mode 100644 index 0000000..aae9c5e Binary files /dev/null and b/app/__pycache__/main.cpython-312.pyc differ 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)