From 82e48e375e0df4ace18e5da882559a2d3d6e4b50 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Thu, 27 Feb 2025 18:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/endpoints/wechat.py | 26 +++++++++++++-------------
 app/core/config.py          |  3 +--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/api/endpoints/wechat.py b/app/api/endpoints/wechat.py
index d2b78b4..7a825c0 100644
--- a/app/api/endpoints/wechat.py
+++ b/app/api/endpoints/wechat.py
@@ -66,17 +66,17 @@ async def wechat_phone_login(
         if not phone:
             return error_response(code=400, message="手机号为空")
         
-        # # # 获取企业微信的 userid
-        # wecom_client = WecomClient()
-        # wecom_info = await wecom_client.miniprogram_to_userid(openid=openid)
-        # print(f"获取到的企业微信用户信息: {wecom_info}")
+        #获取企业微信的 userid
+        wecom_client = WecomClient()
+        wecom_info = await wecom_client.miniprogram_to_userid(openid=openid)
+        print(f"获取到的企业微信用户信息: {wecom_info}")
         
-        # wecom_userid = None
-        # wecom_pending_id = None
+        wecom_userid = None
+        wecom_pending_id = None
         
-        # if wecom_info:
-        #     wecom_userid = wecom_info.get("userid")
-        #     wecom_pending_id = wecom_info.get("pending_id")
+        if wecom_info:
+            wecom_userid = wecom_info.get("userid")
+            wecom_pending_id = wecom_info.get("pending_id")
 
 
         # 查找或创建用户
@@ -93,8 +93,8 @@ async def wechat_phone_login(
                 password=get_password_hash("123456"),
                 openid=openid,  # 保存 openid
                 unionid=unionid,  # 保存 unionid
-                # wecom_userid=wecom_userid,
-                # wecom_pending_id=wecom_pending_id
+                wecom_userid=wecom_userid,
+                wecom_pending_id=wecom_pending_id
             )
             db.add(user)
             db.flush()
@@ -106,8 +106,8 @@ async def wechat_phone_login(
             # 更新现有用户的 openid 和 unionid
             user.openid = openid
             user.unionid = unionid
-            # user.wecom_userid = wecom_userid
-            # user.wecom_pending_id = wecom_pending_id
+            user.wecom_userid = wecom_userid
+            user.wecom_pending_id = wecom_pending_id
             db.commit()
         
         # 创建访问令牌
diff --git a/app/core/config.py b/app/core/config.py
index 74360ee..790ddb3 100644
--- a/app/core/config.py
+++ b/app/core/config.py
@@ -83,8 +83,7 @@ class Settings(BaseSettings):
 
     # 企业微信配置
     WECHAT_CORP_ID: str = "ww0e3897ec32009e20"
-    WECHAT_CORP_SECRET: str = "FLghJS0t3LiE6M6z6fxL9QraIwGGTLuJg0vNrXgQ-zE"    
-    WECHAT_CORP_AGENT_ID: str = "1000002"
+    WECHAT_CORP_SECRET: str = "qh38-OlDnJPTENjOfZegVVv5ePhlhKhrzGPzNOixWQo"    
     WECHAT_CORP_TOKEN: str = "5zEDkbGNPbBoh" 
     WECHAT_CORP_ENCODING_AES_KEY: str = "VTFtnosOeX7cdnRDBBCE0JTC5s7W7iFP8o86Oowo2w8"
     #WECHAT_CORP_AGENT_SECRET: str = "66666666666666666666666666666666"