@genduo/desk 0.5.1 → 0.5.2
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 +31 -3
- package/package.json +1 -1
package/jdy_secrets.py
CHANGED
|
@@ -61,7 +61,7 @@ def _get_mcp_url() -> str:
|
|
|
61
61
|
return v
|
|
62
62
|
except Exception:
|
|
63
63
|
pass
|
|
64
|
-
# keyring 未装或读失败时：同条目的 security CLI
|
|
64
|
+
# keyring 未装或读失败时：同条目的 security CLI（通用密码）
|
|
65
65
|
for acct in JDY_MCP_KEYRING_ACCOUNT_ALIASES:
|
|
66
66
|
try:
|
|
67
67
|
r = subprocess.run(
|
|
@@ -74,9 +74,37 @@ def _get_mcp_url() -> str:
|
|
|
74
74
|
return (r.stdout or "").rstrip("\n")
|
|
75
75
|
except Exception:
|
|
76
76
|
pass
|
|
77
|
+
# 「密码」App 网站密码（用户常写成 本机 JDY 服务器 URL + jiandaoyun.com）
|
|
78
|
+
for acct in (
|
|
79
|
+
"本机JDY服务器URL",
|
|
80
|
+
"本机 JDY 服务器 URL",
|
|
81
|
+
"服务器URL",
|
|
82
|
+
):
|
|
83
|
+
for server in ("jiandaoyun.com", "www.jiandaoyun.com"):
|
|
84
|
+
try:
|
|
85
|
+
r = subprocess.run(
|
|
86
|
+
["security", "find-internet-password",
|
|
87
|
+
"-s", server, "-a", acct, "-w"],
|
|
88
|
+
capture_output=True, text=True,
|
|
89
|
+
)
|
|
90
|
+
if r.returncode == 0 and (r.stdout or "").strip():
|
|
91
|
+
return (r.stdout or "").rstrip("\n")
|
|
92
|
+
except Exception:
|
|
93
|
+
pass
|
|
94
|
+
# 仅按账户名扫（不限网站）
|
|
95
|
+
try:
|
|
96
|
+
r = subprocess.run(
|
|
97
|
+
["security", "find-internet-password", "-a", acct, "-w"],
|
|
98
|
+
capture_output=True, text=True,
|
|
99
|
+
)
|
|
100
|
+
if r.returncode == 0 and (r.stdout or "").strip():
|
|
101
|
+
return (r.stdout or "").rstrip("\n")
|
|
102
|
+
except Exception:
|
|
103
|
+
pass
|
|
77
104
|
raise RuntimeError(
|
|
78
|
-
"未找到 JDY MCP URL：请设置环境变量 JDY_MCP_URL
|
|
79
|
-
"
|
|
105
|
+
"未找到 JDY MCP URL：请设置环境变量 JDY_MCP_URL，"
|
|
106
|
+
"或通用密码 JDY_MCP/本机JDY服务器URL，"
|
|
107
|
+
"或「密码」App 网站条目（账户 本机 JDY 服务器 URL）"
|
|
80
108
|
)
|
|
81
109
|
|
|
82
110
|
|