cloudcc-cli 1.5.6 → 1.5.8

package/template/index.js

@@ -8,18 +8,22 @@ module.exports = function (creator, options, callback) {
 
 
     const projectPath = path.join(cwd, name);
-    const pluginPath = path.join(projectPath, "plugin");
-    const src = path.join(projectPath, "src");
-    const utils = path.join(projectPath, "utils");
-    const public = path.join(projectPath, "public");
-
-    //新建项目目录
-    //同步创建目录，以免文件目录不对齐
     fs.mkdirSync(projectPath)
+
+    const pluginPath = path.join(projectPath, "plugin");
     fs.mkdirSync(pluginPath)
+
+    fs.mkdirSync(path.join(projectPath, "classes"))
+    const classesPath = path.join(projectPath, "classes/classdemo");
+    fs.mkdirSync(classesPath)
+
+    const src = path.join(projectPath, "src");
     fs.mkdirSync(src)
+
+    const public = path.join(projectPath, "public");
     fs.mkdirSync(public)
 
+
     creator.copyTpl('packagejson', path.join(projectPath, "package.json"), {
         name, description
     })
@@ -40,6 +44,10 @@ module.exports = function (creator, options, callback) {
 
     creator.copyTpl('indexhtml', path.join(public, "index.html"))
 
+    creator.copyTpl('demojava', path.join(classesPath, "demo.java"))
+
+    creator.copyTpl('javaconfigjson', path.join(classesPath, "config.json"))
+
 
     creator.fs.commit(() => {
         console.log();
@@ -47,6 +55,10 @@ module.exports = function (creator, options, callback) {
         console.log(`${chalk.grey(`创建目录: ${name}/plugin`)} ${chalk.green('✔ ')}`);
         console.log(`${chalk.grey(`创建文件: ${name}/plugin/index.vue`)} ${chalk.green('✔ ')}`);
 
+        console.log(`${chalk.grey(`创建目录: ${name}/classes/classdemo`)} ${chalk.green('✔ ')}`);
+        console.log(`${chalk.grey(`创建文件: ${name}/classdemo/demo.java`)} ${chalk.green('✔ ')}`);
+        console.log(`${chalk.grey(`创建文件: ${name}/classdemo/config.json`)} ${chalk.green('✔ ')}`);
+
         console.log(`${chalk.grey(`创建目录: ${name}/public`)} ${chalk.green('✔ ')}`);
         console.log(`${chalk.grey(`创建文件: ${name}/plugin/index.html`)} ${chalk.green('✔ ')}`);
 

package/template/javaconfigjson

@@ -0,0 +1,3 @@
+{
+    "name": "demo"
+}

package/utils/checkVersion.js

@@ -5,7 +5,7 @@ const exec = require('child_process').execSync;
 const chalk = require("chalk")
 
 /**
-* 检查版本号
+* 检查cli版本号
 */
 function checkNpmVersion() {
     let currentVersion = Number(config.version.replace(/\./g, ""));

package/utils/http.js

@@ -1,4 +1,16 @@
+const https = require("https")
+const http = require("http")
 const axios = require("axios")
+
+const httpsAgent = new https.Agent({
+  rejectUnauthorized: false,
+})
+const httpAgent = new http.Agent({
+  rejectUnauthorized: false,
+})
+axios.defaults.httpsAgent = httpsAgent
+axios.defaults.httpAgent = httpAgent
+
 const service = axios.create({
   timeout: 60000, // request timeout
   headers: {
@@ -9,6 +21,9 @@ const service = axios.create({
 // request interceptor  
 service.interceptors.request.use(
   config => {
+    if (global.accessToken) {
+      config.headers.accessToken = global.accessToken
+    }
     return config
   },
   error => {
@@ -53,6 +68,13 @@ module.exports = {
       responseType: responseType
     })
   },
+  getParams: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'get',
+      params: data,
+    })
+  },
   post: (url, data = {}, header = { appVersion: "1.0.0" }, responseType = '') => {
     return service({
       url: url,
@@ -65,7 +87,7 @@ module.exports = {
     return service({
       url: url,
       method: 'post',
-      params: data
+      params: data,
     })
   },
   postNormal: (url, data = {}) => {
@@ -96,4 +118,5 @@ module.exports = {
       data: formateData(data)
     })
   }
+
 }

package/utils/utils.js

@@ -0,0 +1,44 @@
+const { getParams, postNormal } = require("./http")
+const fs = require("fs");
+const path = require("path")
+
+/**
+ * 获得配置信息
+ * @returns 配置信息
+ */
+function getPackageJson() {
+    const packageJson = JSON.parse(fs.readFileSync(path.join(process.cwd(), "package.json"), 'utf8'));
+    return packageJson.devConsoleConfig;
+}
+/**
+ * 获取业务访问baseurl
+ */
+async function getBaseUrl(orgId) {
+    let u = "https://developer.apis.cloudcc.cn/oauth/apidomain?scope=cloudccCRM&orgId=" + orgId
+    let res = await getParams(u)
+    global.baseUrl = res.orgapi_address
+}
+/**
+ * 获取业务token
+ */
+async function getBusToken() {
+    let devConfig = getPackageJson();
+    let body = {
+        username: devConfig.username,
+        safetyMark: devConfig.safetyMark,
+        clientId: devConfig.clientId,
+        secretKey: devConfig.openSecretKey,
+        orgId: devConfig.orgId
+    }
+    await getBaseUrl(devConfig.orgId)
+
+    let res = await postNormal(global.baseUrl + "/api/cauth/token", body)
+    if (res.result) {
+        global.accessToken = res.data.accessToken
+        return true;
+    }
+    return false
+}
+
+
+module.exports = { getBusToken }

package/bin/build.js

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

package/bin/buildccbasesdk.js

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

package/bin/buildccsdk.js

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

package/bin/buildtag.js

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

package/bin/create.js

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

package/bin/createPlugin.js

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

package/bin/publish.js

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

package/bin/publishBuild.js

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

package/bin/publishh5.js

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

package/bin/publishh5Build.js

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

package/src/buildTag.js

@@ -1,75 +0,0 @@
-// 同步执行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/builderBaseSDK.js

@@ -1,90 +0,0 @@
-// 同步执行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 { askType, askTypeOther } = require("../utils/askTool")
-// 提交代码，设置Tag
-const { getNewVersionName, pushCodeAndTags } = require("../utils/pushCode")
-// 通知飞书
-const { notifyDingDing } = require("../utils/NotifyIM")
-// 网络请求
-const { postParams } = require("../utils/http")
-/**
- * 打包基础SDK，并发布到NPM
- */
-class Builder {
-    constructor() {
-    }
-    async init() {
-        let res = await checkUpdate();
-        if (!res) {
-            let condition = await askType();
-            if ("other" == condition.type) {
-                condition = await askTypeOther();
-            }
-            let version = getNewVersionName([condition.type])
-            if (condition && condition.type) {
-                if (this.buildpush2npm(version[0].split("V")[1])) {
-                    pushCodeAndTags([condition.type])
-                    // notifyFeishu(condition.type, version, projectConfig);
-                    notifyDingDing(condition.type, version, projectConfig);
-                    console.log(chalk.green('发布完成'));
-                }
-            } else {
-                console.log();
-                console.log(chalk.red("请至少设置一个有效的Tag"));
-                console.log();
-            }
-        }
-    }
-    /**
-     * 打包并发布到npm
-     * @returns null
-     */
-    buildpush2npm(version) {
-        try {
-            // 设置package.json版本号
-            projectConfig.version = version;
-            fs.writeFileSync('package.json', JSON.stringify(projectConfig), 'utf8')
-        } catch (e) {
-            console.log(e);
-        }
-        try {
-            console.log()
-            console.log(chalk.green("开始编译，请稍后..."));
-            exec('npm run build');
-            console.log()
-            console.log(chalk.green("编译完成"));
-        } catch (error) {
-            console.log();
-            console.log(chalk.red('编译失败：' + error));
-            return false;
-        }
-        try {
-            console.log()
-            console.log(chalk.green("NPM开始发布，请稍后..."));
-            exec(`npm publish --registry https://registry.npmjs.org`)
-            try {
-                postParams(`https://npm.taobao.org/sync/${projectConfig.name}`)
-            } catch (error) {
-
-            }
-            console.log()
-            console.log(chalk.green("NPM发布完成"));
-            return true
-        } catch (error) {
-            console.log();
-            console.log(chalk.red('NPM发布失败：' + error));
-            return false
-        }
-    }
-
-}
-module.exports = Builder;

package/src/builderCreate.js

@@ -1,84 +0,0 @@
-const fs = require('fs');
-const path = require("path")
-const chalk = require("chalk")
-const inquirer = require("inquirer")
-// 检查cli版本更新功能
-const { checkUpdate } = require("../utils/checkVersion")
-const BaseUrl = "https://developer.apis.cloudcc.cn"
-const axios = require("axios")
-const temp = `<template>
-<div class="cc-container">
-  <div>Hello CloudCC</div>
-  <div>
-    <a href="https://cloudccone.feishu.cn/wiki/JZ7CwcRfriU8taknCKCcwKEmncd">
-      开发者文档</a
-    >
-  </div>
-</div>
-</template>
-
-<script>
-export default {
-data() {
-  return {
-    componentInfo: {
-      // 组件唯一标识，全局唯一
-      component: "cloudcc-demo-01",
-      // 组件名称，在页面编辑器显示的名字
-      compName: "cloudcc-demo-01",
-      // 组件描述信息
-      compDesc: "组件描述信息",
-    },
-    isLock: false,
-  };
-},
-};
-</script>
-<style lang="scss" scoped>
-.cc-container {
-text-align: center;
-padding: 8px;
-background: goldenrod;
-}
-</style>`
-/**
- * 创建组件模板文件
- */
-class Builder {
-    constructor() {
-        this.options = {
-            // 开发配置信息
-            devConsoleConfig: {
-            },
-        }
-        this.plugin = process.argv.splice(2)[0]
-    }
-    async init() {
-        let res = await checkUpdate();
-        if (!res) {
-            // 获得用户输入
-            let answers;
-            if (this.plugin) {
-                answers = { buildFileName: this.plugin + "/demo.vue" }
-            } else {
-                answers = await this.ask();
-                answers.buildFileName = "./plugin/" + answers.buildFileName
-            }
-            fs.writeFileSync(answers.buildFileName, temp);
-        }
-    }
-    /**
-     *  命令行交互
-     * @returns 结果
-     */
-    ask() {
-        const prompt = [];
-        prompt.push({
-            type: "input",
-            name: "buildFileName",
-            message: "请输入文件名，如index.vue",
-        })
-        return inquirer.prompt(prompt)
-    }
-}
-module.exports = Builder;

package/src/builderSDK.js

@@ -1,162 +0,0 @@
-const { execSync } = require('child_process');
-const { post } = require('../utils/http');
-const fs = require('fs');
-const path = require("path")
-const chalk = require("chalk")
-const inquirer = require("inquirer")
-const { checkUpdate } = require("../utils/checkVersion")
-const BaseUrl = "https://developer.apis.cloudcc.cn"
-/**
- * 打包业务sdk为js并发布到cdn
- */
-class Builder {
-    constructor() {
-        this.options = {
-            // 开发配置信息
-            devConsoleConfig: {
-            },
-        }
-    }
-    async init() {
-        let res = await checkUpdate();
-        if (!res) {
-            this.options.devConsoleConfig = this.getPackageJson();
-            // 获得用户输入
-            let answers = await this.ask();
-            if (answers.types.length == 0) {
-                console.log();
-                console.error(chalk.red(`请选择一个有效的发布版本！`));
-                console.log();
-                return;
-            }
-            // 获得vue内容
-            let obj = this.getSDKName(answers.buildDirName);
-            obj.type = answers.types;
-            this.build(obj) && this.upload(obj);
-        }
-    }
-    /**
-     *  命令行交互
-     * @returns 结果
-     */
-    ask() {
-        const prompt = [{
-            type: 'list',
-            message: '请选择发布版本:',
-            name: 'types',
-            choices: [
-                { name: "客户环境-Release", value: "release" },
-                { name: "公司环境-GA", value: "ga" },
-                { name: "uat环境-Beta", value: "beta" },
-                { name: "测试环境-Dev", value: "dev" },
-            ],
-        }, {
-            type: "input",
-            name: "buildDirName",
-            message: "请输入需要编译的目录名称，如Detail：",
-        }];
-        return inquirer.prompt(prompt)
-    }
-    /**
-     * 获得用户信息
-     * @returns 配置信息
-     */
-    getPackageJson() {
-        const packageJson = JSON.parse(fs.readFileSync("package.json", 'utf8'));
-        return packageJson.devConsoleConfig; // cloudcc-plugin 中的 devConsoleConfig
-    }
-    /**
-     * 请求用户token
-     * @param {用户信息} devConsoleConfig 
-     * @returns token
-     */
-    async getToken(devConsoleConfig) {
-        let res = await post(this.options.devConsoleConfig.baseUrl || BaseUrl + "/sysconfig/auth/pc/1.0/post/tokenInfo", devConsoleConfig);
-        if (res.returnCode == 200) {
-            return res.data.accessToken;
-        } else {
-            console.error(chalk.red(`登录失败`, JSON.stringify(res)));
-            return null;
-        }
-    }
-    /**
-    * 获得sdk名字
-    */
-    getSDKName(buildFileName) {
-        let vueContent = fs.readFileSync(path.join("packages", buildFileName, "src", "index.vue"), 'utf8');
-
-        let sdkName = "cc-" + vueContent.split("\"cc-")[1].split("\"")[0]
-
-        return { sdkName, path: path.join("packages", buildFileName) }
-    };
-    /**
-     * 编译文件，将vue编译为js文件
-     * @param {编译对象信息} obj 
-     */
-    build(obj) {
-        try {
-            console.log(chalk.green('编译中，请稍后...'));
-            console.log()
-            execSync(`npx vue-cli-service build --target lib --name ${obj.sdkName} --dest ${path.join(obj.path, "lib")} ${path.join(obj.path, "index.js")}`);
-            console.log(chalk.green('编译成功！'));
-            console.log()
-            return true
-        } catch (e) {
-            console.log(chalk.red("编译失败：", e.toString("utf8").trim()));
-            console.log()
-            return false;
-        }
-    }
-    /**
-    * 将文件上传
-    */
-    async upload(obj) {
-        console.log(chalk.green('发布中，请稍后...'));
-        console.log()
-        let jsContent = "";
-        try {
-            jsContent = fs.readFileSync(path.join(obj.path, "lib", obj.sdkName + ".umd.min.js"), 'utf8')
-        } catch (err) {
-            console.error(err)
-        }
-        let body = {
-            fileInfo: []
-        };
-        body.fileInfo.push(
-            {
-                "fileName": obj.type + "/" + obj.sdkName + ".umd.min.js",
-                "fileContent": jsContent,
-                "bucketName": "cloudcc-sdk",
-            }
-        )
-        let res = await post(this.options.devConsoleConfig.baseUrl || BaseUrl + "/devconsole/cdn/uploadFile",
-            body);
-        if (res.returnCode == 200) {
-            console.error(chalk.green(`发布成功！`));
-            console.log();
-        } else {
-            console.error(chalk.red(`发布失败: ${res.returnInfo}`));
-            console.log();
-        }
-
-        return res;
-    }
-
-    /**
-     * 过滤出min.js文件
-     * @returns  过滤结果
-     */
-    filterFile() {
-        const jsPath = "build";
-        let jsPaths = [];
-        if (jsPath) {
-            jsPaths = fs.readdirSync(jsPath).filter((f) => {
-                return f.endsWith('umd.min.js');
-            }).map((item) => {
-                return path.join(jsPath, item);
-            });
-        }
-        return jsPaths;
-    }
-}
-module.exports = Builder;