eprolo-cli 1.0.55 → 1.0.56

package/bin/eprolo-cli.js

@@ -91,29 +91,27 @@ async function postJsonWithRetry(url, body, config) {
 
   let result = await postJson(url, body, headers);
 
-  // if (result.statusCode === 401) {
-  //   // 刷新 token
-  //   const refreshRes = await postJson(REFRESH_API, {
-  //     accessToken: config.accessToken,
-  //     accountId: config.accountId,
-  //     shopId: config.shopId
-  //   });
-
-  //   if (refreshRes.statusCode >= 200 && refreshRes.statusCode < 300 && refreshRes.data.accessToken) {
-  //     // 更新凭据文件
-  //     config.accessToken = refreshRes.data.accessToken;
-  //     if (refreshRes.data.account) config.account = refreshRes.data.account;
-  //     writeConfig(config);
-
-  //     // 用新 token 重试
-  //     headers["authorization"] = `Bearer ${config.accessToken}`;
-  //     result = await postJson(url, body, headers);
-  //   } else {
-  //     const err = new Error("Token 刷新失败，请重新登录授权");
-  //     err.response = refreshRes.data;
-  //     throw err;
-  //   }
-  // }
+  if (result.code === 401) {
+    // 刷新 token
+    const refreshRes = await postJson(REFRESH_API, {},{
+      refreshToken: config.refreshToken
+    });
+
+    if (refreshRes.code === 0 && refreshRes.data.accessToken) {
+      // 更新凭据文件
+      config.accessToken = refreshRes.data.accessToken;
+      if (refreshRes.data.account) config.account = refreshRes.data.account;
+      writeConfig(config);
+
+      // 用新 token 重试
+      headers["accessToken"] = `${config.accessToken}`;
+      result = await postJson(url, body, headers);
+    } else {
+      const err = new Error("Token 刷新失败，请重新登录授权");
+      err.response = refreshRes.data;
+      throw err;
+    }
+  }
 
   if (result.code !== 0) {
     const err = new Error(`HTTP ${result.statusCode}`);
@@ -132,23 +130,21 @@ async function login(argv) {
   const userCode = process.env.EPROLO_USER_CODE;          // env 通道
   if (!userCode) { console.error("缺少用户密文：请在授权弹窗中填写"); process.exit(2); }
 
-  const defaultShop = readFlag(argv, "--default-shop");   // arg 通道，可能不存在
-
   const res = await postJson(LOGIN_API, { openApiKey: userCode });
 
-  if (res.statusCode < 200 || res.statusCode >= 300) {
+  if (res.code !== 0) {
     console.error(JSON.stringify({
       success: false,
-      errorMessage: "密文验证失败，请到账号设置页重新复制",
-      statusCode: res.statusCode,
+      errorMessage: res.error || "登录失败",
+      statusCode: res.code,
       response: res.data
     }));
     process.exit(1);
   }
 
-  const { account, accessToken, accountId, shopId } = res.data;
-  const config = { account, accessToken, defaultShop, accountId, shopId, version: 1 };
-  writeConfig(config);
+  // const { account, accessToken, accountId, shopId } = res.data;
+  // const config = { account, accessToken, defaultShop, accountId, shopId, version: 1 };
+  writeConfig(res.data);
 
   console.log("login ok");
   process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eprolo-cli",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "description": "CLI for Dianxiaobao ICBU AI publishing, authorization profile management, task submission, and task status checks.",
   "bin": {
     "eprolo": "bin/eprolo-cli.js"