cloudcc-cli 1.8.0 → 1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "cloudcc-cli",
   "keywords": [
     "cloudcc",

package/src/object/get.js

@@ -4,9 +4,16 @@ const { postNormal } = require("../../utils/http")
 
 async function get(path) {
     if (await getBusToken(path)) {
-        let res = await postNormal(global.setupSvc + "/api/customObject/standardObjList")
-        console.log(JSON.stringify(res.data))
-        return res.data
+        let res = await postNormal(global.setupSvc + "/api/trigger/newobjtrigger")
+        res = res.data.targetObjList.map((item) => {
+            return {
+                id: item.id,
+                objname: item.label,
+                objprefix: item.schemetable_name
+            }
+        })
+        console.log(JSON.stringify(res))
+        return res
     }
 }
 

package/src/plugin/publish.js

@@ -26,7 +26,12 @@ class Builder {
             let config = this.options.devConsoleConfig
 
             if ("private" != this.options.devConsoleConfig.version) {
-                config = { "accessToken": await this.getToken(config) };
+                let token = await this.getToken(config);
+                if (token) {
+                    config = { "accessToken": token };
+                } else {
+                    return;
+                }
             }
 
             let answers;

package/src/plugin/publish1.js

@@ -29,7 +29,12 @@ class Builder {
             let config = this.options.devConsoleConfig
 
             if ("private" != this.options.devConsoleConfig.version) {
-                config = { "accessToken": await this.getToken(config) };
+                let token = await this.getToken(config);
+                if (token) {
+                    config = { "accessToken": token };
+                } else {
+                    return;
+                }
             }
 
             let answers = { buildFileName: `${name}/${name}.vue` }
@@ -75,7 +80,7 @@ class Builder {
                 token: res.data.accessToken,
                 timestamp: now
             };
-            writeCache(cache);
+            writeCache(process.cwd(), cache);
             return res.data.accessToken;
         } else {
             console.error(chalk.red(`Login failed`, JSON.stringify(res)));

package/src/project/create.js

@@ -4,7 +4,6 @@ const memFs = require("mem-fs")
 const memFsEditor = require("mem-fs-editor")
 const fs = require("fs")
 const path = require("path")
-const { checkUpdate } = require("../../utils/checkVersion")
 
 class Creator {
     constructor() {
@@ -13,31 +12,28 @@ class Creator {
             name: "",
             description: ""
         }
-        
+
         this.rootPath = path.resolve(__dirname, "../../");
-        
+
         this.tplDirPath = path.join(this.rootPath, "template");
     }
-    
+
     async init(name) {
-        let res = await checkUpdate();
-        if (!res) {
-            console.log()
-            console.log(chalk.green('Welcome CloudCC-CLI'));
-            console.log()
-            if (!name) {
-                this.ask().then(answers => {
-                    this.options = Object.assign({}, this.options, answers);
-                    console.log(this.options);
-                    this.write();
-                })
-            } else {
-                this.options = { name }
+        console.log()
+        console.log(chalk.green('Welcome CloudCC-CLI'));
+        console.log()
+        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();
         }
     }
-    
+
     ask() {
         const prompt = [];
 
@@ -59,7 +55,7 @@ class Creator {
         });
         return inquirer.prompt(prompt)
     }
-    
+
     write() {
         console.log();
         console.log(chalk.green("Starting construction, please wait"));

package/src/project/create1.js

@@ -4,7 +4,6 @@ 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 tplBuilder = require("../../template/index");
 const execSync = require('child_process').execSync;
 
@@ -15,31 +14,28 @@ class Creator {
             name: "",
             description: ""
         }
-        
+
         this.rootPath = path.resolve(__dirname, "../../");
-        
+
         this.tplDirPath = path.join(this.rootPath, "template");
     }
-    
+
     async init(name) {
-        let res = await checkUpdate();
-        if (!res) {
-            console.log()
-            console.log(chalk.green('Welcome CloudCC-CLI'));
-            console.log()
-            if (!name) {
-                this.ask().then(answers => {
-                    this.options = Object.assign({}, this.options, answers);
-                    console.log(this.options);
-                    this.write();
-                })
-            } else {
-                this.options = { name }
+        console.log()
+        console.log(chalk.green('Welcome CloudCC-CLI'));
+        console.log()
+        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();
         }
     }
-    
+
     ask() {
         const prompt = [];
 
@@ -61,7 +57,7 @@ class Creator {
         });
         return inquirer.prompt(prompt)
     }
-    
+
     write() {
         console.log();
         console.log(chalk.green("Starting construction, please wait"));

package/src/triggers/create.js

@@ -8,7 +8,7 @@ async function create(argvs) {
     if (!res) {
         let body = JSON.parse(decodeURI(argvs[2]))
         const baseTriggersPath = path.join(process.cwd(), "triggers");
-        const objectFolderPath = path.join(baseTriggersPath, body.targetObjectId);
+        const objectFolderPath = path.join(baseTriggersPath, `${body.schemetableName.toLowerCase()}`);
         const triggersPath = path.join(objectFolderPath, body.name);
 
         try {

package/utils/cache.js

@@ -1,13 +1,13 @@
 const fs = require('fs');
-const path = require('path');
+const pathpath = require('path');
 
-function getCachePath() {
-    return path.join(process.cwd(), '.cloudcc-cache.json');
+function getCachePath(path = process.cwd()) {
+    return pathpath.join(path, '.cloudcc-cache.json');
 }
 
-function readCache() {
+function readCache(path = process.cwd()) {
     try {
-        const cachePath = getCachePath();
+        const cachePath = getCachePath(path);
         if (!fs.existsSync(cachePath)) {
             fs.writeFileSync(cachePath, JSON.stringify({}, null, 2));
             return {};
@@ -19,9 +19,9 @@ function readCache() {
     }
 }
 
-function writeCache(data) {
+function writeCache(path = process.cwd(), data) {
     try {
-        const cachePath = getCachePath();
+        const cachePath = getCachePath(path);
         fs.writeFileSync(cachePath, JSON.stringify(data, null, 2));
     } catch (error) {
         console.error('Failed to write cache:', error);

package/utils/checkVersion.js

@@ -65,9 +65,9 @@ function update(onlineVersion) {
 }
 
 
-async function checkUpdate() {
+async function checkUpdate(path = process.cwd()) {
     // 检查缓存
-    const cache = readCache();
+    const cache = readCache(path);
     const cacheKey = 'version_check';
     const now = Date.now();
     const oneHour = 60 * 60 * 1000;
@@ -86,7 +86,7 @@ async function checkUpdate() {
         cache[cacheKey] = {
             timestamp: now
         };
-        writeCache(cache);
+        writeCache(path, cache);
     } catch (error) {
         console.log("error", error)
         onlineVersion = false;

package/utils/utils.js

@@ -3,8 +3,8 @@ const chalk = require("chalk")
 const { getPackageJson } = require("./config")
 const { readCache, writeCache } = require("./cache")
 
-async function getBaseUrl(devConfig) {
-    const cache = readCache();
+async function getBaseUrl(path, devConfig) {
+    const cache = readCache(path);
     const cacheKey = devConfig.secretKey;
     const now = Date.now();
     const oneHour = 60 * 60 * 1000;
@@ -37,7 +37,7 @@ async function getBaseUrl(devConfig) {
         setupSvc: global.setupSvc,
         timestamp: now
     };
-    writeCache(cache);
+    writeCache(path, cache);
 }
 
 async function getBusToken(path = process.cwd()) {
@@ -48,7 +48,7 @@ async function getBusToken(path = process.cwd()) {
         return false;
     }
 
-    const cache = readCache();
+    const cache = readCache(path);
     const cacheKey = devConfig.secretKey;
     const now = Date.now();
     const oneHour = 60 * 60 * 1000;
@@ -72,7 +72,8 @@ async function getBusToken(path = process.cwd()) {
         secretKey: devConfig.openSecretKey,
         orgId: devConfig.orgId
     }
-    await getBaseUrl(devConfig)
+    await getBaseUrl(path, devConfig)
+    // return path
     let res = await postNormal(global.apiSvc + "/api/cauth/token", body)
     if (res.result) {
         global.accessToken = res.data.accessToken;
@@ -83,7 +84,8 @@ async function getBusToken(path = process.cwd()) {
             setupSvc: global.setupSvc,
             timestamp: now
         };
-        writeCache(cache);
+
+        writeCache(path, cache);
         return res.data.accessToken;
     } else {
         console.log(chalk.red(res.returnInfo));