cloudcc-cli 2.0.1 → 2.0.3

package/README.md

@@ -1,3 +1,18 @@
+# ReleaseV2.0.3
+#### Release Date: 2025-4-8
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * Added CloudCCDev field initialization for configuration files and optimized error handling for obtaining plugin tokens
+
+    
+# ReleaseV2.0.2
+#### Release Date: 2025-4-2
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * Fix baseUrl Prefix
+
 # ReleaseV2.0.1
 #### Release Date: 2025-4-2
 #### Release Scope: Full

package/package.json

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

package/src/classes/create.js

@@ -49,13 +49,14 @@ public class ${name}Test {
 `
             fs.writeFileSync(path.join(classesPath, name + ".java"), javaTmp)
             fs.writeFileSync(path.join(classesPath, name + "Test.java"), javaTestTmp)
-            fs.writeFileSync(path.join(classesPath, "config.json"), `{"name":"${name}","version":"${await getPackageJson().extandVersion || '2'}"}`)
+            let config = await getPackageJson();
+            fs.writeFileSync(path.join(classesPath, "config.json"), `{"name":"${name}","version":"${config.extandVersion || '2'}"}`)
             console.log()
             console.log(chalk.green("Successfully Created:" + name))
             console.log()
         } catch (e) {
             console.log()
-            console.log(chalk.red("Creation Failed:" + e))
+            console.log(chalk.red("Creation Class Failed:" + e))
             console.log()
         }
     }

package/src/classes/publish.js

@@ -40,7 +40,7 @@ async function publish(name) {
         fs.writeFileSync(path.join(classPath, "config.json"), JSON.stringify(configContent))
       }
     } else {
-      console.log(chalk.red('Failed：' + res.returnInfo));
+      console.log(chalk.red('Publish Class Failed：' + res.returnInfo));
     }
   }
 }

package/src/classes/pull.js

@@ -44,7 +44,7 @@ async function pull(name) {
             fs.writeFileSync(classPath + `${name}.java`, newContent, 'utf8');
 
         } else {
-            console.log(chalk.red('Pull Fail：' + res.returnInfo));
+            console.log(chalk.red('Pull Class Failed：' + res.returnInfo));
         }
     }
 }

package/src/config/get.js

@@ -2,7 +2,7 @@
 const { getPackageJson } = require("../../utils/config.js")
 
 async function get(projectPath = process.cwd()) {
-    const config = await getPackageJson();
+    const config = await getPackageJson(projectPath);
     console.log(config);
 }
 

package/src/plugin/publish1.js

@@ -24,6 +24,7 @@ class Builder {
         let res = await checkUpdate();
         if (!res) {
             this.options.devConsoleConfig = await getPackageJson();
+            this.options.devConsoleConfig.CloudCCDev = "";
             this.options.pluginConfig = JSON.parse(fs.readFileSync(path.join(process.cwd(), `plugins/${name}/config.json`), 'utf8'));
             let config = this.options.devConsoleConfig
 
@@ -65,7 +66,7 @@ class Builder {
             return cache[cacheKey].token;
         }
 
-        let res = await post((this.options.devConsoleConfig.baseUrl || BaseUrl) + "/sysconfig/auth/pc/1.0/post/tokenInfo", devConsoleConfig);
+        let res = await post((this.options.devConsoleConfig.baseUrl || BaseUrl) + "/sysconfig/auth/pc/1.0/post/tokenInfo", { username: devConsoleConfig.username, secretKey: devConsoleConfig.secretKey });
         if (res.returnCode == 200) {
             cache[cacheKey] = {
                 token: res.data.accessToken,

package/src/script/create.js

@@ -26,7 +26,7 @@ async function create(argvs) {
             console.log()
         } catch (e) {
             console.log()
-            console.log(chalk.red("Creation Failed:" + e))
+            console.log(chalk.red("Creation Client Script Failed:" + e))
             console.log()
         }
     }

package/src/timer/create.js

@@ -24,13 +24,14 @@ public class ${name} extends CCSchedule {
     }
 }`
             fs.writeFileSync(path.join(timerPath, name + ".java"), javaTmp)
-            fs.writeFileSync(path.join(timerPath, "config.json"), `{"name":"${name}","version":"${await getPackageJson().extandVersion || '2'}"}`)
+            let config = await getPackageJson();
+            fs.writeFileSync(path.join(timerPath, "config.json"), `{"name":"${name}","version":"${config.extandVersion || '2'}"}`)
             console.log()
             console.log(chalk.green("Successfully Created:" + name))
             console.log()
         } catch (e) {
             console.log()
-            console.log(chalk.red("Creation Failed:" + e))
+            console.log(chalk.red("Creation Schedule Failed:" + e))
             console.log()
         }
     }

package/src/triggers/create.js

@@ -17,7 +17,7 @@ async function create(argvs) {
             fs.mkdirSync(triggersPath, { recursive: true });
 
             const javaTmp =
-`package triggers.${body.schemetableName.toLowerCase()}.${body.name};
+                `package triggers.${body.schemetableName.toLowerCase()}.${body.name};
 
 import com.cloudcc.core.*;
 
@@ -30,7 +30,8 @@ public class ${body.name} extends CCTrigger {
 }`
 
             fs.writeFileSync(path.join(triggersPath, body.name + ".java"), javaTmp);
-            body.version =await getPackageJson().extandVersion || "2";
+            let config = await getPackageJson();
+            body.version = config.extandVersion || "2";
             body.isactive = true;
             fs.writeFileSync(path.join(triggersPath, "config.json"), JSON.stringify(body));
             console.log();
@@ -38,7 +39,7 @@ public class ${body.name} extends CCTrigger {
             console.log();
         } catch (e) {
             console.log()
-            console.log(chalk.red("Creation Failed:" + e))
+            console.log(chalk.red("Creation Trigger Failed:" + e))
             console.log()
         }
     }

package/utils/checkVersion.js

@@ -107,7 +107,6 @@ function checkAndReplaceJar(projectPath = process.cwd()) {
     const templateLibPath = path.join(__dirname, '../template/lib');
 
     if (!fs.existsSync(projectLibPath)) {
-        console.log(chalk.red('Project lib folder does not exist.'));
         return;
     }
 

package/utils/config.js

@@ -21,9 +21,7 @@ function getPackageJson_old(projectPath = process.cwd()) {
 async function getPackageJson2(projectPath = process.cwd()) {
     let config = require(path.join(projectPath, "cloudcc-cli.config.js"))
     config = config[config.use]
-    if (config.baseUrl && !config.baseUrl.includes("ccdomaingateway")) {
-        config.baseUrl = config.baseUrl + "/ccdomaingateway"
-    }
+    config.CloudCCDev = "";
     config = await getDevConsoleConfig(projectPath, config)
     return config
 }
@@ -40,10 +38,11 @@ async function getPackageJson3(projectPath = process.cwd()) {
     if (config && config.CloudCCDev) {
         const decryptedInfo = decryptCloudCCDevInfo(config.CloudCCDev);
         if (decryptedInfo) {
-            config = { ...decryptedInfo, ...config }
-            if (config.baseUrl && !config.baseUrl.includes("ccdomaingateway")) {
-                config.baseUrl = config.baseUrl + "/ccdomaingateway"
+            if (decryptedInfo.baseUrl && !decryptedInfo.baseUrl.includes("ccdomaingateway")) {
+                decryptedInfo.baseUrl = decryptedInfo.baseUrl + "/ccdomaingateway"
             }
+            config = { ...decryptedInfo, ...config }
+            config.CloudCCDev = "";
             config = await getDevConsoleConfig(projectPath, config)
         }
     } else {

package/utils/utils.js

@@ -43,18 +43,24 @@ async function getBaseUrl(config) {
  * @returns config
  */
 async function getPluginToken(config) {
-    let res = await axios({
-        method: 'post',
-        url: (config.baseUrl || BaseUrl) + "/sysconfig/auth/pc/1.0/post/tokenInfo",
-        data: formateData({ username: config.username, secretKey: config.secretKey }),
-        headers: {
-            'Content-Type': 'application/json; charset=utf-8',
-        },
-    });
-    if (res.data.returnCode == 200) {
-        config.pluginToken = res.data.data.accessToken;
-    } else {
-        console.error(chalk.red(`Get Plugin Token Failed:`, res.data.returnInfo, "\nPrivate cloud, please check whether the baseUrl is configured correctly"));
+    const url = (config.baseUrl || BaseUrl) + "/sysconfig/auth/pc/1.0/post/tokenInfo";
+    try {
+        let res = await axios({
+            method: 'post',
+            url,
+            data: formateData({ username: config.username, secretKey: config.secretKey }),
+            headers: {
+                'Content-Type': 'application/json; charset=utf-8',
+            },
+        });
+        if (res.data.returnCode == 200) {
+            config.pluginToken = res.data.data.accessToken;
+        } else {
+            console.error(chalk.red(`Get Plugin Token Failed:`, res.data.returnInfo, "\nPrivate cloud, please check whether the baseUrl is configured correctly\n" + url));
+            process.exit(1)
+        }
+    } catch (error) {
+        console.error(chalk.red(`Get Plugin Token Failed:`, error, "\nPrivate cloud, please check whether the baseUrl is configured correctly\n" + url));
         process.exit(1)
     }
     return config
@@ -72,19 +78,23 @@ async function getBusToken(config) {
             secretKey: config.openSecretKey,
             orgId: config.orgId
         }
-
-        const res = await axios({
-            method: 'post',
-            url: config.apiSvc + "/api/cauth/token",
-            headers: {
-                'Content-Type': 'application/json; charset=utf-8',
-            },
-            data: body
-        });
-        if (res.data.result) {
-            config.accessToken = res.data.data.accessToken;
-        } else {
-            console.error(chalk.red(`Get OpenAPI Token Failed:`, res.data.returnInfo));
+        try {
+            const res = await axios({
+                method: 'post',
+                url: config.apiSvc + "/api/cauth/token",
+                headers: {
+                    'Content-Type': 'application/json; charset=utf-8',
+                },
+                data: body
+            });
+            if (res.data.result) {
+                config.accessToken = res.data.data.accessToken;
+            } else {
+                console.error(chalk.red(`Get OpenAPI Token Failed:`, res.data.returnInfo));
+                process.exit(1)
+            }
+        } catch (error) {
+            console.error(chalk.red(`Get OpenAPI Token Failed:`, error.message));
             process.exit(1)
         }
     }