lightshortcuts 1.1.1 → 1.1.2

package/bin/lsc.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { writeFile } = require("fs");
+const { writeFile, existsSync } = require("fs");
 const path = require("path");
 const { Command } = require("commander");
 const inquirer = require("inquirer");
@@ -29,10 +29,14 @@ const info = (message, ...args) => {
 // 主目录下登录配置文件
 let confPath = path.join(process.cwd(), "./lsc.config.json");
 // 读取发布配置文件
-const lscrcPath = path.join(
-  process.cwd() || process.env.HOME || process.env.USERPROFILE,
+const currentDirConfig = path.join(process.cwd(), ".lscrc.json");
+const homeDirConfig = path.join(
+  process.env.HOME || process.env.USERPROFILE,
   ".lscrc.json",
 );
+const lscrcPath = existsSync(currentDirConfig)
+  ? currentDirConfig
+  : homeDirConfig;
 
 const defaultConfig = require("../lib/defaults");
 const {
@@ -46,7 +50,7 @@ const {
   sendWechatWebhook,
 } = require("../lib/core/api");
 
-program.version("1.1.1");
+program.version("1.1.2");
 
 // 登录并保存token
 let lightBaseURL = "";
@@ -97,6 +101,7 @@ let loginQuestions = [
       const { user_token } = await submitLogin({
         account: answers.account,
         password: ps,
+        maxRetries: 1,
       });
       if (user_token) {
         answers.token = user_token;
@@ -167,7 +172,7 @@ const loginAction = async function (env) {
             // log("登录响应:", res);
             if (autoLoginRes.user_token) {
               log(
-                `登录成功欢迎${autoLoginRes.user?.identity_name}`,
+                `登录成功！欢迎${autoLoginRes.user?.identity_name}`,
                 autoLoginRes.user_token,
               );
               //更新当前发布配置里面的token
@@ -266,8 +271,8 @@ program
 program
   .command("md5")
   .description("获取MD5密码")
-  .option("-p, --password <type>", "输入密码")
   .option("-e, --email <type>", "输入邮箱")
+  .option("-p, --password <type>", "输入密码")
   .action(async (opts) => {
     let { password, email } = opts;
     //如何没有密码或者邮箱，通过交互式输入
@@ -276,13 +281,13 @@ program
         .prompt([
           {
             type: "input",
-            name: "password",
-            message: "请输入密码:",
+            name: "email",
+            message: "请输入邮箱:",
           },
           {
             type: "input",
-            name: "email",
-            message: "请输入邮箱:",
+            name: "password",
+            message: "请输入密码:",
           },
         ])
         .then((answers) => {
@@ -365,6 +370,13 @@ program
           type: "input",
           message: "请输入离线包id：",
           name: "pkgid",
+          validate: (input) => {
+            if (!input || (typeof input === 'string' && input.trim() === '')) {
+              return "请输入离线包id";
+            }
+            return true;
+          },
+          filter: (input) => typeof input === 'string' ? input.trim() : input,
         },
         {
           type: "input",
@@ -437,28 +449,49 @@ program
             { key: 2, value: 2, name: "结束" },
           ],
         },
+        {
+          type: "confirm",
+          message: "是否要发布H5web应用？",
+          name: "publishH5webF",
+          default: false,
+        },
+        {
+          type: "input",
+          message: "请填写H5web应用ID，多个ID用逗号隔开：",
+          name: "publish_h5web_arr",
+          when: (answers) => answers.publishH5webF,
+          validate: (input) => {
+            if (!input || (typeof input === "string" && input.trim() === "")) {
+              return "请填写H5web应用ID";
+            }
+            return true;
+          },
+          filter: (input) => {
+            if (typeof input !== "string") return [];
+            return input
+              .trim()
+              .split(",")
+              .map((id) => id.trim())
+              .filter(Boolean);
+          },
+        },
+        {
+          type: "confirm",
+          message: "是否开启企业微信推送？",
+          name: "need_wechat_push",
+          default: false,
+        },
         {
           type: "input",
           message: "发布日志：",
           name: "release_desc",
           default: "功能更新",
           when: (answers) => {
+            delete answers.publishH5webF;
             initAnswers = Object.assign({}, answers);
-            // log("initAnswers",initAnswers);
             return true;
           },
         },
-        // {
-        //     type: "input",
-        //     message: "请输入API前缀地址：",
-        //     name: "lightBaseURL",
-        //     default: "https://xxx.xxx.xxx/lightadmin/pas-api",
-        //     when: (answers) => {
-        //         initAnswers = Object.assign({}, answers);
-        //         // log("initAnswers",initAnswers);
-        //         return true;
-        //     },
-        // },
         {
           type: "confirm",
           message: "是否使用以上配置？",

package/lib/LSC.js

@@ -158,7 +158,7 @@ async function publish(h5pkgid, app_id, app_name = "") {
 async function Main(h5pkgid, ids) {
   let tokenIsReady = await checkSession();
   if (tokenIsReady) {
-    info("会话有效，准备处理！");
+    info("会话有效，启动离线包发布流程！");
     const appList = await queryApp();
     // log("查询APP列表", appList);
     //检验APP列表是否包含ids中的所有应用
@@ -230,7 +230,7 @@ const publishH5web = async (pkg_id_arr, app_name = "") => {
 async function MainH5web(publish_h5web_arr) {
   let tokenIsReady = await checkSession();
   if (tokenIsReady) {
-    info("会话有效，准备处理！");
+    info("会话有效，启动H5web发布流程！");
     let chkH5webid = await queryCompList();
     let chkPkg = checkH5webAppIds(chkH5webid, publish_h5web_arr); //过滤id,只处理存在H5web离线包发布
     if (chkPkg && chkPkg.length > 0) {

package/lib/core/api.js

@@ -143,7 +143,7 @@ const getCaptcha = async function () {
         // 返回结果
         return { captchaId, captchaText };
       } catch (error) {
-        log("获取验证码失败:", error);
+        log(`\n获取验证码失败: ${error}`);
         throw error;
       }
     },
@@ -193,7 +193,7 @@ const ocrCaptcha = async function (base64) {
   );
 };
 //表单登录接受传入登录账号密码，返回token
-const submitLogin = async function (loginData = { account: "", password: "" }) {
+const submitLogin = async function (loginData = { account: "", password: "",maxRetries: 3 }) {
   return retryWrapper(
     async () => {
       // 校验登录账号密码是否为空
@@ -243,7 +243,7 @@ const submitLogin = async function (loginData = { account: "", password: "" }) {
       }
     },
     {
-      maxRetries: 6,
+      maxRetries: 3,
       delay: 3000,
       retryMessage: "登录",
     },

package/lib/defaults.js

@@ -15,6 +15,9 @@ var defaults = {
         pkg_dir: "./dist/", //离线包所在路径
         release_desc: "功能更新", //发布日志
         task_status: "0", //对上一版本的处理：0：发布，1：暂停，2：下架
+        need_wechat_push: false, //是否需要企业微信推送
+        webhookUrl: "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=XXXXX", //企业微信推送Webhook地址
+        publish_h5web_arr: [], //发布到指定H5web应用，默认不发布
     },
     lightBaseURL: "http://new-light-dev.ghzq",
 };

package/lsc.config.json

@@ -1,26 +1,23 @@
 {
-    "pkgid": "lscpkg",
-    "need_wechat_push": false,
+    "pkgid": "news",
     "set_pkg_version": "1.0.1",
     "ios_version_scope": "7.0.7",
     "android_version_scope": "7.0.7.0",
     "harmony_version_scope": "1.0.1",
     "publish_app_arr": [
-        "3542"
+        "3542",
+        "3543"
     ],
     "pkg_dir": "./dist/",
-    "pkg_zip_name": "lscdemo.zip",
+    "pkg_zip_name": "news",
     "task_status": 2,
+    "publishH5web": true,
+    "publish_h5web_arr": [
+        "323",
+        "533m"
+    ],
     "apps_name": {
         "3542": "开发版",
         "3543": "仿真版"
-    },
-    "publish_h5web_arr": [
-        "8112734868610136",
-        "8112734868610049"
-    ],
-    "h5web_name": {
-        "8112734868610136": "账户分析PC公版",
-        "8112734868610049": "账户分析超级终端版"
     }
 }

package/package.json

@@ -10,7 +10,7 @@
         "inquirer": "^8.2.0",
         "qs": "^6.10.3"
     },
-    "version": "1.1.1",
+    "version": "1.1.2",
     "description": "Light离线包自动发布工具",
     "main": "index.js",
     "scripts": {