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

sycommon/auth/wecom_ldap_service.py

@@ -271,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}
@@ -375,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:

{sycommon_python_lib-0.2.6a1.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.6a1
+Version: 0.2.6a2
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.2.6a1.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=lo_t3sSQAYSGVofg1xe3YQik7VsI2ItFNZLxLVqlJmw,30530
+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.6a1.dist-info/METADATA,sha256=kubGNvAaxxgtJBUXszJQbZLD5CZwm29ACii7lzTJWMM,7913
-sycommon_python_lib-0.2.6a1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-sycommon_python_lib-0.2.6a1.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.6a1.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.6a1.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,,