cloudcc-cli 1.7.9 → 1.8.1

package/package.json

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

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/script/create.js

@@ -7,9 +7,15 @@ async function create(argvs) {
     let res = await checkUpdate();
     if (!res) {
         let body = JSON.parse(decodeURI(argvs[2]))
-        const filePath = path.join(process.cwd(), "script/" + body.scriptName);
+        const baseScriptPath = path.join(process.cwd(), "script");
+        const objectFolderPath = path.join(baseScriptPath, body.objId);
+        const filePath = path.join(objectFolderPath, body.scriptName);
+
         try {
-            fs.mkdirSync(filePath, { recursive: true })
+            // 确保对象文件夹和脚本文件夹都存在
+            fs.mkdirSync(objectFolderPath, { recursive: true });
+            fs.mkdirSync(filePath, { recursive: true });
+
             const fileTmp =
                 `function main($CCDK, obj){
     console.log("hello World")

package/src/script/publish.js

@@ -9,10 +9,11 @@ const BaseUrl = "https://developer.apis.cloudcc.cn"
 const { getBusToken } = require("../../utils/utils")
 
 async function publish(argvs) {
-  let name = argvs[2]
+  let namePath = argvs[2]
+  let name = namePath.split("/")[1]
   let res = await checkUpdate();
   if (!res) {
-    const srcPath = path.join(process.cwd(), `script/${name}/`);
+    const srcPath = path.join(process.cwd(), `script/${namePath}/`);
     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))

package/src/triggers/create.js

@@ -7,17 +7,24 @@ 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);
+        const baseTriggersPath = path.join(process.cwd(), "triggers");
+        const objectFolderPath = path.join(baseTriggersPath, body.targetObjectId);
+        const triggersPath = path.join(objectFolderPath, body.name);
+
         try {
-            fs.mkdirSync(triggersPath, { recursive: true })
+            // 确保对象文件夹和触发器文件夹都存在
+            fs.mkdirSync(objectFolderPath, { recursive: true });
+            fs.mkdirSync(triggersPath, { recursive: true });
+
             const javaTmp = `// @SOURCE_CONTENT_START
 System.out.print("hello World");
 // @SOURCE_CONTENT_END`
-            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()
+
+            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))

package/src/triggers/publish.js

@@ -6,13 +6,14 @@ const { postNormal } = require("../../utils/http")
 const { getBusToken } = require("../../utils/utils")
 
 async function publish(argvs) {
-  let name = argvs[2]
+  let namePath = argvs[2]
+  let name = namePath.split("/")[1]
   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}/`);
+    const triggersPath = path.join(process.cwd(), `triggers/${namePath}/`);
     let fullContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
 
     // 提取标记之间的内容

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));