@infly/libs 2.0.26 → 2.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infly/libs",
-  "version": "2.0.26",
+  "version": "2.0.36",
   "description": "工具组件库",
   "main": "index.js",
   "scripts": {
@@ -8,7 +8,9 @@
     "postinstall": "node index.js",
     "publishPkg": "npm version patch && npm publish --access=public --registry=https://registry.npmjs.org/",
     "preview": "infly-libs --preview",
-    "preview:no-build": "infly-libs --preview --no-build"
+    "preview:no-build": "infly-libs --preview --no-build",
+    "origin:preview": "infly-libs --preview",
+    "origin:preview:no-build": "infly-libs --preview --no-build"
   },
   "bin": {
     "infly-libs": "bin/cli.js"
@@ -50,12 +52,11 @@
     "html-webpack-plugin": "^5.5.3"
   },
   "infly": {
-    "zipOptions": {
+    "buildConfigs": {
       "buildFoldName": "[构建后目录名] 可选, 默认取值vue.config.js的outputDir, 配置化 eg: postal-benefits-level-pc",
       "outputPath": "[输出文件目录链接] eg: ./ ",
       "enabled": "[是否启用压缩] eg: true",
       "gitAuto": "[是否自动提交git] eg: true",
-      "gitAutoPushRepos": "[自动提交推送git构建仓库] eg: frontend",
       "gitAutoPushReposBranchMap": {
         "release-eg": "develop-eg [自动提交推送项目构建分支和构建仓库推送分支对应配置，必须]"
       },
@@ -73,7 +74,7 @@
     "versionConfig": {
       "mainVersion": "[主版本号] 可选, 默认取值项目package version, eg: 1",
       "links": {
-        "master": "[master分支构建文件推送地址] eg: e.sutpay.com",
+        "master": "[master分支构建文件推送地址] eg: https://e.sutpay.com",
         "release": "[release分支构建文件推送地址] eg: http://114.132.55.214:8081/"
       },
       "platformName": "[用以split的项目平台名称] eg: 邮惠权益平台-运营端",

package/script/git-automation/index.js

@@ -84,7 +84,10 @@ function getLastCommitByFile(filePath) {
  * @param {String} gitStatusLine 带文件状态的
  * @returns
  */
-function isBuildFile(targetProjectOutputDir = "", gitLine = "", sliceLen = -2) {
+function isBuildFile(targetProjectOutputDir = "", gitLine = "", sliceLen = -1) {
+  if (!targetProjectOutputDir) {
+    return true;
+  }
   // 统一路径分隔符
   targetProjectOutputDir = targetProjectOutputDir.replace(/\\/g, "/");
 
@@ -119,25 +122,23 @@ function checkGitStatus(excludeDir, extraFilter, extraParams) {
     const files = execSync(`git${targetProjectOutputDirCmd} status --porcelain -z`, { encoding: "utf8" })
       .toString()
       .split("\u0000")
-      .filter((line) => line.trim());
-    // .map((line) => line.substring(3).trim()); // 提取文件路径
+      .filter((file) => file.trim() && isBuildFile(targetProjectOutputDir, file));
     const excludeFiles = []; // 非指定构建相关文件
     const includeFiles = []; // 指定的构建相关文件
 
-    if (onlyCheckStatus) {
+    if (onlyCheckStatus || targetProjectOutputDirCmd) {
       return files || [];
     }
 
     console.log(global.logColor.success, `🚀 ${startLogText}`);
 
+    // 进行当前项目文件检查，如果有其它非配置文件则取消自动提交改为用户手动确认
     files.forEach((file) => {
       const existsDelFile = deleteOldFile.find((item) => file.includes(item));
       if (
         file.includes(`${excludeDir}/`) ||
         file.includes(versionFileName) ||
         file.includes(extraFilter) ||
-        isBuildFile(targetProjectOutputDir, file) ||
-        file.includes(`${gitAutoPushRepos}/`) || // 放宽文件判断条件，因为可能存在同时构建frontend/ea、frontend/e的情况
         existsDelFile
       ) {
         includeFiles.push(file);
@@ -149,6 +150,8 @@ function checkGitStatus(excludeDir, extraFilter, extraParams) {
     if (excludeFiles.length > 0) {
       throw new Error(`存在非构建文件未提交，请手动确定提交信息，本次自动提交终止\n${excludeFiles.join("\n")}`);
     }
+
+    return includeFiles || [];
   } catch (err) {
     console.error(global.logColor.error, `❌ 自动化构建Git状态检查存在问题：${err.message}`);
     process.exit(1);
@@ -186,8 +189,11 @@ function autoGitProcess(buildFoldName, newFileName, extraParams = {}) {
     targetProjectOutputDir,
     gitAutoPushReposBranchMap = {},
     targetProjectOutputDirCmd = gitAutoPushRepos ? ` -C ${targetProjectOutputDir}` : "",
-    projectName,
+    projectName
   } = extraParams || {};
+  // 每次执行自动分支提交先先进行校验
+  const fileList = checkGitStatus(buildFoldName, newFileName, extraParams) || [];
+
   const { commitMsg, branch } = gitInfo || {};
   const gitRepos = gitAutoPushRepos ? `构建仓库: ${targetProjectOutputDir}` : `当前项目: ${projectName}`;
   let tempGitAutoCommitText = gitAutoCommitText ? gitAutoCommitText.replace("{version}", newVersion) : "";
@@ -211,17 +217,21 @@ function autoGitProcess(buildFoldName, newFileName, extraParams = {}) {
   }
 
   // 先执行构建仓库的推送，防止git提交信息被覆盖
-  runGitCommand(addCmd);
-  runGitCommand(commitCmd);
-  runGitCommand(pushCommand);
+  if (fileList.length > 0) {
+    runGitCommand(addCmd);
+    runGitCommand(commitCmd);
+    runGitCommand(pushCommand);
+  }
 
   // 后执行当前项目的分支自动推送
   if (gitAutoPushRepos) {
-    const overrideParams = { ...extraParams, gitAutoPushRepos: false };
-    const fileList = checkGitStatus(buildFoldName, newFileName, { ...overrideParams, onlyCheckStatus: true });
-    if (fileList.length > 0) {
-      autoGitProcess(buildFoldName, newFileName, overrideParams); // 执行自动推送当前项目的git信息
-    }
+    const overrideParams = {
+      ...extraParams,
+      targetProjectOutputDir: "",
+      targetProjectOutputDirCmd: "",
+      gitAutoPushRepos: false
+    }; // 确保所有配置为非构建仓库配置
+    autoGitProcess(buildFoldName, newFileName, overrideParams); // 执行自动推送当前项目的git信息
   }
 
   console.log(global.logColor.success, `✅ Git \x1b[34m${gitRepos}\x1b[32m 自动提交和推送成功！`);
@@ -240,6 +250,7 @@ async function autoBranchProcess(config) {
   const pullCmd = `git${targetProjectOutputDirCmd} pull origin ${tempBranch}`;
   const fileList = checkGitStatus(undefined, undefined, {
     onlyCheckStatus: true,
+    targetProjectOutputDir,
     targetProjectOutputDirCmd,
     startLogText: "Git自动化开始执行..."
   });
@@ -254,7 +265,7 @@ async function autoBranchProcess(config) {
   }
 
   if (fileList.length > 0) {
-    console.error(global.logColor.error, `❌ 构建仓库存在未提交文件，请检查`);
+    console.error(global.logColor.error, `❌ 构建仓库 ${targetProjectOutputDir} 存在未提交文件，请检查`);
     process.exit(1);
   }
 
@@ -390,7 +401,7 @@ function pullPackagesFromMaster(packagesDir, targetBranch = "master") {
         stdio: "pipe"
       });
 
-      console.log(global.logColor.success, `✅ ${module}: 成功更新到最新代码`);
+      console.log(global.logColor.success, `✅ \x1b[34m${module}\x1b[32m[${targetBranch}]: 更新到最新代码`);
       results.push({ module, success: true });
     } catch (error) {
       console.error(global.logColor.error, `❌ ${module}: 操作失败 - ${error.message}`);
@@ -425,6 +436,104 @@ function findPackagesDir(currentDir) {
   return null;
 }
 
+/**
+ * 检查指定目录的 Git 状态
+ * @param {string} dirPath - 目录的绝对路径
+ * @param {string} dirName - 目录名称（用于日志显示）
+ */
+function checkSingleDirGitStatus(dirPath, dirName) {
+  const fs = require("fs");
+
+  if (!fs.existsSync(dirPath)) {
+    console.log(global.logColor.warning, `⚠️  ${dirName} 目录不存在: ${dirPath}`);
+    return { hasUncommitted: false, changes: [] };
+  }
+
+  const gitPath = path.join(dirPath, ".git");
+  if (!fs.existsSync(gitPath)) {
+    console.log(global.logColor.warning, `⚠️  ${dirName} 不是 git 仓库，跳过检查`);
+    return { hasUncommitted: false, changes: [] };
+  }
+
+  try {
+    const statusOutput = execSync("git status --porcelain", {
+      cwd: dirPath,
+      encoding: "utf8"
+    }).trim();
+
+    if (statusOutput) {
+      console.log(global.logColor.error, `❌ ${dirName}: 存在未提交的更改`);
+      console.log(global.logColor.error, `   ${statusOutput.split("\n").join("\n   ")}`);
+      return {
+        hasUncommitted: true,
+        changes: statusOutput.split("\n"),
+        path: dirPath
+      };
+    } else {
+      // console.log(global.logColor.success, `✅ ${dirName}: 工作区干净`);
+      return { hasUncommitted: false, changes: [] };
+    }
+  } catch (error) {
+    console.error(global.logColor.error, `❌ ${dirName}: 检查失败 - ${error.message}`);
+    return {
+      hasUncommitted: true,
+      error: error.message,
+      path: dirPath
+    };
+  }
+}
+
+/**
+ * 切换指定目录到目标分支并拉取最新代码
+ * @param {string} dirPath - 目录的绝对路径
+ * @param {string} dirName - 目录名称（用于日志显示）
+ * @param {string} targetBranch - 目标分支名
+ */
+function pullSingleDirFromBranch(dirPath, dirName, targetBranch = "master") {
+  const fs = require("fs");
+
+  if (!fs.existsSync(dirPath)) {
+    console.log(global.logColor.warning, `⚠️  ${dirName} 目录不存在: ${dirPath}`);
+    return { success: false, reason: "目录不存在" };
+  }
+
+  const gitPath = path.join(dirPath, ".git");
+  if (!fs.existsSync(gitPath)) {
+    console.log(global.logColor.warning, `⚠️  ${dirName} 不是 git 仓库，跳过操作`);
+    return { success: false, reason: "不是 git 仓库" };
+  }
+
+  try {
+    // 获取当前分支
+    const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", {
+      cwd: dirPath,
+      encoding: "utf8"
+    }).trim();
+
+    // 如果不在目标分支，则切换
+    if (currentBranch !== targetBranch) {
+      // console.log(global.logColor.info, `   ${dirName}: 切换到 ${targetBranch} 分支...`);
+      execSync(`git checkout ${targetBranch}`, {
+        cwd: dirPath,
+        stdio: "pipe"
+      });
+    }
+
+    // 拉取最新代码
+    // console.log(global.logColor.info, `   ${dirName}: 拉取 ${targetBranch} 最新代码...`);
+    execSync(`git pull origin ${targetBranch}`, {
+      cwd: dirPath,
+      stdio: "pipe"
+    });
+
+    console.log(global.logColor.success, `✅ \x1b[34m${dirName}\x1b[32m[${targetBranch}]: 更新到最新代码`);
+    return { success: true };
+  } catch (error) {
+    console.error(global.logColor.error, `❌ ${dirName}: 操作失败 - ${error.message}`);
+    return { success: false, reason: error.message };
+  }
+}
+
 /**
  * 完整的 packages 检查和更新流程
  * @param {string} packagesDir - packages 目录的绝对路径
@@ -465,6 +574,42 @@ async function checkAndUpdatePackages(outPackagesDir, targetBranch = "master") {
       console.log(global.logColor.warning, `\n⚠️  有 ${failedUpdates.length} 个模块更新失败，但可以继续执行`);
     }
 
+    // 4. 检查和更新 postal-benefits-platform（如果当前是 postal-benefits-platform-level）
+    const currentProjectName = require(path.resolve(process.cwd(), "package.json")).name;
+    if (currentProjectName === "postal-benefits-platform-level") {
+      // console.log(global.logColor.info, `\n🚀 开始检查和更新 postal-benefits-platform...`);
+
+      // 获取 postal-benefits-platform 的路径
+      const appsDir = path.resolve(packagesDir, "..", "apps");
+      const postalPlatformDir = path.join(appsDir, "postal-benefits-platform");
+
+      // 获取 postal-benefits-platform-level 当前分支
+      const currentLevelBranch = execSync("git rev-parse --abbrev-ref HEAD", {
+        cwd: process.cwd(),
+        encoding: "utf8"
+      }).trim();
+
+      // 检查 postal-benefits-platform 是否有未提交的更改
+      const platformCheckResult = checkSingleDirGitStatus(postalPlatformDir, "postal-benefits-platform");
+
+      if (platformCheckResult.hasUncommitted) {
+        console.log(global.logColor.error, `\n❌ postal-benefits-platform 存在未提交的更改`);
+        console.log(global.logColor.error, `\n请先提交或储藏这些更改后再继续执行！`);
+        process.exit(1);
+      }
+
+      // 切换到与 postal-benefits-platform-level 相同的分支并拉取最新代码
+      const platformUpdateResult = pullSingleDirFromBranch(
+        postalPlatformDir,
+        "postal-benefits-platform",
+        currentLevelBranch
+      );
+
+      if (!platformUpdateResult.success) {
+        console.log(global.logColor.warning, `\n⚠️  postal-benefits-platform 更新失败，但可以继续执行`);
+      }
+    }
+
     // console.log(global.logColor.success, `\n🎉 packages 检查和更新流程完成！`);
     return updateResults;
   } catch (error) {
@@ -484,5 +629,7 @@ module.exports = {
   autoBranchProcess,
   checkPackagesGitStatus,
   pullPackagesFromMaster,
-  checkAndUpdatePackages
+  checkAndUpdatePackages,
+  checkSingleDirGitStatus,
+  pullSingleDirFromBranch
 };

package/script/index.js

@@ -2,25 +2,25 @@ module.exports = {
   previewList: [
     {
       key: "preview",
-      value: "@infly/libs --preview"
+      value: "infly-libs --preview"
     },
     {
       key: "preview:no-build",
-      value: "@infly/libs --preview --no-build"
+      value: "infly-libs --preview --no-build"
     }
   ],
   buildList: [
     {
-      key: "infly:build:prod",
-      value: "@infly/libs beforeBuild && vue-cli-service build && @infly/libs afterBuild"
+      key: "build:prod",
+      value: "infly-libs beforeBuild && vue-cli-service build && infly-libs afterBuild"
     },
     {
-      key: "infly:build:stage",
-      value: "@infly/libs beforeBuild && vue-cli-service build --mode staging && @infly/libs afterBuild"
+      key: "build:stage",
+      value: "infly-libs beforeBuild && vue-cli-service build --mode staging && infly-libs afterBuild"
     },
     {
-      key: "infly:build:test",
-      value: "@infly/libs beforeBuild && @infly/libs afterBuild"
+      key: "build:test",
+      value: "infly-libs beforeBuild && infly-libs afterBuild"
     }
   ]
 };

package/script/webhook/webhook.js

@@ -7,9 +7,10 @@ function postVersionFileAndMsg(publishText, extraParams = {}) {
     webhookAtUser = [],
     webhookExtraText = "",
     gitAutoPushRepos,
-    gitAutoPushReposBranchMap
+    gitAutoPushReposBranchMap,
+    repos
   } = extraParams || {};
-  const { branch, commitMsg } = gitInfo || {};
+  const { branch, commitMsg, author } = gitInfo || {};
   const GITPATH = `https://gitee.com/gdinfly_1/${projectName}/blob/${branch}/${newFileName}`;
   const UPLOADURL = `https://qyapi.weixin.qq.com/cgi-bin/webhook/upload_media?key=08ea37af-c6f5-47dc-8fab-0833707c70b8&type=file`;
   /* const data = {
@@ -24,8 +25,8 @@ function postVersionFileAndMsg(publishText, extraParams = {}) {
         });
     } */
   let content = publishText;
-  if (gitAutoPushRepos) {
-    content = `${publishText}\n构建文件：已推送对应仓库【${gitAutoPushRepos}】分支【${gitAutoPushReposBranchMap[branch]}】`;
+  if (gitAutoPushReposBranchMap) {
+    content = `${publishText}\n构建文件：已推送对应仓库【${repos}】- 分支【${gitAutoPushReposBranchMap[branch]}】\n构建人：${author}`;
   } else {
     content = `${publishText}\n构建文件下载地址：${GITPATH}\n${webhookExtraText}\n`;
   }

package/store/modules/user.js

@@ -6,7 +6,7 @@ const CONFIG = {
   settings: {},
   login: () => Promise.resolve(),
   getInfo: () => Promise.resolve(),
-  resetRouter: () => {}
+  redirectRoute: {}
 };
 
 function init(config = {}) {
@@ -76,13 +76,22 @@ const userModule = {
     SET_CHAT_TOKEN: (state, token) => {
       state.chatToken = token;
       TokenService.setChatToken(token);
+    },
+    SET_PERMISSION_CODES: (state, codes) => {
+      state.permission_codes = codes || [];
+      Uts.storage.set(CONFIG.settings.permissionsCodeKey, codes);
+    },
+    UPDATE_ROUTES: (state, menus_permission_codes) => {
+      const constantRoutes = CONFIG?.router?.options?.routes || [];
+      updateRoutesPermission(constantRoutes, menus_permission_codes);
+      CONFIG?.router?.resetRouter?.(constantRoutes);
     }
   },
   actions: {
     login({ commit }, userInfo) {
       const { mobile, sms_code } = userInfo;
       return new Promise((resolve, reject) => {
-        CONFIG.login({
+        CONFIG?.login?.({
           mobile: mobile,
           sms_code: sms_code
         })
@@ -104,8 +113,18 @@ const userModule = {
               reject("验证失败，请重新登录。");
             }
 
-            const { name, header, map_key, merchantinfo } = response;
+            const {
+              name,
+              header,
+              map_key,
+              merchantinfo,
+              permission_codes = [],
+              menus,
+              menus_permission_codes = Uts.pluck(menus, "path") || []
+            } = response;
             const { service_token } = merchantinfo || {};
+            const fullePermissionCodes = [...permission_codes, ...menus_permission_codes];
+
             commit("SET_USER", response);
             commit("SET_NAME", name);
             commit("SET_AVATAR", header);
@@ -115,7 +134,15 @@ const userModule = {
               commit("SET_CHAT_TOKEN", service_token);
             }
 
-            resolve(response);
+            if (
+              CONFIG.settings.permissionsCodeKey &&
+              JSON.stringify(fullePermissionCodes) !==
+                JSON.stringify(Uts.storage.get(CONFIG.settings.permissionsCodeKey))
+            ) {
+              commit("SET_PERMISSION_CODES", fullePermissionCodes);
+            }
+            commit("UPDATE_ROUTES", menus_permission_codes);
+            resolve({ ...response, PMRedirectPath: CONFIG.redirectRoute.redirect });
           })
           .catch((error) => {
             reject(error);
@@ -123,16 +150,16 @@ const userModule = {
       });
     },
 
-    logout({ commit, state }) {
+    logout({ commit, state }, payload) {
       return new Promise((resolve, reject) => {
         TokenService.removeAllTokens();
         commit("RESET_STATE");
         commit("SET_MAPKEY", "");
+        commit("SET_CHAT_TOKEN", "");
+        commit("SET_PERMISSION_CODES", "");
 
-        if (CONFIG.router) {
-          Uts.isFunction(CONFIG.router.push) && CONFIG.router.push("/login");
-          Uts.isFunction(CONFIG.router.resetRouter) &&
-            CONFIG.router.resetRouter();
+        if (payload?.redirectLogin) {
+          CONFIG?.router?.push?.("/login");
         }
 
         if (TokenService.getUrlToken()) {
@@ -160,6 +187,64 @@ const userModule = {
   }
 };
 
+// 递归更新路由权限
+const updateRoutesPermission = (
+  routes = [],
+  userPermissions = [],
+  redirectRoute = {
+    level0: "",
+    level1: "",
+    level2: ""
+  },
+  lastNoVerPMRoute = {
+    level0: "",
+    level1: "",
+    level2: ""
+  },
+  level = 0
+) => {
+  const curLevelKey = `level${level}`;
+
+  routes.forEach((route) => {
+    const { path } = route;
+    if (route.meta && route.meta.permission && !route.hidden) {
+      route.hidden = !Uts.getPM(route.meta.permission);
+
+      // 记录第一级有权限控制的路由，用于重定向
+      if (!route.hidden && !redirectRoute[curLevelKey]) {
+        redirectRoute[curLevelKey] = route.path;
+      }
+    }
+
+    // 记录最后一级没有权限控制的路由，用于重定向
+    if ((!route.meta || !route.meta.permission) && !route.hidden && path) {
+      lastNoVerPMRoute[`level${level}`] = path;
+    }
+
+    if (route.children) {
+      updateRoutesPermission(route.children, userPermissions, redirectRoute, lastNoVerPMRoute, level + 1);
+    }
+
+    // 处理重定向
+    if (path === "") {
+      let tempRoute = redirectRoute;
+      if (!redirectRoute.level0 && !redirectRoute.level1 && !redirectRoute.level2 && lastNoVerPMRoute.level0) {
+        tempRoute = lastNoVerPMRoute;
+      }
+      route.redirect = `${tempRoute.level1}/${tempRoute.level2}`;
+      if (!tempRoute.level2) {
+        route.redirect = `${tempRoute.level0}/${tempRoute.level1}`;
+      }
+
+      if (route.redirect === "/") {
+        route.redirect = "*";
+      }
+
+      CONFIG.redirectRoute = route || {};
+    }
+  });
+};
+
 export default {
   ...userModule,
   init

package/tools/file-export.js

@@ -137,6 +137,25 @@ async function exportFile(config) {
   }
 }
 
+// 创建 Vue mixin 对象
+const fileExportMixin = {
+  methods: {
+    async $exportFile(config) {
+      // 自动注入 ElementUI 组件
+      const enhancedConfig = {
+        ...config,
+        Message: this.$message || Message,
+        MessageBox: this.$msgbox || MessageBox,
+        Loading: this.$loading || Loading,
+        request: config.request || this.$axios
+      };
+      
+      return await exportFile(enhancedConfig);
+    }
+  }
+};
+
 export {
-  exportFile
+  exportFile,
+  fileExportMixin
 };

package/tools/file-process.js

@@ -12,6 +12,9 @@ function scriptWrite(filePath, scriptsList, updateKey = "scripts") {
   pkg[updateKey] = pkg[updateKey] || {};
   if (Array.isArray(scriptsList)) {
     scriptsList.forEach(item => {
+      if (pkg[updateKey][item.key]) {
+        pkg[updateKey][`origin:${item.key}`] = pkg[updateKey][item.key];
+      }
       pkg[updateKey][item.key] = item.value;
     });
   } else if (typeof scriptsList === "object") {

package/dataInit/commonTypeMap.js

@@ -1,31 +0,0 @@
-export default {
-  roleList: [
-    { name: "超级管理员", value: 1 },
-    { name: "机构管理员", value: 2 },
-    { name: "客户经理", value: 3 },
-    { name: "其他员工", value: 4 }
-  ],
-  // 是否显示
-  displayList: [{ name: "否", value: 2 }, { name: "是", value: 1 }],
-  yesNoOptions: [{ name: "是", value: true }, { name: "否", value: false }],
-  platformList: [
-    { label: "邮惠权益后台（运营端）", name: "default" },
-    { label: "邮惠权益后台（机构端）", name: "level" }
-  ],
-  miniProgramList: [
-    { label: "邮乐享商圈", name: "xx_wx_wyh_shangquan", value: "xx_wx_wyh_shangquan" },
-    { label: "微邮惠助手", name: "xx_fn_huili", value: "xx_fn_huili" },
-    { label: "微邮惠商家", name: "xx_yf_merchant", value: "xx_yf_merchant" },
-    { label: "邮惠权益", name: "xx_wx_yh_quanyi", value: "xx_wx_yh_quanyi" }
-  ],
-  weekDateOptions: [
-    { name: "周一", value: 0 },
-    { name: "周二", value: 1 },
-    { name: "周三", value: 2 },
-    { name: "周四", value: 3 },
-    { name: "周五", value: 4 },
-    { name: "周六", value: 5 },
-    { name: "周日", value: 6 }
-  ],
-  dateTypeOptions: [{ name: "周期循环", value: 1 }, { name: "指定日期", value: 2 }]
-};