cloudcc-cli 1.6.4 → 1.6.6

package/src/script/publish.js

@@ -1,69 +1,62 @@
-// 检查cli版本更新功能
-const { checkUpdate } = require("../../utils/checkVersion")
-const fs = require("fs");
-const path = require("path")
-const chalk = require("chalk")
-const { post } = require("../../utils/http")
-const { getPackageJson } = require("../../utils/utils")
-const BaseUrl = "https://developer.apis.cloudcc.cn"
-/**
- * 发布脚本
- * @param {string} argvs 参数
- */
-async function publish(argvs) {
-  let name = argvs[2]
-  let res = await checkUpdate();
-  if (!res) {
-    const srcPath = path.join(process.cwd(), `script/${name}/`);
-    let classContent = fs.readFileSync(srcPath + `${name}.js`, 'utf8').replace(/\s+/g, '').replace(/\n/g, '').match(/\{([\s\S]*?)\}/)[1];
-    let configContent = JSON.parse(fs.readFileSync(srcPath + "config.json", 'utf8'));
-    let configContentOld = JSON.parse(JSON.stringify(configContent))
-
-    if (classContent) {
-      let devConsoleConfig = getPackageJson()
-      // 如果不是私有化部署，那么需要获取token
-      if ("private" != devConsoleConfig.version) {
-        devConsoleConfig = { "accessToken": await getToken(devConsoleConfig) };
-      }
-      console.log(chalk.green('发布中，请稍后...'));
-      configContent.scriptContent = classContent
-      let res = await post((devConsoleConfig.baseUrl || BaseUrl) + "/devconsole/script/saveClientScript", configContent, devConsoleConfig)
-      if (res.result) {
-        console.log();
-        console.log(chalk.green('发布成功！'));
-        console.log();
-        // 组件发布成功后，判断下配置文件是否有id，如果没有，那么将id存储到配置中
-        if (!configContentOld.id) {
-          configContentOld.id = res.data
-          fs.writeFileSync(path.join(srcPath, "config.json"), JSON.stringify(configContentOld))
-        }
-      } else {
-        console.log();
-        console.log(chalk.red('发布失败：' + res.returnInfo));
-        console.log();
-      }
-    } else {
-      console.log();
-      console.log(chalk.red('脚本内容无效'));
-      console.log();
-    }
-  }
-}
-
-
-/**
- * 请求用户token
- * @param {用户信息} devConsoleConfig
- * @returns token
- */
-async function getToken(devConsoleConfig) {
-  let res = await post(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;
-  }
-}
-
-module.exports = publish;
+
+const { checkUpdate } = require("../../utils/checkVersion")
+const fs = require("fs");
+const path = require("path")
+const chalk = require("chalk")
+const { post } = require("../../utils/http")
+const { getPackageJson } = require("../../utils/utils")
+const BaseUrl = "https://developer.apis.cloudcc.cn"
+
+async function publish(argvs) {
+  let name = argvs[2]
+  let res = await checkUpdate();
+  if (!res) {
+    const srcPath = path.join(process.cwd(), `script/${name}/`);
+    let classContent = fs.readFileSync(srcPath + `${name}.js`, 'utf8').replace(/\s+/g, '').replace(/\n/g, '').match(/\{([\s\S]*?)\}/)[1];
+    let configContent = JSON.parse(fs.readFileSync(srcPath + "config.json", 'utf8'));
+    let configContentOld = JSON.parse(JSON.stringify(configContent))
+
+    if (classContent) {
+      let devConsoleConfig = getPackageJson()
+      
+      if ("private" != devConsoleConfig.version) {
+        devConsoleConfig = { "accessToken": await getToken(devConsoleConfig) };
+      }
+      console.log(chalk.green('Posting, please wait...'));
+      configContent.scriptContent = classContent
+      let res = await post((devConsoleConfig.baseUrl || BaseUrl) + "/devconsole/script/saveClientScript", configContent, devConsoleConfig)
+      if (res.result) {
+        console.log();
+        console.log(chalk.green('Success！'));
+        console.log();
+        
+        if (!configContentOld.id) {
+          configContentOld.id = res.data
+          fs.writeFileSync(path.join(srcPath, "config.json"), JSON.stringify(configContentOld))
+        }
+      } else {
+        console.log();
+        console.log(chalk.red('Fail：' + res.returnInfo));
+        console.log();
+      }
+    } else {
+      console.log();
+      console.log(chalk.red('Invalid Script Content'));
+      console.log();
+    }
+  }
+}
+
+
+
+async function getToken(devConsoleConfig) {
+  let res = await post(devConsoleConfig.baseUrl || BaseUrl + "/sysconfig/auth/pc/1.0/post/tokenInfo", devConsoleConfig);
+  if (res.returnCode == 200) {
+    return res.data.accessToken;
+  } else {
+    console.error(chalk.red(`Login failed`, JSON.stringify(res)));
+    return null;
+  }
+}
+
+module.exports = publish;

package/src/timer/create.js

@@ -1,29 +1,26 @@
-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 timerPath = path.join(process.cwd(), "timer/" + name);
-        try {
-            fs.mkdirSync(timerPath, { recursive: true })
-            const javaTmp = `System.out.print("hello CloudCC");`
-            fs.writeFileSync(path.join(timerPath, name + ".java"), javaTmp)
-            fs.writeFileSync(path.join(timerPath, "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;
+const { checkUpdate } = require("../../utils/checkVersion")
+const fs = require("fs");
+const path = require("path")
+const chalk = require("chalk")
+
+async function create(name) {
+    let res = await checkUpdate();
+    if (!res) {
+        const timerPath = path.join(process.cwd(), "timer/" + name);
+        try {
+            fs.mkdirSync(timerPath, { recursive: true })
+            const javaTmp = `System.out.print("hello CloudCC");`
+            fs.writeFileSync(path.join(timerPath, name + ".java"), javaTmp)
+            fs.writeFileSync(path.join(timerPath, "config.json"), `{"name":"${name}","version":"3"}`)
+            console.log()
+            console.log(chalk.green("Successfully Created:" + name))
+            console.log()
+        } catch (e) {
+            console.log()
+            console.log(chalk.red("Creation Failed:" + e))
+            console.log()
+        }
+    }
+}
+
+module.exports = create;

package/src/timer/index.js

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

package/src/timer/publish.js

@@ -1,47 +1,43 @@
-// 检查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 timerPath = path.join(process.cwd(), `timer/${name}/`);
-    let classContent = fs.readFileSync(timerPath + `${name}.java`, 'utf8');
-    let configContent = JSON.parse(fs.readFileSync(timerPath + "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 + "/setup/api/ccPeak/save", body)
-      if (res.result) {
-        console.log(chalk.green('发布成功！'));
-        console.log();
-        // 组件发布成功后，判断下配置文件是否有id，如果没有，那么将id存储到配置中
-        if (!configContent.id) {
-          configContent.id = res.data
-          fs.writeFileSync(path.join(timerPath, "config.json"), JSON.stringify(configContent))
-        }
-      } else {
-        console.log(chalk.red('发布失败：' + res.returnInfo));
-      }
-    }
-  }
-}
-module.exports = publish;
+
+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")
+
+async function publish(name) {
+  let res = await checkUpdate();
+  if (!res) {
+    console.log();
+    console.log(chalk.green('Posting, please wait...'));
+    console.log();
+    const timerPath = path.join(process.cwd(), `timer/${name}/`);
+    let classContent = fs.readFileSync(timerPath + `${name}.java`, 'utf8');
+    let configContent = JSON.parse(fs.readFileSync(timerPath + "config.json", 'utf8'));
+    
+    if (await getBusToken()) {
+      let body = {
+        "id": configContent.id,
+        "name": name,
+        "version": configContent.version,
+        "source": encodeURI(classContent),
+        "folderId": "wgd"
+      }
+      let res = await postNormal(global.setupSvc + "/api/ccPeak/save", body)
+      if (res.result) {
+        console.log(chalk.green('Success！'));
+        console.log();
+        
+        if (!configContent.id) {
+          configContent.id = res.data
+          fs.writeFileSync(path.join(timerPath, "config.json"), JSON.stringify(configContent))
+        }
+      } else {
+        console.log(chalk.red('Fail：' + res.returnInfo));
+      }
+    }
+  }
+}
+module.exports = publish;

package/src/token/get.js

@@ -1,13 +1,11 @@
-const { getBusToken } = require("../../utils/utils")
-/**
- * 获取token
- */
-async function get(path) {
-    let token = await getBusToken(path)
-    if (token) {
-        console.log(token)
-        return token;
-    }
-}
-
-module.exports = get;
+const { getBusToken } = require("../../utils/utils")
+
+async function get(path) {
+    let token = await getBusToken(path)
+    if (token) {
+        console.log(token)
+        return token;
+    }
+}
+
+module.exports = get;

package/src/token/index.js

@@ -1,7 +1,7 @@
-const cc = {}
-cc.get = require("./get")
-function Token(action,argvs) {
-  cc[action](argvs[2])
-}
-
-module.exports = Token;
+const cc = {}
+cc.get = require("./get")
+function Token(action,argvs) {
+  cc[action](argvs[2])
+}
+
+module.exports = Token;

package/src/triggers/create.js

@@ -1,35 +1,27 @@
-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 triggersPath = path.join(process.cwd(), "triggers/" + name);
-        try {
-            fs.mkdirSync(triggersPath, { recursive: true })
-            const javaTmp = `System.out.print("hello CloudCC");`
-            fs.writeFileSync(path.join(triggersPath, name + ".java"), javaTmp)
-            fs.writeFileSync(path.join(triggersPath, "config.json"),
-                `{
-    "isactive":false,
-    "targetObjectId":"account",
-    "triggerTime":"beforeInsert",
-    "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;
+const { checkUpdate } = require("../../utils/checkVersion")
+const fs = require("fs");
+const path = require("path")
+const chalk = require("chalk")
+
+async function create(argvs) {
+    let res = await checkUpdate();
+    if (!res) {
+        let body = JSON.parse(decodeURI(argvs[2]))
+        const triggersPath = path.join(process.cwd(), "triggers/" + body.name);
+        try {
+            fs.mkdirSync(triggersPath, { recursive: true })
+            const javaTmp = `System.out.print("hello CloudCC");`
+            fs.writeFileSync(path.join(triggersPath, body.name + ".java"), javaTmp)
+            fs.writeFileSync(path.join(triggersPath, "config.json"), JSON.stringify(body))
+            console.log()
+            console.log(chalk.green("Successfully Created:" + body.name))
+            console.log()
+        } catch (e) {
+            console.log()
+            console.log(chalk.red("Creation Failed:" + e))
+            console.log()
+        }
+    }
+}
+
+module.exports = create;

package/src/triggers/index.js

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

package/src/triggers/publish.js

@@ -1,51 +1,48 @@
-// 检查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 triggersPath = path.join(process.cwd(), `triggers/${name}/`);
-    let classContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
-    let configContent = JSON.parse(fs.readFileSync(triggersPath + "config.json", 'utf8'));
-    // 获取token成功后，发布内容
-    if (await getBusToken()) {
-      let body = {
-        "id": configContent.id,
-        "apiname": configContent.apiname,
-        "isactive": configContent.isactive,
-        "targetObjectId": configContent.targetObjectId,
-        "triggerTime": configContent.triggerTime,
-        "name": name,
-        "version": configContent.version,
-        "triggerSource": encodeURI(classContent),
-        "folderId": "wgd"
-      }
-      let url = new URL(global.baseUrl).origin
-      let res = await postNormal(url + "/setup/api/triggerSetup/saveTrigger", body)
-      if (res.result) {
-        console.log(chalk.green('发布成功！'));
-        console.log();
-        // 组件发布成功后，判断下配置文件是否有id，如果没有，那么将id存储到配置中
-        if (!configContent.id) {
-          configContent.id = res.data.id
-          configContent.apiname = res.data.apiname
-          fs.writeFileSync(path.join(triggersPath, "config.json"), JSON.stringify(configContent))
-        }
-      } else {
-        console.log(chalk.red('发布失败：' + res.returnInfo));
-      }
-    }
-  }
-}
-module.exports = publish;
+
+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")
+
+async function publish(argvs) {
+  let name = argvs[2]
+  let res = await checkUpdate();
+  if (!res) {
+    console.log();
+    console.log(chalk.green('Posting, please wait...'));
+    console.log();
+    const triggersPath = path.join(process.cwd(), `triggers/${name}/`);
+    let classContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
+    let configContent = JSON.parse(fs.readFileSync(triggersPath + "config.json", 'utf8'));
+    
+    if (await getBusToken()) {
+      let body = {
+        "id": configContent.id,
+        "apiname": configContent.apiname,
+        "isactive": configContent.isactive,
+        "targetObjectId": configContent.targetObjectId,
+        "triggerTime": configContent.triggerTime,
+        "name": name,
+        "version": configContent.version,
+        "triggerSource": encodeURI(classContent),
+        "folderId": "wgd"
+      }
+      let res = await postNormal(global.setupSvc + "/api/triggerSetup/saveTrigger", body)
+      if (res.result) {
+        console.log(chalk.green('Success！'));
+        console.log();
+        
+        if (!configContent.id) {
+          configContent.id = res.data.id
+          configContent.apiname = res.data.apiname
+          fs.writeFileSync(path.join(triggersPath, "config.json"), JSON.stringify(configContent))
+        }
+      } else {
+        console.log(chalk.red('Fail：' + res.returnInfo));
+      }
+    }
+  }
+}
+module.exports = publish;

package/template/Appvue

@@ -1,30 +1,30 @@
-<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 {
-  name: "App",
-};
-</script>
-
-<style lang="scss" scoped>
-html body {
-  padding: 0;
-  margin: 0;
-  height: 100vh;
-  width: 100%;
-}
-.cc-container {
-  text-align: center;
-  padding: 8px;
-  background: goldenrod;
-}
+<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 {
+  name: "App",
+};
+</script>
+
+<style lang="scss" scoped>
+html body {
+  padding: 0;
+  margin: 0;
+  height: 100vh;
+  width: 100%;
+}
+.cc-container {
+  text-align: center;
+  padding: 8px;
+  background: goldenrod;
+}
 </style>

package/template/babelconfigjs

@@ -1,5 +1,5 @@
-module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
-}
+module.exports = {
+  presets: [
+    '@vue/cli-plugin-babel/preset'
+  ]
+}

package/template/demojava

@@ -1,15 +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;
-    }
+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;
+    }
 }