cloudcc-cli 1.5.5 → 1.5.7

package/README.md

@@ -1,3 +1,19 @@
+# ReleaseV1.5.7
+#### 发布日期：2024-2-22
+#### 发布范围：全量
+#### 发布内容
+* 优化
+    * axios关闭httpsAgent和httpAgent认证。
+    * 修改生成版本逻辑。
+    * 删除无用代码，只保留cli代码。
+
+# ReleaseV1.5.6
+#### 发布日期：2024-1-3
+#### 发布范围：全量
+#### 发布内容
+* 修复
+    * 组件打包使用build1命令。
+
 # ReleaseV1.5.5
 #### 发布日期：2023-12-26
 #### 发布范围：全量

package/bin/cc.js

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+const chalk = require("chalk")
+
+let argvs = process.argv.splice(2);
+// 动作
+let action = argvs[0]
+if (!action) {
+    console.log()
+    console.log(chalk.yellow("请查看帮助文档：https://help.cloudcc.developer.com"));
+    console.log()
+    return;
+}
+
+// 类型
+let type = argvs[1]
+if (!type) {
+    console.log()
+    console.log(chalk.yellow("请查看帮助文档：https://help.cloudcc.developer.com"));
+    console.log()
+    return;
+}
+
+// 要创建的资源名称
+let name = argvs[2]
+if (!name) {
+    console.log()
+    console.log(chalk.yellow("请查看帮助文档：https://help.cloudcc.developer.com"));
+    console.log()
+    return;
+}
+
+
+const cc = {}
+// 类的管理
+cc.classes = require("../src/classes/index")
+// 组件的管理
+cc.plugin = require("../src/plugin/index")
+try {
+    cc[type](action, name);
+} catch (e) {
+    console.log()
+    console.log(chalk.yellow("请查看帮助文档：https://help.cloudcc.developer.com"));
+    console.log()
+}

package/bin/plugin.js

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

package/bin/project.js

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

package/cloudcc-cli/accessToken

@@ -0,0 +1 @@
+eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJjbG91ZGNjIiwibG9naW5OYW1lIjoidGVzdHVhdEBjbG91ZGNjLmNvbSIsImJpbmRpbmciOiJjOTExNWExNC05YjUzLTRiMTQtYjc1MC01MTFkYzY1NDk4MjQiLCJDbGllbnRJZCI6IjJaTFdoZW94UWxRQTZHeU51cHdQY1BiRUciLCJleHAiOjE3MDcyNzE1ODQsIm9yZ0lkIjoib3JnMDhmODRlOWMwNTY2ZWFmMGMifQ.6WyZ2VZqNanyGYNZYKp9lPiqbf2iUSSCe86WMyQq9_k

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "cloudcc-cli",
   "keywords": [
     "cloudcc",
@@ -10,20 +10,13 @@
   "author": "cloudcc",
   "license": "ISC",
   "bin": {
-    "cloudccCreate": "bin/create.js",
-    "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"
+    "cloudccCreate": "bin/project.js",
+    "cloudccBuild": "bin/plugin.js",
+    "cc": "bin/cc.js"
   },
   "scripts": {
     "cc-pull": "git fetch --tags -f && git pull",
-    "publish-lib": "npm publish --registry https://registry.npmjs.org && curl https://npmmirror.com/sync/cloudcc-cli"
+    "publish-lib": "npm publish --registry https://registry.npmjs.org --proxy http://127.0.0.1:33210 && curl https://npmmirror.com/sync/cloudcc-cli"
   },
   "dependencies": {
     "axios": "^0.21.4",
@@ -36,6 +29,7 @@
     "marked": "^5.0.1",
     "mem-fs": "^2.2.1",
     "mem-fs-editor": "^9.0.1",
+    "node-localstorage": "^3.0.5",
     "vue-custom-element": "^3.3.0",
     "vue-template-compiler": "^2.6.14"
   }

package/src/classes/create.js

@@ -0,0 +1,43 @@
+const { checkUpdate } = require("../../utils/checkVersion")
+const fs = require("fs");
+const path = require("path")
+const chalk = require("chalk")
+/**
+ * 创建文件
+ * @param {string} name 文件名称
+ */
+async function create(name) {
+    let res = await checkUpdate();
+    if (!res) {
+        const classesPath = path.join(process.cwd(), "classes/" + name);
+        try {
+            fs.mkdirSync(classesPath)
+            const javaTmp = `
+public class ${name}{
+    private UserInfo userInfo;
+    
+    public ${name}(UserInfo userInfo){
+        this.userInfo = userInfo;
+    }
+    
+    
+    public String demo(String str){
+        str = "demo";
+        return str;
+    }
+}
+`
+            fs.writeFileSync(path.join(classesPath, name + ".java"), javaTmp)
+            fs.writeFileSync(path.join(classesPath, "config.json"), `{"name":"${name}","version":"3"}`)
+            console.log()
+            console.log(chalk.green("创建成功：" + name))
+            console.log()
+        } catch (e) {
+            console.log()
+            console.log(chalk.red("创建失败：" + e))
+            console.log()
+        }
+    }
+}
+
+module.exports = create;

package/src/classes/index.js

@@ -0,0 +1,8 @@
+const cc = {}
+cc.create = require("./create")
+cc.publish = require("./publish")
+function Classes(action, name) {
+  cc[action](name)
+}
+
+module.exports = Classes;

package/src/classes/publish.js

@@ -0,0 +1,47 @@
+// 检查cli版本更新功能
+const { checkUpdate } = require("../../utils/checkVersion")
+const fs = require("fs");
+const path = require("path")
+const chalk = require("chalk")
+const { postNormal } = require("../../utils/http")
+
+const { getBusToken } = require("../../utils/utils")
+/**
+ * 发布文件
+ * @param {string} name 文件名称
+ */
+async function publish(name) {
+  let res = await checkUpdate();
+  if (!res) {
+    console.log();
+    console.log(chalk.green('发布中，请稍后...'));
+    console.log();
+    const classPath = path.join(process.cwd(), `classes/${name}/`);
+    let classContent = fs.readFileSync(classPath + `${name}.java`, 'utf8');
+    let configContent = JSON.parse(fs.readFileSync(classPath + "config.json", 'utf8'));
+    // 获取token成功后，发布内容
+    if (await getBusToken()) {
+      let body = {
+        "id": configContent.id,
+        "name": name,
+        "version": configContent.version,
+        "source": encodeURI(classContent),
+        "folderId": "wgd"
+      }
+      let url = new URL(global.baseUrl).origin
+      let res = await postNormal(url + "/ccsetup/api/ccfag/save", body)
+      if (res.result) {
+        console.log(chalk.green('发布成功！'));
+        console.log();
+        // 组件发布成功后，判断下配置文件是否有id，如果没有，那么将id存储到配置中
+        if (!configContent.id) {
+          configContent.id = res.data
+          fs.writeFileSync(path.join(classesPath, "config.json"), JSON.stringify(configContent))
+        }
+      } else {
+        console.log(chalk.red('发布失败：' + res.returnInfo));
+      }
+    }
+  }
+}
+module.exports = publish;

package/src/plugin/create.js

@@ -0,0 +1,80 @@
+const fs = require('fs');
+const inquirer = require("inquirer")
+// 检查cli版本更新功能
+const { checkUpdate } = require("../../utils/checkVersion")
+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/plugin/index.js

@@ -0,0 +1,8 @@
+const cc = {}
+cc.create = require("./create")
+cc.publish = require("./publish")
+function Plugin(action, name) {
+    cc[action](name)
+}
+
+module.exports = Plugin;

package/src/{builderPlugin.js → plugin/publish.js}

@@ -1,13 +1,12 @@
 const { exec } = require('child_process');
-const { post } = require('../utils/http');
+const { post } = require('../../utils/http');
 const fs = require('fs');
 const path = require("path")
 const chalk = require("chalk")
 const inquirer = require("inquirer")
 // 检查cli版本更新功能
-const { checkUpdate } = require("../utils/checkVersion")
+const { checkUpdate } = require("../../utils/checkVersion")
 const BaseUrl = "https://developer.apis.cloudcc.cn"
-const axios = require("axios")
 
 /**
  * 自定义组件，组件打包命令，将组件打包发布到服务器。
@@ -192,7 +191,7 @@ class Builder {
      * @param {string} plginTemp 生成模板代码存储路径
      */
     initPluginFile(buildFileName, component, plginTemp) {
-        this.initPluginFile2(buildFileName, component, plginTemp)
+        this.initPluginFile1(buildFileName, component, plginTemp)
     }
     /**
      * 生成依赖文件，vue-custom-element

package/src/{creatorTemProject.js → project/create.js}

@@ -4,8 +4,7 @@ const memFs = require("mem-fs")
 const memFsEditor = require("mem-fs-editor")
 const fs = require("fs")
 const path = require("path")
-const { checkUpdate } = require("../utils/checkVersion")
-const exec = require('child_process').execSync;
+const { checkUpdate } = require("../../utils/checkVersion")
 /**
  * 创建自定组件开发模板项目
  */
@@ -17,22 +16,27 @@ class Creator {
             description: ""
         }
         // 当前目录
-        this.rootPath = path.resolve(__dirname, "../");
+        this.rootPath = path.resolve(__dirname, "../../");
         // 模板目录
         this.tplDirPath = path.join(this.rootPath, "template");
     }
     // 初始化
-    async init() {
+    async init(name) {
         let res = await checkUpdate();
         if (!res) {
             console.log()
             console.log(chalk.green('欢迎使用CloudCC-CLI'));
             console.log()
-            this.ask().then(answers => {
-                this.options = Object.assign({}, this.options, answers);
-                console.log(this.options);
+            if (!name) {
+                this.ask().then(answers => {
+                    this.options = Object.assign({}, this.options, answers);
+                    console.log(this.options);
+                    this.write();
+                })
+            } else {
+                this.options = { name }
                 this.write();
-            })
+            }
         }
     }
     // 命令行交互
@@ -55,25 +59,17 @@ class Creator {
                 return true;
             }
         });
-        prompt.push({
-            type: "input",
-            name: "description",
-            message: "请输入项目描述",
-        })
         return inquirer.prompt(prompt)
     }
     // 拷贝和写数据
     write() {
         console.log();
         console.log(chalk.green("开始构建，请稍后"));
-        const tplBuilder = require("../template/index");
+        const tplBuilder = require("../../template/index");
         tplBuilder(this, this.options, () => {
-            // console.log();
-            // console.log(chalk.green('安装依赖'));
-            // let os = process.platform
-            // exec(`cd ${this.options.name} && ${'darwin' == os ? 'sudo' : ''} npm install  --registry http://registry.npmmirror.com && code . `)
             console.log();
             console.log(chalk.green('构建完成，运行前请安装依赖'))
+            console.log();
         })
     }
 

package/template/demojava

@@ -0,0 +1,15 @@
+public class Test{
+    private CCServiceV3 cs;
+    private UserInfo userInfo;
+    
+    public Test(UserInfo userInfo){
+        this.userInfo = userInfo;
+        cs = new CCServiceV3(userInfo);
+    }
+    
+    
+    public String demo(String str){
+        str = "demo";
+        return str;
+    }
+}

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,45 @@
+const { getParams, postNormal } = require("./http")
+const LocalStorage = require('node-localstorage').LocalStorage;
+const localStorage = new LocalStorage('./cloudcc-cli');
+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();