cloudcc-cli 1.9.9 → 2.0.1

package/src/object/get.js

@@ -1,79 +1,78 @@
-const { getBusToken } = require("../../utils/utils")
-const { postNormal } = require("../../utils/http")
-
+const { postClass } = require("../../utils/http")
+const { getPackageJson } = require("../../utils/config")
 
 async function get(path, type, object) {
-    if (await getBusToken(path)) {
-        let res = [];
-        if ("fields" === type) {
-            object = JSON.parse(decodeURI(object))
-            let fieldsResults = await postNormal(global.setupSvc + "/api/fieldSetup/queryField", { prefix: object.objprefix })
-            res = {
-                ...object,
-                fields: fieldsResults.data.stdFields.map((field) => {
-                    return {
-                        fieldname: field.labelName,
-                        apiname: field.schemefieldName
-                    }
-                })
-            }
-        } else if ("chat" === type) {
-            //get chat object
-            let standardObjList = await postNormal(global.setupSvc + "/api/customObject/standardObjList");
-            standardObjList.data.map((item) => {
-                res.push({
-                    apiname: item.label,
-                    objname: item.objname,
-                    objprefix: item.objprefix
-                })
+    let res = [];
+    let config = await getPackageJson(path);
+    if ("fields" === type) {
+        object = JSON.parse(decodeURI(object))
+        let fieldsResults = await postClass(config.setupSvc + "/api/fieldSetup/queryField", { prefix: object.objprefix }, config.accessToken)
+        res = {
+            ...object,
+            fields: fieldsResults.data.stdFields.map((field) => {
+                return {
+                    fieldname: field.labelName,
+                    apiname: field.schemefieldName
+                }
             })
-            //get custom object
-            let customObjList = await postNormal(global.setupSvc + "/api/customObject/list")
-            customObjList.data.objList.map((item) => {
-                res.push({
-                    apiname: item.schemetableName,
-                    objname: item.objLabel,
-                    objprefix: item.prefix,
-                })
+        }
+    } else if ("chat" === type) {
+        //get chat object
+        let standardObjList = await postClass(config.setupSvc + "/api/customObject/standardObjList", {}, config.accessToken);
+        standardObjList.data.map((item) => {
+            res.push({
+                apiname: item.label,
+                objname: item.objname,
+                objprefix: item.objprefix
             })
-        } else if ("trigger" === type) {
-            //get trigger object
-            let triggerObjList = await postNormal(global.setupSvc + "/api/trigger/newobjtrigger")
-            triggerObjList.data.targetObjList.map((item) => {
-                res.push({
-                    id: item.id,
-                    label: item.label,
-                    objname: item.schemetable_name,
-                    schemetableName: item.schemetableName
-                })
+        })
+        //get custom object
+        let customObjList = await postClass(config.setupSvc + "/api/customObject/list", {}, config.accessToken)
+        customObjList.data.objList.map((item) => {
+            res.push({
+                apiname: item.schemetableName,
+                objname: item.objLabel,
+                objprefix: item.prefix,
             })
-        } else {
-            //get standar object
-            let standardObjList = await postNormal(global.setupSvc + "/api/customObject/standardObjList")
-            standardObjList.data.forEach((item) => {
-                res.push({
-                    id: item.id,
-                    label: item.objname,
-                    objname: item.label,
-                    objprefix: item.objprefix,
-                    schemetableName: item.label
-                })
+        })
+    } else if ("trigger" === type) {
+        //get trigger object
+        let triggerObjList = await postClass(config.setupSvc + "/api/trigger/newobjtrigger", {}, config.accessToken)
+        triggerObjList.data.targetObjList.map((item) => {
+            res.push({
+                id: item.id,
+                label: item.label,
+                objname: item.schemetable_name,
+                schemetableName: item.schemetableName
             })
-            //get custom object
-            let customObjList = await postNormal(global.setupSvc + "/api/customObject/list")
-            customObjList.data.objList.map((item) => {
-                res.push({
-                    id: item.id,
-                    label: item.objLabel,
-                    objname: item.schemetable_name,
-                    objprefix: item.prefix,
-                    schemetableName: item.schemetableName
-                })
+        })
+
+    } else {
+        //get standar object
+        let standardObjList = await postClass(config.setupSvc + "/api/customObject/standardObjList", {}, config.accessToken)
+        standardObjList.data.forEach((item) => {
+            res.push({
+                id: item.id,
+                label: item.objname,
+                objname: item.label,
+                objprefix: item.objprefix,
+                schemetableName: item.label
             })
-        }
-        console.log(JSON.stringify(res))
-        return res
+        })
+        //get custom object
+        let customObjList = await postClass(config.setupSvc + "/api/customObject/list", {}, config.accessToken)
+        customObjList.data.objList.map((item) => {
+            res.push({
+                id: item.id,
+                label: item.objLabel,
+                objname: item.schemetable_name,
+                objprefix: item.prefix,
+                schemetableName: item.schemetableName
+            })
+        })
     }
+    console.log(JSON.stringify(res));
+    return res
 }
 
 module.exports = get;

package/src/plugin/publish.js

@@ -22,7 +22,7 @@ class Builder {
     async init() {
         let res = await checkUpdate();
         if (!res) {
-            this.options.devConsoleConfig = getPackageJson();
+            this.options.devConsoleConfig = await getPackageJson();
             let config = this.options.devConsoleConfig
 
             if ("private" != this.options.devConsoleConfig.version) {

package/src/plugin/publish1.js

@@ -4,7 +4,6 @@ const fs = require('fs');
 const path = require("path")
 const chalk = require("chalk")
 const { readCache, writeCache } = require("../../utils/cache")
-
 const { checkUpdate } = require("../../utils/checkVersion")
 const BaseUrl = "https://developer.apis.cloudcc.cn"
 const { getPackageJson } = require("../../utils/config.js")
@@ -24,17 +23,12 @@ class Builder {
     async publish(name) {
         let res = await checkUpdate();
         if (!res) {
-            this.options.devConsoleConfig = getPackageJson();
+            this.options.devConsoleConfig = await getPackageJson();
             this.options.pluginConfig = JSON.parse(fs.readFileSync(path.join(process.cwd(), `plugins/${name}/config.json`), 'utf8'));
             let config = this.options.devConsoleConfig
 
             if ("private" != this.options.devConsoleConfig.version) {
-                let token = await this.getToken(config);
-                if (token) {
-                    config = { "accessToken": token };
-                } else {
-                    return;
-                }
+                config = { "accessToken": this.options.devConsoleConfig.pluginToken || await this.getToken(config) };
             }
 
             let answers = { buildFileName: `${name}/${name}.vue` }
@@ -58,7 +52,6 @@ class Builder {
             }
         }
     }
-
     async getToken(devConsoleConfig) {
         const cache = readCache();
         const cacheKey = `plugin_token_${devConsoleConfig.secretKey}`;
@@ -85,7 +78,6 @@ class Builder {
             return null;
         }
     }
-
     getVueValue(buildFileName) {
         let vueContent = fs.readFileSync(this.getVueContent(buildFileName), 'utf8');
         let vueData = vueContent + ""
@@ -96,8 +88,16 @@ class Builder {
         }
         vueData = vueData.split(/data\s*\(\s*\)/)[1].split(/isLock\s*:/)[0] + "isLock:false,};}";
         vueData = "function data()" + vueData;
-        const data = eval(`(${vueData})`)()
-
+        let data = {}
+        try {
+            data = eval(`(${vueData})`)()
+        }
+        catch (e) {
+            console.log()
+            console.log(chalk.red("Error: The data function cannot contain reference variables."));
+            console.log()
+            return null;
+        }
         if (!data.propObj) {
             data.propObj = {};
             data.propOption = {};
@@ -274,7 +274,7 @@ class Builder {
             console.error(chalk.green(`Success！`));
             console.log();
         } else {
-            console.error(chalk.red(`Fail: ${res.returnInfo}`));
+            console.error(chalk.red(`Publish Plugin Fail: ${res.returnInfo}`));
             console.log();
         }
         return res;

package/src/recordType/get.js

@@ -1,13 +1,11 @@
-const { getBusToken } = require("../../utils/utils")
-const { postNormal } = require("../../utils/http")
+const { postClass } = require("../../utils/http")
+const { getPackageJson } = require("../../utils/config")
 
 async function get(path, prefix) {
-    
-    if (await getBusToken(path)) {
-        let res = await postNormal(global.apiSvc + "/api/batch/getRecordType", { prefix: prefix })
-        console.log(JSON.stringify(res.data.recordTypeList))
-        return res.data
-    }
+    let config = await getPackageJson();
+    let res = await postClass(config.apiSvc + "/api/batch/getRecordType", { prefix: prefix }, config.accessToken)
+    console.log(JSON.stringify(res.data.recordTypeList))
+    return res.data
 }
 
 module.exports = get;

package/src/script/publish.js

@@ -6,7 +6,6 @@ const chalk = require("chalk")
 const { post } = require("../../utils/http")
 const { getPackageJson } = require("../../utils/config.js")
 const BaseUrl = "https://developer.apis.cloudcc.cn"
-const { getBusToken } = require("../../utils/utils")
 
 function checkMainFunctionExists(content) {
   const mainFunctionPattern = /^function\s+main\s*\(\$CCDK,\s*obj\)\s*\{/m;
@@ -39,10 +38,7 @@ async function publish(argvs) {
     let configContentOld = JSON.parse(JSON.stringify(configContent))
 
     if (scriptContent) {
-      let devConsoleConfig = getPackageJson()
-      if ("private" != devConsoleConfig.version) {
-        devConsoleConfig.accessToken = await getBusToken();
-      }
+      let devConsoleConfig = await getPackageJson()
       console.log(chalk.green('Posting, please wait...'));
       configContent.scriptContent = scriptContent.trim()
       let res = await post((devConsoleConfig.baseUrl || BaseUrl) + "/devconsole/script/saveClientScript", configContent, devConsoleConfig)
@@ -57,7 +53,7 @@ async function publish(argvs) {
         }
       } else {
         console.log();
-        console.log(chalk.red('Fail：' + res.returnInfo));
+        console.log(chalk.red('Publish Client Scirpt Failed：' + res.returnInfo));
         console.log();
       }
     } else {

package/src/script/pull.js

@@ -6,12 +6,7 @@ const chalk = require("chalk")
 const { post } = require("../../utils/http.js")
 const { getPackageJson } = require("../../utils/config.js")
 const BaseUrl = "https://developer.apis.cloudcc.cn"
-const { getBusToken } = require("../../utils/utils.js")
 
-function checkMainFunctionExists(content) {
-  const mainFunctionPattern = /^function\s+main\s*\(\$CCDK,\s*obj\)\s*\{/m;
-  return mainFunctionPattern.test(content);
-}
 
 async function pull(argvs) {
   let namePath = argvs[2]
@@ -20,12 +15,13 @@ async function pull(argvs) {
   if (!res) {
     const srcPath = path.join(process.cwd(), `script/${namePath}/`);
 
-    let devConsoleConfig = getPackageJson()
-    if ("private" != devConsoleConfig.version) {
-      devConsoleConfig.accessToken = await getBusToken();
-    }
+    let devConsoleConfig = await getPackageJson()
     console.log(chalk.green('Pulling, please wait...'));
     let configContent = JSON.parse(fs.readFileSync(srcPath + "config.json", 'utf8'));
+    if (!configContent.id) {
+      console.log(chalk.red('Script ID is not exist, please publish first！'));
+      return;
+    }
     configContent = {
       "pageSize": 20,
       "pageNo": 1,
@@ -47,7 +43,7 @@ ${res.data.list[0].scriptContent}
       fs.writeFileSync(srcPath + `${name}.js`, newContent);
     } else {
       console.log();
-      console.log(chalk.red('Fail：' + res.returnInfo));
+      console.log(chalk.red('Pull Client Scirpt Failed' + res.returnInfo));
       console.log();
     }
   } else {

package/src/timer/create.js

@@ -24,7 +24,7 @@ public class ${name} extends CCSchedule {
     }
 }`
             fs.writeFileSync(path.join(timerPath, name + ".java"), javaTmp)
-            fs.writeFileSync(path.join(timerPath, "config.json"), `{"name":"${name}","version":"${getPackageJson().extandVersion || '2'}"}`)
+            fs.writeFileSync(path.join(timerPath, "config.json"), `{"name":"${name}","version":"${await getPackageJson().extandVersion || '2'}"}`)
             console.log()
             console.log(chalk.green("Successfully Created:" + name))
             console.log()

package/src/timer/publish.js

@@ -2,10 +2,11 @@ const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
-const { postNormal } = require("../../utils/http")
 
-const { getBusToken, javaContentRegular } = require("../../utils/utils")
+const { javaContentRegular } = require("../../utils/utils")
 
+const { getPackageJson } = require("../../utils/config")
+const { postClass } = require("../../utils/http")
 async function publish(name) {
   let res = await checkUpdate();
   if (!res) {
@@ -20,26 +21,26 @@ async function publish(name) {
 
     let configContent = JSON.parse(fs.readFileSync(timerPath + "config.json", 'utf8'));
 
-    if (await getBusToken()) {
-      let body = {
-        "id": configContent.id,
-        "name": name,
-        "version": configContent.version || "2",
-        "source": encodeURIComponent(classContent.trim()),
-        "folderId": "wgd"
-      }
-      let res = await postNormal(global.setupSvc + "/api/ccPeak/save", body)
-      if (res.result) {
-        console.log(chalk.green('Success！'));
-        console.log();
+    let body = {
+      "id": configContent.id,
+      "name": name,
+      "version": configContent.version || "2",
+      "source": encodeURIComponent(classContent.trim()),
+      "folderId": "wgd"
+    }
+
+    let config = await getPackageJson();
+    let res = await postClass(config.setupSvc + "/api/ccPeak/save", body, config.accessToken)
+    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));
+      if (!configContent.id) {
+        configContent.id = res.data
+        fs.writeFileSync(path.join(timerPath, "config.json"), JSON.stringify(configContent))
       }
+    } else {
+      console.log(chalk.red('Pull Schedule Failed' + res.returnInfo));
     }
   }
 }

package/src/timer/pull.js

@@ -2,9 +2,11 @@ const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
-const { postNormal } = require("../../utils/http")
 
-const { getBusToken, javaContentRegular } = require("../../utils/utils")
+const { javaContentRegular } = require("../../utils/utils")
+
+const { getPackageJson } = require("../../utils/config")
+const { postClass } = require("../../utils/http")
 
 async function pull(name) {
   let res = await checkUpdate();
@@ -13,35 +15,35 @@ async function pull(name) {
     console.log(chalk.green('Pulling, please wait...'));
     console.log();
     const timerPath = path.join(process.cwd(), `schedule/${name}/`);
-    let fullContent = fs.readFileSync(timerPath + `${name}.java`, 'utf8');
-
     let configContent = JSON.parse(fs.readFileSync(timerPath + "config.json", 'utf8'));
+    if (!configContent.id) {
+      console.log(chalk.red('Schedule ID is not exist, please publish first！'));
+      return;
+    }
+    let body = {
+      "id": configContent.id,
+    }
+    let config = await getPackageJson();
+    let res = await postClass(config.setupSvc + "/api/ccPeak/detail", body, config.accessToken)
+    if (res.result) {
+      console.log(chalk.green('Success！'));
+      console.log
+      let fullContent = fs.readFileSync(timerPath + `${name}.java`, 'utf8');
 
-    if (await getBusToken()) {
-      let body = {
-        "id": configContent.id,
+      let newContent = '';
+      if (fullContent.includes("@SOURCE_CONTENT_START")) {
+        newContent = fullContent.replace(
+          javaContentRegular,
+          `// @SOURCE_CONTENT_START\n${res.data.trigger.source}\n// @SOURCE_CONTENT_END`
+        );
+      } else {
+        newContent = res.data.trigger.tsource;
       }
-      let res = await postNormal(global.setupSvc + "/api/ccPeak/detail", body)
-      if (res.result) {
-        console.log(chalk.green('Success！'));
-        console.log
-        let fullContent = fs.readFileSync(timerPath + `${name}.java`, 'utf8');
-
-        let newContent = '';
-        if (fullContent.includes("@SOURCE_CONTENT_START")) {
-          newContent = fullContent.replace(
-            javaContentRegular,
-            `// @SOURCE_CONTENT_START\n${res.data.trigger.source}\n// @SOURCE_CONTENT_END`
-          );
-        } else {
-          newContent = res.data.trigger.tsource;
-        }
 
-        fs.writeFileSync(timerPath + `${name}.java`, newContent, 'utf8');
+      fs.writeFileSync(timerPath + `${name}.java`, newContent, 'utf8');
 
-      } else {
-        console.log(chalk.red('Fail：' + res.returnInfo));
-      }
+    } else {
+      console.log(chalk.red('Pull Schedule Failed：' + res.returnInfo));
     }
   }
 }

package/src/triggers/create.js

@@ -30,7 +30,7 @@ public class ${body.name} extends CCTrigger {
 }`
 
             fs.writeFileSync(path.join(triggersPath, body.name + ".java"), javaTmp);
-            body.version = getPackageJson().extandVersion || "2";
+            body.version =await getPackageJson().extandVersion || "2";
             body.isactive = true;
             fs.writeFileSync(path.join(triggersPath, "config.json"), JSON.stringify(body));
             console.log();

package/src/triggers/publish.js

@@ -2,8 +2,9 @@ const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
-const { postNormal } = require("../../utils/http")
-const { getBusToken ,javaContentRegular} = require("../../utils/utils")
+const { javaContentRegular } = require("../../utils/utils")
+const { getPackageJson } = require("../../utils/config")
+const { postClass } = require("../../utils/http")
 
 async function publish(argvs) {
   let namePath = argvs[2]
@@ -20,31 +21,31 @@ async function publish(argvs) {
     let triggersContent = sourceMatch ? sourceMatch[1] : fullContent;
     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 || "2",
-        "triggerSource": encodeURIComponent(triggersContent.trim()),
-        "folderId": "wgd"
-      }
-      let res = await postNormal(global.setupSvc + "/api/triggerSetup/saveTrigger", body)
-      if (res.result) {
-        console.log(chalk.green('Success！'));
-        console.log();
+    let body = {
+      "id": configContent.id,
+      "apiname": configContent.apiname,
+      "isactive": configContent.isactive,
+      "targetObjectId": configContent.targetObjectId,
+      "triggerTime": configContent.triggerTime,
+      "name": name,
+      "version": configContent.version || "2",
+      "triggerSource": encodeURIComponent(triggersContent.trim()),
+      "folderId": "wgd"
+    }
+
+    let config = await getPackageJson();
+    let res = await postClass(config.setupSvc + "/api/triggerSetup/saveTrigger", body, config.accessToken)
+    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));
+      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('Publish Trigger Failed：' + res.returnInfo));
     }
   }
 }

package/src/triggers/pull.js

@@ -2,9 +2,9 @@ const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
-const { postNormal } = require("../../utils/http")
-const { getBusToken, javaContentRegular } = require("../../utils/utils")
-
+const { javaContentRegular } = require("../../utils/utils")
+const { getPackageJson } = require("../../utils/config")
+const { postClass } = require("../../utils/http")
 async function pull(argvs) {
     let namePath = argvs[2]
     let name = namePath.split("/")[1]
@@ -15,32 +15,34 @@ async function pull(argvs) {
         console.log();
         const triggersPath = path.join(process.cwd(), `triggers/${namePath}/`);
         let configContent = JSON.parse(fs.readFileSync(triggersPath + "config.json", 'utf8'));
+        if (!configContent.id) {
+            console.log(chalk.red('Trigger ID is not exist, please publish first！'));
+            return;
+        }
+        let body = {
+            "id": configContent.id,
+        }
+        let config = await getPackageJson();
+        let res = await postClass(config.setupSvc + "/api/trigger/newobjtrigger", body, config.accessToken)
+        if (res.result) {
+            console.log(chalk.green('Success！'));
+            console.log();
 
-        if (await getBusToken()) {
-            let body = {
-                "id": configContent.id,
+            let fullContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
+            let newContent = '';
+            if (fullContent.includes("@SOURCE_CONTENT_START")) {
+                newContent = fullContent.replace(
+                    javaContentRegular,
+                    `// @SOURCE_CONTENT_START\n${res.data.trigger.triggerSource}\n// @SOURCE_CONTENT_END`
+                );
+            } else {
+                newContent = res.data.trigger.triggerSource;
             }
-            let res = await postNormal(global.setupSvc + "/api/trigger/newobjtrigger", body)
-            if (res.result) {
-                console.log(chalk.green('Success！'));
-                console.log();
 
-                let fullContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
-                let newContent = '';
-                if (fullContent.includes("@SOURCE_CONTENT_START")) {
-                    newContent = fullContent.replace(
-                        javaContentRegular,
-                        `// @SOURCE_CONTENT_START\n${res.data.trigger.triggerSource}\n// @SOURCE_CONTENT_END`
-                    );
-                } else {
-                    newContent = res.data.trigger.triggerSource;
-                }
+            fs.writeFileSync(triggersPath + `${name}.java`, newContent);
 
-                fs.writeFileSync(triggersPath + `${name}.java`, newContent);
-
-            } else {
-                console.log(chalk.red('Fail：' + res.returnInfo));
-            }
+        } else {
+            console.log(chalk.red('Pull Trigger Failed：' + res.returnInfo));
         }
     }
 }