From 054689e1581f6ae0c49b74cf933e0a5b3831098c Mon Sep 17 00:00:00 2001
From: hackrobot <xiaoshuang.eric@gmail.com>
Date: Tue, 16 Jul 2024 11:59:40 +0800
Subject: [PATCH] update

---
 app/__pycache__/main.cpython-310.pyc    | Bin 2862 -> 4667 bytes
 app/__pycache__/models.cpython-310.pyc  | Bin 681 -> 673 bytes
 app/__pycache__/schemas.cpython-310.pyc | Bin 1216 -> 1214 bytes
 app/main.py                             | 114 +++++++++++++++++++-----
 4 files changed, 92 insertions(+), 22 deletions(-)

diff --git a/app/__pycache__/main.cpython-310.pyc b/app/__pycache__/main.cpython-310.pyc
index 2cff541635ef26a4fff08934998120dc5ba03e2e..09617168696321ee0793ab0eb5b140f3e6f1725e 100644
GIT binary patch
literal 4667
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

literal 2862
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
VoBe}1rSF~UA=tZ{Iu?#2^gr)(pD_Rc

diff --git a/app/__pycache__/models.cpython-310.pyc b/app/__pycache__/models.cpython-310.pyc
index ab08cdf68a0189707aaecd00c002126a31218622..1f4257dbde796fe51cd537226f493a653627ce18 100644
GIT binary patch
delta 77
zcmZ3<x{#GOpO=@50SF$go0@iXBkwjwF5a}F%+$P;#FUiD=NToH4V<lFLW@(2ieplX
gGLvImQj4=o@(W@T^HPfPGgC556ALmY3o^|B0MjuVvj6}9

delta 85
zcmZ3;x{{SQpO=@50SKObo|1NaBkwjw9{#kV%+$P;_{5Zy_{nD(B{j{QtztrpQ;UjY
oQj0Q^V_Z^;vrF;|Vsb0v(-MnI5(_fp3ySiyQj<$2b27~U0M$7ji~s-t

diff --git a/app/__pycache__/schemas.cpython-310.pyc b/app/__pycache__/schemas.cpython-310.pyc
index 3ee5a0495a93361a2ec9066c613a0f33337fc5ce..548693167f0752dc6313fe8341a43096f9709904 100644
GIT binary patch
delta 38
scmX@WxsQ`KpO=@50SNA|o0=xSk++PIi#M$(Gc_+IF(qYlKcgWt0MJqkJOBUy

delta 40
ucmdnTd4Q8QpO=@50SGQ~PEAwX$Xmw9!=F}^nVOdppO}&ozqyyukQo5h&kIWc

diff --git a/app/main.py b/app/main.py
index 9a0c5c4..ea4f1d3 100644
--- a/app/main.py
+++ b/app/main.py
@@ -1,4 +1,5 @@
-from fastapi import FastAPI, HTTPException, Depends
+from sqlite3 import IntegrityError
+from fastapi import BackgroundTasks, FastAPI, HTTPException, Depends, Query
 from fastapi.responses import JSONResponse, PlainTextResponse
 from sqlalchemy.orm import Session
 from typing import List, Optional, Any
@@ -6,12 +7,20 @@ from typing import List, Optional, Any
 from app import models, schemas, crud
 from app.database import SessionLocal, engine
 from fastapi.middleware.cors import CORSMiddleware
+from PIL import Image
+import qrcode
+import os
+from fastapi.responses import FileResponse
+from fastapi.staticfiles import StaticFiles
 
 # 初始化数据库
 models.Base.metadata.create_all(bind=engine)
 
 app = FastAPI()
 
+# 挂载 images 文件夹
+app.mount("/images", StaticFiles(directory="images"), name="images")
+
 # 允许所有来源跨域访问（不推荐用于生产环境）
 origins = ["*"]
 
@@ -34,17 +43,33 @@ def get_db():
         db.close()
 
 
-@app.get("/")
-def root():
-    return {"message": "Hello World"}
+# @app.get("/")
+# def root():
+#     return {"message": "Hello World"}
 
 
 @app.get("/hello")
 def hello():
-    return {"message": "Hello World"}
+    response = f"你好,\n..........................\n一名开发者\n副业:跨境电商\n#公众号:异度世界\n..........................\n回复关键词,了解更多:\n1. 微信机器人\n2. 数字游民\n3. 加群\n..........................\n[该消息是接受好友自动回复]"
+    return PlainTextResponse(content=response)
+
+
+def create_user_task(db: Session, user: schemas.UserCreate):
+    try:
+        existing_user = db.query(
+            models.User).filter(models.User.wxid == user.wxid).first()
+        if existing_user:
+            # 可以选择更新用户信息或返回错误
+            # print("用户已存在")
+            return "用户已存在"
+        db.add(user)
+        db.commit()
+    except IntegrityError:
+        db.rollback()
+        print("用户已存在")
+        return "用户已存在"
 
 
-# @app.get("/add", response_model=schemas.User)
 @app.get("/add")
 def add_user(nickname: Optional[Any] = None,
              remark: Optional[Any] = None,
@@ -53,23 +78,21 @@ def add_user(nickname: 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)
+             db: Session = Depends(get_db),
+             background_tasks: BackgroundTasks = None):
 
-    # return '{nickname}你好,\n我是机器人助理\n一名开发者,副业:跨境电商,#公众号:异度世界'
+    user_data = schemas.UserCreate(nickname=nickname,
+                                   remark=remark,
+                                   wechat_number=wechat_number,
+                                   wxid=wxid,
+                                   gender=gender,
+                                   friendaddtime=friendaddtime,
+                                   openid=openid)
+    if background_tasks:
+        background_tasks.add_task(create_user_task, db, user_data)
+
+    response = f"{nickname}你好,\n..........................\n一名开发者\n副业:跨境电商\n#公众号:异度世界\n..........................\n回复关键词,了解更多:\n1. 微信机器人\n2. 数字游民\n3. 加群\n..........................\n[该消息是接受好友自动回复]"
+    return PlainTextResponse(content=response)
 
 
 @app.get("/users/")
@@ -102,3 +125,50 @@ def update_user(identifier: str,
         raise HTTPException(status_code=404, detail="User not found")
 
     return crud.update_user(db=db, user=user, user_update=user_update)
+
+
+@app.get("/generate_qr")
+def generate_qr(wxid: Optional[str] = Query(None), db: Session = Depends(get_db)):
+    # 选择网络图片
+    # return FileResponse('images/111.png')
+
+
+
+    url = "https://web.hackrobot.cn"
+    if wxid:
+        url += f"?wxid={wxid}"
+
+    # 创建二维码
+    qr = qrcode.QRCode(version=1, box_size=5, border=2)  # 调整二维码大小
+    qr.add_data(url)
+    qr.make(fit=True)
+    img = qr.make_image(fill='black', back_color='white')
+
+    # 保存二维码图像
+    qr_image_path = f"images/{wxid}-qr_code.png"
+    img.save(qr_image_path)
+
+    # 加载原图
+    group_image_path = "images/group.jpg"
+    
+    # 在原图上添加二维码（右下角）
+    group_image = Image.open(group_image_path)
+    qr_image = Image.open(qr_image_path)
+
+    # 将二维码放置在右下角
+    qr_image = qr_image.resize((200, 200))  # 调整二维码大小
+    qr_position = (group_image.width - qr_image.width - 50, group_image.height - qr_image.height - 50)  # 距离20像素
+    # 在原图上添加二维码
+    group_image.paste(qr_image, qr_position)
+
+
+    # 保存合成的图像
+    combined_image_path = f"images/combined_{wxid}.jpg"
+    group_image.save(combined_image_path)
+    # 压缩图片
+    group_image.save(combined_image_path, "JPEG", quality=10)  # 85 是压缩质量，可根据需要调整
+    
+    # 删除二维码文件
+    os.remove(qr_image_path)
+    print(combined_image_path)
+    return FileResponse(combined_image_path)
\ No newline at end of file