cloudcc-cli 2.0.2 → 2.0.4

package/README.md

@@ -1,3 +1,18 @@
+# ReleaseV2.0.4
+#### Release Date: 2025-4-8
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * Optimize the plugin token acquisition logic to ensure that tokens are requested only in non-private versions
+
+# 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

package/package.json

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

package/src/plugin/publish1.js

@@ -24,9 +24,9 @@ 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
-
             if ("private" != this.options.devConsoleConfig.version) {
                 config = { "accessToken": this.options.devConsoleConfig.pluginToken || await this.getToken(config) };
             }
@@ -65,7 +65,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,
@@ -274,7 +274,7 @@ class Builder {
             console.error(chalk.green(`Success！`));
             console.log();
         } else {
-            console.error(chalk.red(`Publish Plugin Fail: ${res.returnInfo}`));
+            console.error(chalk.red(`Publish Plugin Fail: ${JSON.stringify(res)}`));
             console.log();
         }
         return res;

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) {
+            if (decryptedInfo.baseUrl && !decryptedInfo.baseUrl.includes("ccdomaingateway")) {
+                decryptedInfo.baseUrl = decryptedInfo.baseUrl + "/ccdomaingateway"
+            }
             config = { ...decryptedInfo, ...config }
-            // if (config.baseUrl && !config.baseUrl.includes("ccdomaingateway")) {
-            //     config.baseUrl = config.baseUrl + "/ccdomaingateway"
-            // }
+            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
@@ -122,7 +128,9 @@ async function getDevConsoleConfig(projectPath = process.cwd(), config) {
     config = await getBaseUrl(config);
     config = await getBusToken(config);
     config = await getSecretKey(config);
-    config = await getPluginToken(config);
+    if ("private" != config.version) {
+        config = await getPluginToken(config);
+    }
     config.timestamp = Date.now();
     writeCache(projectPath, { [config.safetyMark || config.secretKey]: config })
     return config;