sycommon-python-lib 0.2.6a0__py3-none-any.whl → 0.2.6a2__py3-none-any.whl

sycommon/auth/wecom_ldap_service.py

@@ -73,7 +73,8 @@ class LDAPFullUser(BaseModel):
 class WeComLDAPUser(BaseModel):
     """企微-LDAP 关联用户（最终返回结果）"""
 
-    wecom_userid: str  # 企微 userid
+    wecom_userid: str  # 企微 userid（明文工号，如 "0633"）
+    employee_id: Optional[str] = None  # 员工工号（与 wecom_userid 同值，语义更明确）
     wecom_name: str  # 企微中文名
     wecom_english_name: Optional[str] = None  # 企微英文名
     wecom_departments: List[str] = []  # 企微部门列表
@@ -270,24 +271,19 @@ class WeComLDAPService(metaclass=SingletonMeta):
     async def _get_bot_access_token(self) -> str:
         """获取用于 open_userid 解码的 access_token
 
-        本地开发（IS_DEV=true）时，使用 WeComDecodeUserID 配置的凭据，
-        线上直接使用 WeCom 配置的凭据。
+        始终使用 WeComDecodeUserID 配置的凭据。
+        WeCom 通讯录 token 用于查用户/部门；
+        WeComDecodeUserID token 专用于 batch/openuserid_to_userid 解码。
         """
-        import os
         from sycommon.config.Config import Config
 
-        is_dev = os.environ.get("IS_DEV") == "true"
         config = Config().config.get("llm", {})
-
-        if is_dev:
-            wecom_config = config.get("WeComDecodeUserID", {}) or config.get("WeCom", {})
-        else:
-            wecom_config = config.get("WeCom", {})
+        wecom_config = config.get("WeComDecodeUserID", {})
 
         corpid = wecom_config.get("corpid", "")
         corpsecret = wecom_config.get("corpsecret", "")
         if not corpid or not corpsecret:
-            raise ValueError("解码凭据配置不完整，需要配置 llm.WeComDecodeUserID 或 llm.WeCom")
+            raise ValueError("解码凭据配置不完整，需要配置 llm.WeComDecodeUserID")
 
         url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken"
         params = {"corpid": corpid, "corpsecret": corpsecret}
@@ -374,10 +370,11 @@ class WeComLDAPService(metaclass=SingletonMeta):
     async def _get_wecom_user(self, userid: str) -> Optional[dict]:
         """获取单个企微用户详情
 
-        IS_DEV=true 时使用 WeComDecodeUserID 的 token，
-        线上使用 WeCom 的 token。
+        始终使用 WeCom 通讯录 token 查询用户详情。
+        注意：WeComDecodeUserID token 只能用于 open_userid 解码，
+        不能查 /cgi-bin/user/get（会返回 errcode 60111）。
         """
-        token = await self._get_bot_access_token()
+        token = await self._get_access_token()
         url = f"https://qyapi.weixin.qq.com/cgi-bin/user/get"
         async with aiohttp.ClientSession() as session:
             async with session.get(url, params={"access_token": token, "userid": userid}) as resp:
@@ -603,8 +600,9 @@ class WeComLDAPService(metaclass=SingletonMeta):
 
         # 3. 合并返回
         result = await self._build_wecom_ldap_user(user_data, ldap_index)
-        # 保留原始传入的 wecom_userid
-        result.wecom_userid = wecom_userid
+        # 保留解码后的明文 userid（工号），而非原始密文
+        result.wecom_userid = decoded_userid
+        result.employee_id = decoded_userid
         return result
 
     async def get_all_users(self) -> List[WeComLDAPUser]:
@@ -623,6 +621,7 @@ class WeComLDAPService(metaclass=SingletonMeta):
         results = []
         for u in wecom_users:
             result = await self._build_wecom_ldap_user(u, ldap_index)
+            result.employee_id = result.wecom_userid
             results.append(result)
 
         matched = sum(1 for r in results if r.matched)
@@ -671,3 +670,137 @@ class WeComLDAPService(metaclass=SingletonMeta):
         if user.matched and user.ldap_user:
             return user.ldap_user.username
         return None
+
+    # ─── Redis 映射缓存 ───
+
+    # Redis key 前缀（保持与旧版 digital_work 命名兼容）
+    _UID_MAP_PREFIX = "digital_work:wecom_uid_map:"
+    _LDAP_TO_WECOM_PREFIX = "digital_work:ldap_to_wecom:"
+    _EMPLOYEE_ID_PREFIX = "digital_work:wecom_employee_id:"
+    _MAP_TTL = 7 * 24 * 3600  # 7 天
+
+    @staticmethod
+    def _get_redis():
+        """获取 RedisService（懒加载）"""
+        from sycommon.database.redis_service import RedisService
+        return RedisService
+
+    async def _get_cached_mapping(self, wecom_userid: str) -> Optional[str]:
+        """从 Redis 读取 wecom_userid -> unified_id 映射"""
+        try:
+            rs = self._get_redis()
+            val = await rs.get(f"{self._UID_MAP_PREFIX}{wecom_userid}")
+            if val:
+                return val
+        except Exception:
+            pass
+        return None
+
+    async def _set_cached_mapping(self, wecom_userid: str, unified_id: str):
+        """将 wecom_userid <-> unified_id 双向映射写入 Redis，同时保存工号"""
+        try:
+            rs = self._get_redis()
+            # 正向: wecom_userid -> unified_id (LDAP sAMAccountName)
+            await rs.set(
+                f"{self._UID_MAP_PREFIX}{wecom_userid}",
+                unified_id,
+                ex=self._MAP_TTL,
+            )
+            # 反向: unified_id -> wecom_userid（用于定时任务等主动推送场景）
+            await rs.set(
+                f"{self._LDAP_TO_WECOM_PREFIX}{unified_id}",
+                wecom_userid,
+                ex=self._MAP_TTL,
+            )
+            # 员工工号: unified_id -> wecom_userid（即工号，如 "0633"）
+            await rs.set(
+                f"{self._EMPLOYEE_ID_PREFIX}{unified_id}",
+                wecom_userid,
+                ex=self._MAP_TTL,
+            )
+        except Exception as e:
+            SYLogger.warning(f"[WeComLDAP] 缓存映射到 Redis 失败: {e}")
+
+    async def resolve_unified_user_id(self, wecom_userid: str) -> str:
+        """将企微 userid 解析为统一 user_id（LDAP sAMAccountName）
+
+        优先从 Redis 缓存读取，缓存未命中时查 LDAP 并写入 Redis。
+        匹配到 LDAP 返回 sAMAccountName，否则直接使用企微 userid。
+
+        Args:
+            wecom_userid: 企微用户ID（如 "0633"、密文 open_userid）
+
+        Returns:
+            统一 user_id（小写，如 "osulcode.xiao"）
+        """
+        # 1. 查 Redis 缓存
+        cached = await self._get_cached_mapping(wecom_userid)
+        if cached:
+            return cached
+
+        # 2. 查企微 + LDAP
+        unified_id = wecom_userid
+        employee_id = wecom_userid  # 默认用工号就是原始 userid
+        try:
+            result = await self.get_user_info(wecom_userid)
+            employee_id = result.wecom_userid  # get_user_info 返回解码后的明文工号
+            if result.matched and result.ldap_user and result.ldap_user.username:
+                unified_id = result.ldap_user.username
+                SYLogger.info(
+                    f"[WeComLDAP] 用户映射: wecom={wecom_userid} -> ldap={unified_id}")
+            else:
+                SYLogger.info(
+                    f"[WeComLDAP] 用户映射: wecom={wecom_userid} -> 未匹配LDAP，回退={unified_id}")
+        except Exception as e:
+            SYLogger.warning(
+                f"[WeComLDAP] 解析统一 user_id 失败: wecom_userid={wecom_userid}, error={e}")
+
+        # 3. 写入 Redis 缓存（统一小写）
+        unified_id = unified_id.lower().replace(" ", "")
+        await self._set_cached_mapping(employee_id, unified_id)
+
+        return unified_id
+
+    async def get_employee_id(self, unified_id: str) -> Optional[str]:
+        """从 Redis 获取企微员工工号
+
+        Args:
+            unified_id: 统一用户 ID（LDAP sAMAccountName，如 "osulcode.xiao"）
+
+        Returns:
+            员工工号（如 "0633"），未找到返回 None
+        """
+        try:
+            rs = self._get_redis()
+            uid = unified_id.lower().replace(" ", "")
+            val = await rs.get(f"{self._EMPLOYEE_ID_PREFIX}{uid}")
+            if val:
+                return val
+        except Exception:
+            pass
+        return None
+
+    async def batch_set_uid_mapping(self, mapping: dict[str, str]):
+        """批量写入企微-LDAP 映射到 Redis（pipeline 优化，含反向映射和工号）
+
+        Args:
+            mapping: {wecom_userid: unified_id, ...}
+        """
+        if not mapping:
+            return
+        try:
+            rs = self._get_redis()
+            client = rs.get_client()
+            async with client.pipeline(transaction=True) as pipe:
+                for wecom_userid, unified_id in mapping.items():
+                    uid = unified_id.lower().replace(" ", "")
+                    # 正向
+                    pipe.set(f"{self._UID_MAP_PREFIX}{wecom_userid}", uid, ex=self._MAP_TTL)
+                    # 反向
+                    pipe.set(f"{self._LDAP_TO_WECOM_PREFIX}{uid}", wecom_userid, ex=self._MAP_TTL)
+                    # 员工工号
+                    pipe.set(f"{self._EMPLOYEE_ID_PREFIX}{uid}", wecom_userid, ex=self._MAP_TTL)
+                await pipe.execute()
+            logging.info(f"[WeComLDAP] 批量写入 {len(mapping)} 条映射到 Redis")
+        except Exception as e:
+            SYLogger.warning(f"[WeComLDAP] 批量缓存映射到 Redis 失败: {e}")

{sycommon_python_lib-0.2.6a0.dist-info → sycommon_python_lib-0.2.6a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.6a0
+Version: 0.2.6a2
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.2.6a0.dist-info → sycommon_python_lib-0.2.6a2.dist-info}/RECORD

@@ -147,7 +147,7 @@ sycommon/auth/ldap_service.py,sha256=fOcpVov5LWJkBk62qbTaltks1c4la7JsbD104KfdBOI
 sycommon/auth/oa_cache.py,sha256=u673y-mK-xo24pSqvfjL68_YFASO2zoxd_iAQ0HetCo,3491
 sycommon/auth/oa_crypto.py,sha256=xpY1R1Bj3KLENXB0TuThB6Eku1E9PYjcoSpOdgDmCgc,1898
 sycommon/auth/oa_service.py,sha256=kLepV9zgqpZoaB73DRPpMA5tJJQjoaDtQPdzBcGXeak,6235
-sycommon/auth/wecom_ldap_service.py,sha256=VTGw8UQFBCH-lhJZ3N5TRcLy7Qk3Q4uENisXYFhkESk,24817
+sycommon/auth/wecom_ldap_service.py,sha256=8mCOClbdlvky58ISXmV4UfSfUF0aWmPWykACNgjgfTg,30488
 sycommon/config/Config.py,sha256=J5VjolqHmhYTBZwTyfSHv9X5cHMfN6kqY2ryHF4LJPw,6785
 sycommon/config/DatabaseConfig.py,sha256=ILiUuYT9_xJZE2W-RYuC3JCt_YLKc1sbH13-MHIOPhg,804
 sycommon/config/ElasticsearchConfig.py,sha256=fO9ZPMgJxSg1-UyDJ90wO6UvYy-jscwPJsSkXgx9qTU,2308
@@ -282,8 +282,8 @@ sycommon/tools/syemail.py,sha256=BDFhgf7WDOQeTcjxJEQdu0dQhnHFPO_p3eI0-Ni3LhQ,561
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
 sycommon/xxljob/__init__.py,sha256=7eoBlQxv-B39IfRSCY2bkqdGYs1QRe1umAWd88VMEEM,86
 sycommon/xxljob/xxljob_service.py,sha256=JIEJaGXhqrTLcyxlyynSrsHg9bBnDNzX-D4qIWLRPUE,6815
-sycommon_python_lib-0.2.6a0.dist-info/METADATA,sha256=SZCYl4eAehrnZBS5MnF5Rr-VMP3XbDcKv5XbHQ8GPhI,7913
-sycommon_python_lib-0.2.6a0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-sycommon_python_lib-0.2.6a0.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.6a0.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.6a0.dist-info/RECORD,,
+sycommon_python_lib-0.2.6a2.dist-info/METADATA,sha256=Utz4dW5hwd9N97fayxjevOMQ-wweDQZ2H_YdlsJmKl4,7913
+sycommon_python_lib-0.2.6a2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sycommon_python_lib-0.2.6a2.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.6a2.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.6a2.dist-info/RECORD,,