@genduo/desk 0.5.2 → 0.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/jdy_secrets.py +30 -20
- package/package.json +1 -1
package/jdy_secrets.py
CHANGED
|
@@ -38,8 +38,17 @@ JDY_PWD_F_PASSWORD = "_widget_1729661480439" # Password (text)
|
|
|
38
38
|
JDY_API_KEY_TITLE = "api key 精细化运营"
|
|
39
39
|
JDY_MCP_KEYRING_SERVICE = "JDY_MCP"
|
|
40
40
|
JDY_MCP_KEYRING_ACCOUNT = "本机JDY服务器URL"
|
|
41
|
-
#
|
|
42
|
-
JDY_MCP_KEYRING_ACCOUNT_ALIASES = (
|
|
41
|
+
# 钥匙串访问里常见：服务/位置与账户同为「本机 JDY 服务器 URL」；亦兼容 JDY_MCP + 无空格旧名
|
|
42
|
+
JDY_MCP_KEYRING_ACCOUNT_ALIASES = (
|
|
43
|
+
"本机JDY服务器URL",
|
|
44
|
+
"本机 JDY 服务器 URL",
|
|
45
|
+
"服务器URL",
|
|
46
|
+
)
|
|
47
|
+
JDY_MCP_KEYRING_SERVICE_ALIASES = (
|
|
48
|
+
"本机JDY服务器URL",
|
|
49
|
+
"本机 JDY 服务器 URL",
|
|
50
|
+
"JDY_MCP",
|
|
51
|
+
)
|
|
43
52
|
|
|
44
53
|
# 别名（旧调用方）
|
|
45
54
|
JDY_MCP_SERVICE = JDY_MCP_KEYRING_SERVICE
|
|
@@ -55,25 +64,26 @@ def _get_mcp_url() -> str:
|
|
|
55
64
|
return env
|
|
56
65
|
try:
|
|
57
66
|
import keyring
|
|
58
|
-
for
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
67
|
+
for svc in JDY_MCP_KEYRING_SERVICE_ALIASES:
|
|
68
|
+
for acct in JDY_MCP_KEYRING_ACCOUNT_ALIASES:
|
|
69
|
+
v = keyring.get_password(svc, acct)
|
|
70
|
+
if v:
|
|
71
|
+
return v
|
|
62
72
|
except Exception:
|
|
63
73
|
pass
|
|
64
|
-
# keyring
|
|
65
|
-
for
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
74
|
+
# keyring 未装或读失败时：security CLI（通用密码；服务/账户多种写法）
|
|
75
|
+
for svc in JDY_MCP_KEYRING_SERVICE_ALIASES:
|
|
76
|
+
for acct in JDY_MCP_KEYRING_ACCOUNT_ALIASES:
|
|
77
|
+
try:
|
|
78
|
+
r = subprocess.run(
|
|
79
|
+
["security", "find-generic-password",
|
|
80
|
+
"-s", svc, "-a", acct, "-w"],
|
|
81
|
+
capture_output=True, text=True,
|
|
82
|
+
)
|
|
83
|
+
if r.returncode == 0 and (r.stdout or "").strip():
|
|
84
|
+
return (r.stdout or "").rstrip("\n")
|
|
85
|
+
except Exception:
|
|
86
|
+
pass
|
|
77
87
|
# 「密码」App 网站密码（用户常写成 本机 JDY 服务器 URL + jiandaoyun.com）
|
|
78
88
|
for acct in (
|
|
79
89
|
"本机JDY服务器URL",
|
|
@@ -103,7 +113,7 @@ def _get_mcp_url() -> str:
|
|
|
103
113
|
pass
|
|
104
114
|
raise RuntimeError(
|
|
105
115
|
"未找到 JDY MCP URL：请设置环境变量 JDY_MCP_URL，"
|
|
106
|
-
"
|
|
116
|
+
"或通用密码「本机 JDY 服务器 URL」（服务/账户同名；亦兼容 JDY_MCP），"
|
|
107
117
|
"或「密码」App 网站条目（账户 本机 JDY 服务器 URL）"
|
|
108
118
|
)
|
|
109
119
|
|