cloudcc-cli 1.1.8 → 1.2.1

package/README.md

@@ -1,3 +1,24 @@
+# ReleaseV1.2.1
+#### 发布日期：2022-9-9
+#### 发布范围：全量
+#### 发布内容
+* 修复
+    * 添加cloudcc-ccdk
+
+# ReleaseV1.2.0
+#### 发布日期：2022-8-24
+#### 发布范围：全量
+#### 发布内容
+* 修复
+    * 增加创建tag功能
+
+# ReleaseV1.1.9
+#### 发布日期：2022-8-23
+#### 发布范围：全量
+#### 发布内容
+* 修复
+    * 增加h5打包逻辑
+
 # ReleaseV1.1.8
 #### 发布日期：2022-7-20
 #### 发布范围：全量

package/bin/buildtag.js

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

package/bin/publishh5.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "1.1.8",
+  "version": "1.2.1",
   "description": "cloudcc-cli",
   "keywords": [
     "cloudcc",
@@ -13,8 +13,10 @@
     "cloudccCreate": "bin/create.js",
     "cloudccBuild": "bin/build.js",
     "cloudccPublic": "bin/publish.js",
+    "cloudccPublicH5": "bin/publishh5.js",
     "cloudccBuildCCSDK": "bin/buildccsdk.js",
-    "cloudccBuildCCBaseSDK": "bin/buildccbasesdk.js"
+    "cloudccBuildCCBaseSDK": "bin/buildccbasesdk.js",
+    "cloudccBuildTag": "bin/buildtag.js"
   },
   "scripts": {
     "publish-lib": "npm publish --registry https://registry.npmjs.org"

package/src/buildTag.js

@@ -0,0 +1,75 @@
+// 同步执行exe命令
+const exec = require('child_process').execSync;
+// 文件管理器
+const fs = require('fs');
+// 控制台输出样式控件
+const chalk = require("chalk")
+// 检查版本更新
+const { checkUpdate } = require("../utils/checkVersion")
+// 配置信息
+const projectConfig = JSON.parse(fs.readFileSync('package.json', 'utf8'))
+// 控制台交互
+const { askTag } = require("../utils/askTool")
+// 通知IM
+const { notifyDingDing } = require("../utils/NotifyIM")
+/**
+ * 打包基础SDK，并发布到NPM
+ */
+class Builder {
+    constructor() {
+        this.user = exec("git config user.name").toString("utf8").trim();
+    }
+    async init() {
+        let res = await checkUpdate();
+        if (!res) {
+            let toTag = await askTag('请选择要创建的Tag:');
+            let fromTag = await askTag('基于哪个Tag创建:');
+            if (toTag.type == fromTag.type) {
+                console.log()
+                console.log(chalk.red("无法创建Tag：\n\n" + "from：" + fromTag.type + "\n" + "to：" + toTag.type))
+                console.log()
+            } else {
+                if (this.setTag(toTag.type, fromTag.type)) {
+                    let version = exec(`git log ${fromTag.type} -1 --oneline`).toString("utf-8").split(" ")[1];
+                    notifyDingDing(toTag.type, version, projectConfig, this.user)
+                }
+
+            }
+        }
+    }
+    /**
+      * 设置Tags
+      */
+    setTag(toTag, fromTag) {
+        console.log(chalk.green('开始创建Tag，请稍后...'));
+        try {
+            // 更新tag
+            exec("git fetch --tags -f")
+        } catch (error) {
+            return false;
+        }
+
+        try {
+            // 删除本地Tag
+            exec("git tag -d " + toTag)
+        } catch (error) {
+        }
+
+        try {
+            // 删除远程Tag
+            exec("git push origin :refs/tags/" + toTag)
+        } catch (error) {
+        }
+
+        // 添加tag
+        exec("git tag " + toTag + " " + fromTag + " -f")
+
+        // 推送tag
+        exec("git push --tags")
+
+        console.log(chalk.green('Tag设置成功！'));
+        console.log();
+        return true;
+    }
+}
+module.exports = Builder;

package/src/creatorTemProject.js

@@ -25,7 +25,8 @@ class Creator {
         let res = await checkUpdate();
         if (!res) {
             console.log()
-            console.log(chalk.green('欢迎使用Cloudcc-CLI'));
+            console.log(chalk.green('欢迎使用CloudCC-CLI'));
+            console.log()
             this.ask().then(answers => {
                 this.options = Object.assign({}, this.options, answers);
                 console.log(this.options);

package/src/publishProject.js

@@ -48,7 +48,9 @@ class Publish {
      */
     async init() {
         // 检查cli版本，提示用户更新：false：不更新，true：更新
-        let update = await checkUpdate();
+        // let update = false
+        let update = false;
+        // let update = await checkUpdate();
         if (!update) {
             // 1：版本发布信息，包含发布版本类型信息
             let condition = {};
@@ -87,10 +89,9 @@ class Publish {
             console.log();
             console.log(chalk.green('待发布版本：' + version));
             console.log();
-
             // 3.1：将版本信息写入env文件中，公其他业务使用
             try {
-                fs.writeFileSync(".env.production", "VUE_APP_PROJECT_VERSION = " + condition.type, 'utf-8')
+                fs.writeFileSync(".env.production", "VUE_APP_PROJECT_VERSION = " + condition.type + "-" + version, 'utf-8')
             } catch (error) {
             }
 

package/src/publishProjectH5.js

@@ -0,0 +1,179 @@
+const exec = require('child_process').execSync;
+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 { jenkins } = require("../utils/trigger")
+// 通知飞书
+const { notifyFeishu, notifyDingDing } = require("../utils/notifyIM")
+// 时间库
+const dayjs = require("dayjs")
+/**
+ * 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") || exec("git config user.name").toString("utf8").trim();
+    }
+    /**
+     * 初始化
+     */
+    async init() {
+        // 检查cli版本，提示用户更新：false：不更新，true：更新
+        // let update = false
+        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：开始打包
+            if (await this.build()) {
+                // 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);
+                } catch (error) {
+                    console.log(chalk.red("版本信息写入异常：" + error))
+                }
+
+                // 7：发布代码并设置tags,触发发布,飞书提醒
+                if (pushCodeAndTags([condition.type], this.args.get("update"))) {
+                    if (projectConfig && projectConfig.config) {
+                        jenkins(projectConfig.config["jenkins-" + condition.type])
+                    }
+                    notifyDingDing(condition.type, version, projectConfig, this.user)
+                    console.log();
+                    console.log(chalk.green('发布完成'));
+                    console.log();
+                }
+            }
+
+        }
+    }
+    /**
+     * 编译代码
+     * @param {发布类型} types：Dev,uat,Release，GA，RC
+     * @param {发布版本} versions：V12.0.0
+     * @returns 
+     */
+    async build() {
+        console.log(chalk.green('开始编译，请稍后...'));
+        console.log();
+        // 打包命令
+        try {
+            // /Applications/HBuilderX.app/Contents/MacOS/cli macos路径
+            exec('cli.exe publish --platform h5 --project ' + projectConfig.name);
+            console.log(chalk.green('编译成功！'));
+            console.log();
+            return true;
+        } catch (error) {
+            console.log(chalk.red('编译失败！' + error.toString()));
+            return false
+        }
+
+    }
+    /**
+     * 将版本信息写入文件
+     * @param {版本信息} version 
+     * @param {输出路径} outPath 
+     */
+    writeVersion(version, outPath = "dist") {
+        try {
+            // 获得分支信息
+            let branch = exec('git rev-parse --abbrev-ref HEAD');
+            branch = branch.toString("utf8").trim();
+            // 获得提交版本信息
+            var gitHEAD = fs.readFileSync('.git/HEAD', 'utf-8').trim()
+            var ref = gitHEAD.split(': ')[1]
+            var develop = gitHEAD.split('/')[2]
+            var gitVersion = fs.readFileSync('.git/' + ref, 'utf-8').trim()
+            var gitCommitVersion = '"' + develop + ': ' + gitVersion + '"'
+
+            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>分支：${branch}</div>
+    <div>版本号：${version}</div>
+    <div>提交Hash：${gitCommitVersion}</div>
+    <div>发布时间：${dayjs().format('YYYY-MM-DD HH:mm:ss')}</div>
+    <div>发布人员：${this.user}</div>
+</div>
+</div>
+</body>
+
+</html>
+`
+            fs.writeFileSync(outPath + "/version.html", versionInfo, 'utf-8');
+            return true
+        } catch (error) {
+            return false
+        }
+    };
+}
+
+module.exports = Publish;
+
+

package/template/httpjs

@@ -1,6 +1,6 @@
-import VueCookies from "vue-cookies";
 import axios from 'axios'
 import packageJson from '../package.json'
+import * as CCDK from "cloudcc-ccdk/lib/ccdk.min.js";
 const service = axios.create({
   timeout: 60000, // request timeout
   headers: {
@@ -8,10 +8,10 @@ const service = axios.create({
   },
 })
 
-// request interceptor  
+// request interceptor
 service.interceptors.request.use(
   config => {
-    config.headers.accessToken = VueCookies.get("JSESSIONID")
+    config.headers.accessToken = CCDK.CCToken.getToken()
     return config
   },
   error => {
@@ -39,7 +39,7 @@ const formateData = data => {
     head: {
       appType: packageJson.name,
       appVersion: packageJson.version,
-      accessToken: VueCookies.get("JSESSIONID")
+      accessToken: CCDK.CCToken.getToken()
     },
     body: {
       ...data

package/template/index.js

@@ -24,6 +24,10 @@ module.exports = function (creator, options, callback) {
         name, description
     })
 
+    creator.copyTpl('package-lockjson', path.join(projectPath, "package-lock.json"), {
+        name, description
+    })
+
     creator.copyTpl('vueconfigjs', path.join(projectPath, "vue.config.js"))
 
     creator.copyTpl('babelconfigjs', path.join(projectPath, "babel.config.js"))