From f5d1a9b4c2c44e3822b2587ea06a3085750e8226 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Wed, 26 Mar 2025 14:38:27 +0800
Subject: [PATCH] 'commit'

---
 AI/WxMini/Milvus/Config/MulvusConfig.py       |   2 ++
 .../__pycache__/MulvusConfig.cpython-310.pyc  | Bin 1144 -> 1183 bytes
 AI/WxMini/Start.py                            |  32 +++++++++++++-----
 AI/WxMini/Utils/MySQLUtil.py                  |  10 ++++--
 .../__pycache__/MySQLUtil.cpython-310.pyc     | Bin 7272 -> 7330 bytes
 AI/WxMini/__pycache__/Start.cpython-310.pyc   | Bin 9691 -> 11961 bytes
 6 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/AI/WxMini/Milvus/Config/MulvusConfig.py b/AI/WxMini/Milvus/Config/MulvusConfig.py
index 1b89b234..15634e42 100644
--- a/AI/WxMini/Milvus/Config/MulvusConfig.py
+++ b/AI/WxMini/Milvus/Config/MulvusConfig.py
@@ -35,6 +35,8 @@ MYSQL_USER = "root"
 MYSQL_PASSWORD = "DsideaL147258369"
 MYSQL_DB_NAME = "ai_db"
 
+# JWT密匙
+JWT_SECRET_KEY = "DsideaL4r5t6y7u"
 #  ----------------下面的配置需要根据情况进行修改-------------------------
 
 '''
diff --git a/AI/WxMini/Milvus/Config/__pycache__/MulvusConfig.cpython-310.pyc b/AI/WxMini/Milvus/Config/__pycache__/MulvusConfig.cpython-310.pyc
index 215d4d8f42e8321c2e8bee2d546b74a492bc9105..3f2c9382155f25985ded2694a2436251c3f172f7 100644
GIT binary patch
delta 252
zcmeytF`tt+pO=@50SFe%f1KVwkyn<nY@)V1TZ&+mASc7b3RO<&DCrdLU<OT@iHlAM
z-r{#D&P+*7^f4(iEitP!FWsEQ$j+!CbBo<KINrlQI0VcH@DB>PB?J_4_V@8|bq?|L
z_lx&)^mV;8c_xzs<E_cJm>T%`yuw4`gI%42Ttni$T_Yz)GAr5L;&uvk_67=o6?3@y
zxdixo`i0!$@(&J<4+wH~^Nfh%403e`ndj+pi`UoR#nmU?F~AdK!mY_Wnf2KOfj%h`
hocxa2kI`zfEsLrI3o{clix3MV9I~)5v9NHk0RXc!Ml%2a

delta 212
zcmbQw`GbQupO=@50SHw3AE(Dn<dtPCnyBs0#>tQ(7$rEdLY0*}m_bu|;<6K)>lxV@
zHKe21eS_mY{DVWli~#?jkSHObh_k<skE?Ttr@vpkpQEp9)Z}$c4vbNg-!nB#u4h)X
zi{f?)b@p}*fk<+=`nd%7d-{dk;_?p;jt>ZOb@Pn4#Tn%44$|-G62<H5@8aqc?-<}2
s@9i2HHTfR1J{t$njYS-jg<1R<EhZ<isERSMun4g*!XXO_P=JFC08#-pdjJ3c

diff --git a/AI/WxMini/Start.py b/AI/WxMini/Start.py
index 408726cb..740a4446 100644
--- a/AI/WxMini/Start.py
+++ b/AI/WxMini/Start.py
@@ -29,7 +29,7 @@ logger = logging.getLogger(__name__)
 # 配置 JWT
 SECRET_KEY = "DsideaL4r5t6y7u"  # 替换为你的密钥
 ALGORITHM = "HS256"
-ACCESS_TOKEN_EXPIRE_MINUTES = 30
+ACCESS_TOKEN_EXPIRE_MINUTES = 24 * 60 * 30 # 一个月有效期
 # 密码加密上下文
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 # OAuth2 密码模式
@@ -214,9 +214,13 @@ async def login(
         }
     }
 
+
 # 与用户交流聊天
 @app.post("/aichat/reply")
-async def reply(person_id: str = Form(...), prompt: str = Form(...)):
+async def reply(person_id: str = Form(...),
+                prompt: str = Form(...),
+                current_user: dict = Depends(get_current_user)
+                ):
     """
     接收用户输入的 prompt，调用大模型并返回结果
     :param person_id: 用户会话 ID
@@ -335,7 +339,9 @@ async def reply(person_id: str = Form(...), prompt: str = Form(...)):
                 "url": url,
                 "search_time": end_time - start_time,  # 返回查询耗时
                 "duration": duration,  # 返回大模型的回复时长
-                "response": result  # 返回大模型的回复
+                "response": result,  # 返回大模型的回复
+                "login_name": current_user["login_name"],
+                "person_name": current_user["person_name"]
             }
         else:
             raise HTTPException(status_code=500, detail="大模型未返回有效结果")
@@ -352,7 +358,8 @@ async def reply(person_id: str = Form(...), prompt: str = Form(...)):
 async def get_chat_log(
         person_id: str,
         page: int = Query(default=1, ge=1, description="当前页码（默认值为 1，但会动态计算为最后一页）"),
-        page_size: int = Query(default=10, ge=1, le=100, description="每页记录数")
+        page_size: int = Query(default=10, ge=1, le=100, description="每页记录数"),
+        current_user: dict = Depends(get_current_user)
 ):
     """
     获取指定会话的聊天记录，默认返回最新的记录（最后一页）
@@ -362,7 +369,7 @@ async def get_chat_log(
     :return: 分页数据
     """
     # 调用 get_chat_log_by_session 方法
-    result = await get_chat_log_by_session(app.state.mysql_pool, person_id, page, page_size)
+    result = await get_chat_log_by_session(app.state.mysql_pool, current_user, person_id, page, page_size)
     return result
 
 
@@ -371,7 +378,8 @@ async def get_chat_log(
 async def get_risk_chat_logs(
         risk_flag: int = Query(..., description="风险标志（1 表示有风险，0 表示无风险）"),
         page: int = Query(default=1, ge=1, description="当前页码（默认值为 1）"),
-        page_size: int = Query(default=10, ge=1, le=100, description="每页记录数（默认值为 10，最大值为 100）")
+        page_size: int = Query(default=10, ge=1, le=100, description="每页记录数（默认值为 10，最大值为 100）"),
+        current_user: dict = Depends(get_current_user)
 ):
     """
     获取聊天记录，支持分页和风险标志过滤
@@ -396,14 +404,16 @@ async def get_risk_chat_logs(
             "total": total,
             "page": page,
             "page_size": page_size,
-            "logs": logs
+            "logs": logs,
+            "login_name": current_user["login_name"],
+            "person_name": current_user["person_name"]
         }
     }
 
 
 # 获取上传OSS的授权Token
 @app.get("/aichat/get_oss_upload_token")
-async def get_oss_upload_token():
+async def get_oss_upload_token(current_user: dict = Depends(get_current_user)):
     # 获取 STS 临时凭证
     sts_token = get_sts_token()
     return {
@@ -414,10 +424,13 @@ async def get_oss_upload_token():
             "access_key_secret": sts_token['AccessKeySecret'],
             "security_token": sts_token['SecurityToken'],
             "bucket_name": BUCKET_NAME,
-            "endpoint": ENDPOINT
+            "endpoint": ENDPOINT,
+            "login_name": current_user["login_name"],
+            "person_name": current_user["person_name"]
         }
     }
 
+
 # 受保护的接口示例
 @app.get("/aichat/protected-route")
 async def protected_route(current_user: dict = Depends(get_current_user)):
@@ -435,6 +448,7 @@ async def protected_route(current_user: dict = Depends(get_current_user)):
         }
     }
 
+
 # 运行 FastAPI 应用
 if __name__ == "__main__":
     import uvicorn
diff --git a/AI/WxMini/Utils/MySQLUtil.py b/AI/WxMini/Utils/MySQLUtil.py
index 46704c25..4155b90d 100644
--- a/AI/WxMini/Utils/MySQLUtil.py
+++ b/AI/WxMini/Utils/MySQLUtil.py
@@ -47,8 +47,9 @@ async def truncate_chat_log(mysql_pool):
 
 from aiomysql import DictCursor
 
+
 # 分页查询聊天记录
-async def get_chat_log_by_session(mysql_pool, person_id, page=1, page_size=10):
+async def get_chat_log_by_session(mysql_pool, current_user, person_id, page=1, page_size=10):
     """
     根据 person_id 查询聊天记录，并按 id 降序分页
     :param mysql_pool: MySQL 连接池
@@ -106,7 +107,9 @@ async def get_chat_log_by_session(mysql_pool, person_id, page=1, page_size=10):
                 "total": total,
                 "page": page,
                 "page_size": page_size,
-                "total_pages": total_pages
+                "total_pages": total_pages,
+                "login_name": current_user["login_name"],
+                "person_name": current_user["person_name"]
             }
 
 
@@ -167,6 +170,7 @@ async def get_user_by_login_name(mysql_pool, login_name: str) -> Optional[Dict]:
             columns = [column[0] for column in cursor.description]
             return dict(zip(columns, row))
 
+
 # 查询聊天记录
 async def get_chat_logs_by_risk_flag(mysql_pool, risk_flag: int, offset: int, page_size: int) -> (List[Dict], int):
     """
@@ -208,4 +212,4 @@ async def get_chat_logs_by_risk_flag(mysql_pool, risk_flag: int, offset: int, pa
                 columns = [column[0] for column in cursor.description]
                 logs = [dict(zip(columns, row)) for row in rows]
                 return logs, total
-            return [], 0
\ No newline at end of file
+            return [], 0
diff --git a/AI/WxMini/Utils/__pycache__/MySQLUtil.cpython-310.pyc b/AI/WxMini/Utils/__pycache__/MySQLUtil.cpython-310.pyc
index eb5566472edfb7b810fc5a7c94e1eca39f2cdcbc..11f241b7773a3f5e954946ced14a0ab4c50c70ce 100644
GIT binary patch
delta 744
zcmY+BO=uHA6vyZ7XLdJ<v585uDHy3#Lj7oIDhZZ;(4whdRa>QgU<lo`7Td(mCiF5(
zg%&)^oGe8e!GnT`<mT102SuUm!Amb9dhw)Q>b#^L9N6Ff-<$V;v-{?2?pZ!m4TVf1
z*6pXe3y<G~c2!%&aDN5G8@Jzy#~tOSmR{TNRHklAHMs#<GD#e%KsFsuW7@Xj$V{4t
zhSbgi5jnN7U*jlA;^|ChN`g3QCt-?Bya1EiIz~LB)j?wtQ<yO?|JOzP*Tpll%%n5S
z+}0Zeh@(4!4Z_R`vJRfbEYV&T_5cINND@IaNgQiS=O45ISm&zV8-210Ae=yMqF<UO
znP78VACln?e`sDv`Q}n}VX;!Il$OiB^`K1MYCFj2{Jq(0(mpW>+AqL=nWNbtwT1M9
zb9G9~m0GdxmMKkPNft4PNF$CQ1`wzDU29CkZFhn{xAGAUG*EuWcH(=TaB`0hH@{i7
z1UasT$Dz(A!`(2_Tn_&M7~%IKRd~dABFBug*b2X;dEj74f|q<HS`ePM(QfGDU!vz=
zllR0j@o7=v8+6gVUz}emEzlvf4f5}5XVZ)QR3Zh8ClMWp^L#Ct&_1EO$hVU2@yjTu
z1Tqpmf%>Yz3!v9fw=6MKrvyIpGj`XFJcc>MC4r39nh%}9MEh)1X+#2XMZi~Rb=AFP
z%vI}Rg6_&vYfio*F2Ze}ah<=ikHTyI(e8&?uB3h(9!B#B0teyCZjI8`zsif18lB~l
Qt|>zaj0HO4(Vjzp0TZOFN&o-=

delta 719
zcmY+A&ubGw6vyZ7uVgnrXp$vOHiD6s))1_;4XvR;D=lqm)v7H85v-9lAy^Zb1QeOI
z2YV84?;xmPq6aAjq2y2S;!$tXqdn-wLq#uosPmF4bYMSx=R5EFcILg#e>)SZhe8&U
ztNLKCqVI(EbbMpm#(U{Ba%dUpjYpm)w3gCT+mK@m%vFl)`Att3dP{Rv0cB__Jr|ht
z^!8zmt0kFd2t%m-%+(W2s1EadLg{IndH!w(Lx50)zpNhVV*KmknJ0zGSA^N}wHYwi
z=lVC9FlX6g@GN1;_KJ-AT=S)l`-UyQ<KSV$myO|l0GR-GopQ=D%UGQyUqOW%_|#fd
zGCKaSvN#-=9tv<rzLuv5V}x-+ns9<JO32}hz<GmC8q@eCkPm8q?9cIo1dJT;sZKWN
zC@_I@;ThogBs>6x&b#n$fC6sy)nOBpk>S1>nccP4>y>J4tya2sr?U_#DexAzV?`PL
z85@9EOxW}A3~$+)_*JSld9`tOt-M~U@H|~&yz|Po^szb8^Moj&_+NFmHf>K!d?ax}
z;^7GHI}ZLzu54T+?~+7D;ipJ1No)bXLi%X@le8L&gu^lhk5fTEAwifVOb`|&GKV9)
zMn><Zq|$_L=CV|~8n5FACmf-9?rL%njou%Z@vAck+ZarZ!YZCkeIJ~nV1dvbn%Zb`
e-W`Zqtu^^79Yk>_5X0NYCQa3U&L54(hU~w;qMeig

diff --git a/AI/WxMini/__pycache__/Start.cpython-310.pyc b/AI/WxMini/__pycache__/Start.cpython-310.pyc
index b123c031b1c6249b4ab7c0e3128be98bc7f8c797..fddac2d0d149a89f9202b542ae03d3cb6cf06561 100644
GIT binary patch
delta 5911
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

delta 3675
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
THwwaA?3ADQn^Y1L<(vNpoxfvm