cloudcc-cli 1.5.3 → 1.5.5

package/README.md

@@ -1,3 +1,17 @@
+# ReleaseV1.5.5
+#### 发布日期：2023-12-26
+#### 发布范围：全量
+#### 发布内容
+* 修复
+    * 普通命令打包。
+
+# ReleaseV1.5.4
+#### 发布日期：2023-12-25
+#### 发布范围：全量
+#### 发布内容
+* 迭代
+    * 添加build2命令。
+
 # ReleaseV1.5.3
 #### 发布日期：2023-11-21
 #### 发布范围：全量

package/bin/publishBuild.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+
+const Publish = require("../src/publishProjectBuild.js");
+
+const publish = new Publish();
+
+publish.init();

package/bin/publishh5Build.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+
+const Publish = require("../src/publishProjectH5Build.js");
+
+const publish = new Publish();
+
+publish.init();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "1.5.3",
+  "version": "1.5.5",
   "description": "cloudcc-cli",
   "keywords": [
     "cloudcc",
@@ -14,7 +14,9 @@
     "cloudccBuild": "bin/build.js",
     "cloudccCreatePlugin": "bin/createPlugin.js",
     "cloudccPublic": "bin/publish.js",
+    "cloudccPublicBuild": "bin/publishBuild.js",
     "cloudccPublicH5": "bin/publishh5.js",
+    "cloudccPublicH5Build": "bin/publishh5Build.js",
     "cloudccBuildCCSDK": "bin/buildccsdk.js",
     "cloudccBuildCCBaseSDK": "bin/buildccbasesdk.js",
     "cloudccBuildTag": "bin/buildtag.js"
@@ -29,6 +31,7 @@
     "chalk": "^2.4.2",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.10.7",
+    "fs-extra": "^11.2.0",
     "inquirer": "^8.1.0",
     "marked": "^5.0.1",
     "mem-fs": "^2.2.1",

package/src/builderBaseSDK.js

@@ -13,7 +13,7 @@ const { askType, askTypeOther } = require("../utils/askTool")
 // 提交代码，设置Tag
 const { getNewVersionName, pushCodeAndTags } = require("../utils/pushCode")
 // 通知飞书
-const { notifyFeishu,notifyDingDing } = require("../utils/NotifyIM")
+const { notifyDingDing } = require("../utils/NotifyIM")
 // 网络请求
 const { postParams } = require("../utils/http")
 /**
@@ -33,7 +33,7 @@ class Builder {
             if (condition && condition.type) {
                 if (this.buildpush2npm(version[0].split("V")[1])) {
                     pushCodeAndTags([condition.type])
-                    notifyFeishu(condition.type, version, projectConfig);
+                    // notifyFeishu(condition.type, version, projectConfig);
                     notifyDingDing(condition.type, version, projectConfig);
                     console.log(chalk.green('发布完成'));
                 }

package/src/builderCreate.js

@@ -1,5 +1,3 @@
-const { exec } = require('child_process');
-const { post } = require('../utils/http');
 const fs = require('fs');
 const path = require("path")
 const chalk = require("chalk")

package/src/builderPlugin.js

@@ -186,11 +186,20 @@ class Builder {
         return { compName, component, vueContent, vueData, bizType, compDesc, category, loadModel }
     };
     /**
-     * 生成依赖文件
+     * 
+     * @param {string} buildFileName 编译文件入口
+     * @param {string} component 编译后组件的名字
+     * @param {string} plginTemp 生成模板代码存储路径
+     */
+    initPluginFile(buildFileName, component, plginTemp) {
+        this.initPluginFile2(buildFileName, component, plginTemp)
+    }
+    /**
+     * 生成依赖文件，vue-custom-element
      * @param {编译的文件名称} buildFileName
      * @param {编译后的组件名称} component
      */
-    initPluginFile(buildFileName, component, plginTemp) {
+    initPluginFile1(buildFileName, component, plginTemp) {
         let newContent =
             ` 
             import Vue from "vue"
@@ -203,6 +212,31 @@ class Builder {
 
         fs.writeFileSync(`plugin/${plginTemp}.js`, newContent);
     }
+
+    /**
+     * 生成依赖文件
+     * @param {编译的文件名称} buildFileName
+     * @param {编译后的组件名称} component
+     */
+    initPluginFile2(buildFileName, component, plginTemp) {
+        let newContent =
+            ` 
+            import index from "./${buildFileName}"
+            function install(Vue) {
+                Vue.component('${component}', index);
+            }
+            export default install;
+            if (typeof window !== 'undefined' && window.Vue) {
+                console.log("install装载",install)
+                window.Vue.use(install);
+                if (install.installed) {
+                    install.installed = false;
+                }
+            }
+        `
+        fs.writeFileSync(`plugin/${plginTemp}.js`, newContent);
+    }
+
     /**
      * 编译文件，将vue编译为js文件
      * @param {编译对象信息} obj

package/src/publishProject.js

@@ -15,7 +15,7 @@ const { getNewVersionName, pushCodeAndTags } = require("../utils/pushCode")
 // 触发构建器
 const { jenkins } = require("../utils/trigger")
 // 通知飞书
-const { notifyFeishu, notifyDingDing } = require("../utils/notifyIM")
+const { notifyDingDing } = require("../utils/notifyIM")
 // 时间库
 const dayjs = require("dayjs")
 // 多语言更新脚本
@@ -103,15 +103,12 @@ class Publish {
             }
             // 4：开始打包
             this.build(condition)
-            
-            // 7：写入版本信息
-            // writeVersion("sdf", condition.type, projectConfig, this.user);
         }
     }
 
     /**
       * 编译代码
-      * @param {发布类型} types：Dev,uat,Release，GA，RC
+      * @param {发布类型} types：Dev,uat,RC
       * @returns 
      */
     build(condition) {
@@ -210,7 +207,7 @@ class Publish {
             if (projectConfig && projectConfig.config) {
                 jenkins(projectConfig.config["jenkins-" + condition.type])
             }
-            notifyFeishu(condition.type, version, projectConfig, this.user)
+            // notifyFeishu(condition.type, version, projectConfig, this.user)
             notifyDingDing(condition.type, version, projectConfig, this.user)
             console.log();
             console.log(chalk.green('发布完成'));

package/src/publishProjectBuild.js

@@ -0,0 +1,223 @@
+const { execSync, exec } = require('child_process');
+const chalk = require("chalk")
+// 文件编辑对象
+const fs = require("fs")
+// 配置信息
+const projectConfig = JSON.parse(fs.readFileSync('package.json', 'utf8'))
+// 网页转换器
+const { change } = require("../utils/md2html")
+// 检查版本更新
+const { checkUpdate } = require("../utils/checkVersion")
+// 控制台交互
+const { askType, askTypeOther, askBuildType } = require("../utils/askTool")
+// 提交代码，设置Tag
+const { getNewVersionName, pushCodeAndTags } = require("../utils/pushCode")
+// 触发构建器
+const { yunxiao } = require("../utils/trigger")
+// 通知飞书
+const { notifyDingDing } = require("../utils/notifyIM")
+// 时间库
+const dayjs = require("dayjs")
+// 多语言更新脚本
+const { updatei18n, askI18n } = require("../utils/updatei18n")
+// 部署脚本
+const { deploy } = require("../utils/deploy")
+// 创建版本信息
+const { writeVersion } = require("../utils/writeVersion")
+/**
+ * 项目打包发布脚本
+ */
+class Publish {
+    constructor() {
+        /**
+         * 控制台参数：key=value
+         * type：发布的tag
+         * branch：使用的分支
+         * language：是否更新多语言，'1'更新，'0'不更新
+         * buildType：打包方式，online-云打包，local-本地打包
+         * user：打包用户
+         * update：代码不同步的时候，是否强制更新代码
+         */
+        this.args = new Map();
+        this.arguments = process.argv.splice(2).map((item) => {
+            let arr = item.split("=");
+            this.args.set(arr[0], arr[1]);
+        });
+        this.user = this.args.get("user") || execSync("git config user.name").toString("utf8").trim();
+    }
+    /**
+     * 初始化
+     */
+    async init() {
+        // 检查cli版本，提示用户更新：false：不更新，true：更新
+        let update = await checkUpdate();
+        if (!update) {
+            // 1：版本发布信息，包含发布版本类型信息
+            let condition = {};
+            // 检查命令行是否输入了发布版本信息，如果没有包含，那么询问发布类型
+            if (this.args.get("type")) {
+                condition.type = this.args.get("type")
+            } else {
+                // 询问发布类型
+                condition = await askType();
+                if ("other" == condition.type) {
+                    condition = await askTypeOther();
+                }
+            }
+
+            // 1.1：询问打包方式
+            let buildType = null;
+            if (this.args.get("buildType")) {
+                buildType = this.args.get("buildType")
+            } else {
+                buildType = await askBuildType();
+            }
+            if ("online" == buildType.buildType) {
+                deploy(projectConfig.config["deploy-" + condition.type] + "," + encodeURI(this.user))
+                console.log(chalk.green("云发布已开始，请稍后查看通知"))
+                return
+            }
+            // 2：如果命令行包含了分支信息，那么git切换到命令行的分支
+            if (this.args.get("branch")) {
+                execSync(`git checkout ${this.args.get("branch")}`);
+                console.log(chalk.green("切换分支：" + this.args.get("branch")))
+                console.log()
+            }
+
+            // 3：如果存在多语言配置，则更新多语言
+            if (projectConfig.config && projectConfig.config["language-config"]) {
+                // 获得命令行多语言参数
+                let i18n = this.args.get("language")
+                // 如果存在命令行参数，那么获取，否则询问
+                if (!i18n) {
+                    i18n = await askI18n()
+                }
+                // 如果选择为1，那么下载多语言
+                if ('1' === i18n || '1' === i18n.checked) {
+                    let laguage = projectConfig.config["language-config"]
+                    // 执行更新多语言文件
+                    await updatei18n(laguage)
+                    console.log(chalk.blue("多语言文件更新完毕，准备开始打包"));
+                    console.log();
+                }
+            }
+            // 4：开始打包
+            this.build(condition)
+        }
+    }
+
+    /**
+         * 编译代码
+         * @param {发布类型} types：Stable/Latest/GA
+         * @returns 
+        */
+    build(condition) {
+        console.log(chalk.green('开始编译，请稍后...'));
+        console.log();
+        // 5：获取新的发布版本号
+        let version = getNewVersionName([condition.type])
+        // 5.1：将版本信息写入env文件中，公其他业务使用
+        try {
+            fs.writeFileSync(".env.production", "VUE_APP_OUT_PUT_DIR = build \nVUE_APP_PROJECT_VERSION = " + condition.type + "-" + version, 'utf-8')
+        } catch (error) {
+        }
+        let that = this;
+        // 打包命令
+        exec('npm run build', (error, stdout, stderr) => {
+            if (error) {
+                exec('npx vue-cli-service build', (error, stdout, stderr) => {
+                    if (error) {
+                        console.log('编译失败：', error);
+                        console.log(chalk.red('编译失败：' + stdout));
+                    } else {
+                        console.log(chalk.green('编译成功！'));
+                        console.log();
+                        that.buildSucess(condition, version);
+                    }
+                })
+            } else {
+                console.log(chalk.green('编译成功！'));
+                console.log();
+                that.buildSucess(condition, version);
+            }
+        })
+
+    }
+
+
+    /**
+     * 编译成功回调
+     */
+    buildSucess(condition, version) {
+        // 5.2：更新日志文档添加发布日期
+        // 获得分支信息
+        let branch = execSync('git branch --show-current');
+        branch = branch.toString("utf8").trim();
+        const datas = fs.readFileSync("README.md", 'utf-8').split("\n")
+        let data = ""
+        datas.map((item, index) => {
+            if (0 == index) {
+                data = data + `#### 发布版本：${version}` + "\n"
+                data = data + `#### 发布时间：${dayjs().format('YYYY-MM-DD HH:mm:ss')}` + "\n"
+                data = data + `#### 发布人员：${this.user}` + "\n"
+                data = data + `#### 发布分支：${branch}` + "\n"
+                data = data + `#### 发布标签：${condition.type}` + "\n"
+                if (!item.startsWith("#### 发布版本")) {
+                    data = data + item + "\n"
+                }
+            } else if (1 == index) {
+                if (!item.startsWith("#### 发布时间")) {
+                    data = data + item + "\n"
+                }
+            } else if (2 == index) {
+                if (!item.startsWith("#### 发布人员")) {
+                    data = data + item + "\n"
+                }
+            } else if (3 == index) {
+                if (!item.startsWith("#### 发布分支")) {
+                    data = data + item + "\n"
+                }
+            } else if (4 == index) {
+                if (!item.startsWith("#### 发布标签")) {
+                    data = data + item + "\n"
+                }
+            } else {
+                data = data + item + "\n"
+            }
+        })
+        fs.writeFileSync("README.md", data)
+        // 6：将readme生成为html，并复制到dist中
+        let outPath = "build/dist"
+        // 读取配置，是否改变了输出路径
+        if (projectConfig.config && projectConfig.config["doc-path"]) {
+            outPath = projectConfig.config["doc-path"];
+        }
+        try {
+            // 设置readme文件位置
+            change("README", outPath, "README");
+        } catch (error) {
+            console.log(chalk.red("README写入异常：" + error))
+        }
+        try {
+            // 7：写入版本信息
+            writeVersion(version, condition.type, projectConfig, this.user, branch, "build/dist");
+        } catch (error) {
+            console.log(chalk.red("版本信息写入异常：" + error))
+        }
+        // 8：发布代码并设置tags,触发发布,飞书提醒
+        if (pushCodeAndTags(version, [condition.type], this.args.get("update"), "build")) {
+            if (projectConfig && projectConfig.config) {
+                yunxiao(projectConfig.config["jenkins-" + condition.type])
+            }
+            // notifyFeishu(condition.type, version, projectConfig, this.user)
+            notifyDingDing(condition.type, version, projectConfig, this.user)
+            console.log();
+            console.log(chalk.green('发布完成'));
+            console.log();
+        }
+    }
+}
+
+module.exports = Publish;
+
+

package/src/publishProjectH5Build.js

@@ -0,0 +1,224 @@
+const { execSync, exec } = require('child_process');
+const chalk = require("chalk")
+// 文件编辑对象
+const fs = require("fs")
+// 配置信息
+const projectConfig = JSON.parse(fs.readFileSync('package.json', 'utf8'))
+// 网页转换器
+const { change } = require("../utils/md2html")
+// 检查版本更新
+const { checkUpdate } = require("../utils/checkVersion")
+// 控制台交互
+const { askType, askTypeOther, askBuildType } = require("../utils/askTool")
+// 提交代码，设置Tag
+const { getNewVersionName, pushCodeAndTags } = require("../utils/pushCode")
+// 触发构建器
+const { yunxiao } = require("../utils/trigger")
+// 通知飞书
+const { notifyDingDing } = require("../utils/notifyIM")
+// 时间库
+const dayjs = require("dayjs")
+// 文件夹操作工具
+const fsex = require('fs-extra')
+/**
+ * H5项目打包发布脚本
+ */
+class Publish {
+    constructor() {
+        /**
+         * 控制台参数：key=value
+         * type：发布的tag
+         * branch：使用的分支
+         * language：是否更新多语言，'1'更新，'0'不更新
+         * buildType：打包方式，online-云打包，local-本地打包
+         * user：打包用户
+         * update：代码不同步的时候，是否强制更新代码
+         */
+        this.args = new Map();
+        this.arguments = process.argv.splice(2).map((item) => {
+            let arr = item.split("=");
+            this.args.set(arr[0], arr[1]);
+        });
+        this.user = this.args.get("user") || execSync("git config user.name").toString("utf8").trim();
+    }
+    /**
+     * 初始化
+     */
+    async init() {
+        // 检查cli版本，提示用户更新：false：不更新，true：更新
+        let update = await checkUpdate();
+        if (!update) {
+            // 1：版本发布信息，包含发布版本类型信息
+            let condition = {};
+            // 2：检查命令行是否输入了发布版本信息，如果没有包含，那么询问发布类型
+            if (this.args.get("type")) {
+                condition.type = this.args.get("type")
+            } else {
+                // 询问发布类型
+                condition = await askType();
+                if ("other" == condition.type) {
+                    condition = await askTypeOther();
+                }
+            }
+            // 3：获取新的发布版本号
+            let version = getNewVersionName([condition.type])
+            console.log();
+            console.log(chalk.green('待发布版本：' + version));
+            console.log();
+            // 4：开始打包
+            this.build(condition, version)
+        }
+    }
+    /**
+     * 编译代码
+     * @param {发布类型} types：Dev,uat,Release，GA，RC
+     * @param {发布版本} versions：V12.0.0
+     * @returns 
+     */
+    build(condition, version) {
+        // 删除多余文件夹
+        fsex.removeSync("./build/dist")
+        console.log(chalk.green('开始编译，请稍后...'));
+        console.log();
+        let that = this;
+        // 当时mac系统时使用mac路径命令，当时window系统时，使用window命令路径
+        let path = "cli.exe"
+        if (process.platform === 'darwin') {
+            path = "/Applications/HBuilderX.app/Contents/MacOS/cli"
+        }
+        exec(`${path} publish --platform h5 --project ` + projectConfig.name, (error, stdout, stderr) => {
+            if (error) {
+                console.log('编译失败：', error);
+                console.log(chalk.red('编译失败：' + stdout));
+            } else {
+                console.log(chalk.green('编译成功！'));
+                console.log();
+                that.buildSucess(condition, version);
+            }
+        })
+    }
+    /**
+ * 编译成功
+ */
+    buildSucess(condition, version) {
+        // 更新日志文档添加发布日期
+        // 获得分支信息
+        let branch = execSync('git branch --show-current');
+        branch = branch.toString("utf8").trim();
+        const datas = fs.readFileSync("README.md", 'utf-8').split("\n")
+        let data = ""
+        datas.map((item, index) => {
+            if (0 == index) {
+                data = data + `#### 发布版本：${version}` + "\n"
+                data = data + `#### 发布时间：${dayjs().format('YYYY-MM-DD HH:mm:ss')}` + "\n"
+                data = data + `#### 发布人员：${this.user}` + "\n"
+                data = data + `#### 发布分支：${branch}` + "\n"
+                data = data + `#### 发布标签：${condition.type}` + "\n"
+                if (!item.startsWith("#### 发布版本")) {
+                    data = data + item + "\n"
+                }
+            } else if (1 == index) {
+                if (!item.startsWith("#### 发布时间")) {
+                    data = data + item + "\n"
+                }
+            } else if (2 == index) {
+                if (!item.startsWith("#### 发布人员")) {
+                    data = data + item + "\n"
+                }
+            } else if (3 == index) {
+                if (!item.startsWith("#### 发布分支")) {
+                    data = data + item + "\n"
+                }
+            } else if (4 == index) {
+                if (!item.startsWith("#### 发布标签")) {
+                    data = data + item + "\n"
+                }
+            } else {
+                data = data + item + "\n"
+            }
+        })
+        fs.writeFileSync("README.md", data)
+        // 5：将readme生成为html，并复制到dist中
+        let outPath = "dist"
+        // 读取配置，是否改变了输出路径
+        if (projectConfig.config && projectConfig.config["doc-path"]) {
+            outPath = projectConfig.config["doc-path"];
+        }
+        try {
+            // 设置readme文件位置
+            change("README", outPath);
+        } catch (error) {
+            console.log(chalk.red("README写入异常：" + error))
+        }
+
+        try {
+            // 6：写入版本信息
+            this.writeVersion(version, outPath, condition.type, branch);
+        } catch (error) {
+            console.log(chalk.red("版本信息写入异常：" + error))
+        }
+        // 移动打包文件
+        fsex.copySync('./unpackage/dist/build/h5/', './build/dist');
+        // 删除多余文件夹
+        fsex.removeSync("unpackage")
+
+        // 7：发布代码并设置tags,触发发布,飞书提醒
+        if (pushCodeAndTags(version, [condition.type], this.args.get("update"), "build")) {
+            if (projectConfig && projectConfig.config) {
+                yunxiao(projectConfig.config["jenkins-" + condition.type])
+            }
+            notifyDingDing(condition.type, version, projectConfig, this.user)
+            console.log();
+            console.log(chalk.green('发布完成'));
+            console.log();
+        }
+    }
+    /**
+       * 将版本信息写入文件
+       * @param {版本信息} version 
+       * @param {输出路径} outPath 
+       */
+    writeVersion(version, outPath, type, branch) {
+        try {
+            // 获得分支信息
+            let versionInfo =
+                `
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>版本信息</title>
+</head>
+
+<body>
+<div style="font-size: 20px">
+<div>${projectConfig.name}</div>
+<div style="margin-left:48px">
+<div>版本：${version}</div>
+<div>时间：${dayjs().format('YYYY-MM-DD HH:mm:ss')}</div>
+<div>人员：${this.user}</div>
+<div>分支：${branch}</div>
+<div>标签：${type}</div>
+</div>
+</div>
+</body>
+
+</html>
+`
+            fs.writeFileSync(outPath + "/version.html", versionInfo, 'utf-8');
+
+            let versionInfoJson =
+                `{"projectName":"${projectConfig.name}","版本":"${version}","时间":"${dayjs().format('YYYY-MM-DD HH:mm:ss')}","人员":"${user}","分支":"${branch}","标签":"${type}"}`
+            fs.writeFileSync(outPath + "/version.json", versionInfoJson, 'utf-8');
+
+            return true
+        } catch (error) {
+            return false
+        }
+    };
+}
+
+module.exports = Publish;

package/utils/http.js

@@ -68,6 +68,13 @@ module.exports = {
       params: data
     })
   },
+  postNormal: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'post',
+      data: data
+    })
+  },
   patch: (url, data = {}) => {
     return service({
       url: url,

package/utils/pushCode.js

@@ -11,6 +11,7 @@ const changeVersion = require("../utils/changeVersion")
 function getNewVersionName(types) {
     exec("git fetch --tags -f")
     return types.map((item) => {
+
         // 更新本地tag
         let version = exec(`git tag --sort=-committerdate`)
         version = version.toString("utf8").trim();
@@ -44,17 +45,23 @@ function getNewVersionName(types) {
  * @param {update} 是否强制更新:1强制更新，0不强制更新
  * @returns true 成功，false 失败
  */
-function push(version, update = "0") {
+function push(version, update = "0", path) {
     try {
         // 添加改变文件
-        exec("git add .")
+        exec(`git -C ${path} add .`)
+        if ("." != path) {
+            exec(`git add .`)
+        }
     } catch (error) {
         return false;
     }
 
     try {
         // 提交到本地
-        exec("git commit -m " + version)
+        exec(`git -C ${path} commit -m ` + version)
+        if ("." != path) {
+            exec(`git commit -m ` + version)
+        }
     } catch (error) {
         return false;
     }
@@ -63,13 +70,19 @@ function push(version, update = "0") {
     console.log(chalk.green('代码开始推送，请稍后...'));
     try {
         // 推送到服务器
-        exec("git push")
+        exec(`git -C ${path} push`)
+        if ("." != path) {
+            exec(`git push`)
+        }
         console.log();
         console.log(chalk.green('代码推送成功！'));
     } catch (error) {
         console.log("update", update);
         if ("1" == update) {
-            exec(`git fetch --tags -f && git pull --force && git push`)
+            exec(`git -C ${path} fetch --tags -f && git -C ${path} pull --force && git -C ${path} push`)
+            if ("." != path) {
+                exec(`git fetch --tags -f && git pull --force && git push`)
+            }
             console.log(chalk.green('代码推送成功！'));
         } else {
             console.log(chalk.red('代码推送失败，本地代码与线上不同步，请先 git pull 同步！'));
@@ -84,53 +97,54 @@ function push(version, update = "0") {
  * @param {types} 发布版本类型，如Dev，uat，GA，Release 
  * @param {versions} 版本tag信息，如Dev-V12.0.1 
  */
-function setTag(types, versions) {
+function setTag(types, versions, path) {
     console.log(chalk.green('开始同步Tag设置，请稍后...'));
     try {
         // 更新tag
-        exec("git fetch --tags -f")
+        exec(`git fetch --tags -f`)
     } catch (error) {
         return false;
     }
-    // 删除本地版本Tag
+    // 删除本地版本版本Tag
     versions.map((version) => {
         try {
-            exec("git tag -d " + version)
+            exec(`git tag -d ` + version)
         } catch (error) {
         }
     })
     types.map((type) => {
         try {
             // 删除本地发布Tag
-            exec("git tag -d " + type)
+            exec(`git -C ${path} tag -d ` + type)
         } catch (error) {
         }
     })
     versions.map((version) => {
         try {
             // 删除远程Tag
-            exec("git push origin :refs/tags/" + version)
+            exec(`git push origin :refs/tags/` + version)
         } catch (error) {
         }
     })
     types.map((type) => {
         try {
             // 删除远程发布Tag
-            exec("git push origin :refs/tags/" + type)
+            exec(`git -C ${path} push origin :refs/tags/` + type)
         } catch (error) {
         }
     })
 
-    // 添加tag
+    // 添加版本tag
     versions.map((version) => {
-        exec("git tag " + version + " -f")
+        exec(`git tag ` + version + " -f")
     })
 
     types.map((type) => {
-        exec("git tag " + type + " -f")
+        exec(`git -C ${path} tag ` + type + " -f")
     })
     // 推送tag
-    exec("git push --tags")
+    exec(`git -C ${path} push --tags`)
+    exec(`git push --tags`)
 
     console.log(chalk.green('Tag设置成功！'));
     console.log();
@@ -140,37 +154,36 @@ function setTag(types, versions) {
  * 删除dist文件夹
  * @returns true 成功，false 失败
  */
-function deleteDist() {
-
+function deleteDist(version, path) {
     try {
         // 删除dist文件夹
-        exec("git rm -r dist")
+        exec(`git -C ${path} rm -r dist`)
     } catch (error) {
 
     }
 
     try {
         // 删除unpackage文件夹
-        exec("git rm -r unpackage")
+        exec(`git -C ${path} rm -r unpackage`)
     } catch (error) {
 
     }
 
     try {
         // 添加改变文件
-        exec("git add .")
+        exec(`git -C ${path} add .`)
     } catch (error) {
 
     }
 
     try {
         // 提交到本地
-        exec("git commit -m clear-dist")
+        exec(`git -C ${path} commit -m clear-dist`)
     } catch (error) {
     }
     try {
         // 推送到服务器
-        exec("git push")
+        exec(`git -C ${path} push`)
     } catch (error) {
 
     }
@@ -178,10 +191,12 @@ function deleteDist() {
 }
 /**
  * 发布代码同时设置Tags
+ * @param {versions} 版本信息 
  * @param {types} 版本集合 
  * @param {update} 是否强制更新
+ * @param {path} git运行目录
  */
-function pushCodeAndTags(versions, types = [], update = "0") {
-    return push(versions[0], update) && setTag(types, versions) && deleteDist(versions[0]);
+function pushCodeAndTags(versions, types = [], update = "0", path = ".") {
+    return push(versions[0], update, path) && setTag(types, versions, path) && deleteDist(versions[0], path);
 }
 module.exports = { pushCodeAndTags, push, getNewVersionName, setTag }

package/utils/trigger.js

@@ -2,7 +2,7 @@
  * 版本构建触发器
  */
 
-const { get } = require('../utils/http');
+const { get, postNormal } = require('../utils/http');
 
 async function jenkins(url) {
     try {
@@ -12,4 +12,12 @@ async function jenkins(url) {
     return true
 }
 
-module.exports = { jenkins }
+async function yunxiao(url) {
+    try {
+        await postNormal(url)
+    } catch (error) {
+    }
+    return true
+}
+
+module.exports = { jenkins, yunxiao }

package/utils/writeVersion.js

@@ -8,11 +8,13 @@ const { execSync } = require('child_process');
 * @param {版本信息} version 
 */
 module.exports = {
-    writeVersion(version, type, projectConfig, user) {
+    writeVersion(version, type, projectConfig, user, branch, path = "dist") {
         try {
             // 获得分支信息
-            let branch = execSync('git branch --show-current');
-            branch = branch.toString("utf8").trim();
+            if (!branch) {
+                branch = execSync('git branch --show-current');
+                branch = branch.toString("utf8").trim();
+            }
             let versionInfo =
                 `
 <!DOCTYPE html>
@@ -40,12 +42,11 @@ module.exports = {
 
 </html>
 `
-            fs.writeFileSync("dist/version.html", versionInfo, 'utf-8');
-
+            fs.writeFileSync(path + "/version.html", versionInfo, 'utf-8');
             let versionInfoJson =
                 `{"serviceName":"${projectConfig.name}","status":"OK","codeVersion":"${projectConfig.codeVersion + version}","serviceType":"${projectConfig.serviceType}"}`
-            fs.mkdirSync("dist/ccmonitor", { recursive: true });
-            fs.writeFileSync("dist/ccmonitor/sck", versionInfoJson, 'utf-8');
+            fs.mkdirSync(path + "/ccmonitor", { recursive: true });
+            fs.writeFileSync(path + "/ccmonitor/sck", versionInfoJson, 'utf-8');
             return true
         } catch (error) {
             console.log(error)

package/utils/test.js

@@ -1,2 +0,0 @@
-const fs = require('fs')
-const exec = require('child_process').execSync;