cloudcc-cli 1.9.9 → 2.0.0

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

@@ -3,7 +3,6 @@ const { post } = require('../../utils/http');
 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"
@@ -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 };
             }
 
             let answers = { buildFileName: `${name}/${name}.vue` }
@@ -59,33 +53,6 @@ class Builder {
         }
     }
 
-    async getToken(devConsoleConfig) {
-        const cache = readCache();
-        const cacheKey = `plugin_token_${devConsoleConfig.secretKey}`;
-        const now = Date.now();
-        const oneHour = 60 * 60 * 1000;
-
-        if (cache[cacheKey] &&
-            cache[cacheKey].token &&
-            cache[cacheKey].timestamp &&
-            (now - cache[cacheKey].timestamp) < oneHour) {
-            return cache[cacheKey].token;
-        }
-
-        let res = await post((this.options.devConsoleConfig.baseUrl || BaseUrl) + "/sysconfig/auth/pc/1.0/post/tokenInfo", devConsoleConfig);
-        if (res.returnCode == 200) {
-            cache[cacheKey] = {
-                token: res.data.accessToken,
-                timestamp: now
-            };
-            writeCache(process.cwd(), cache);
-            return res.data.accessToken;
-        } else {
-            console.error(chalk.red(`Login failed`, JSON.stringify(res)));
-            return null;
-        }
-    }
-
     getVueValue(buildFileName) {
         let vueContent = fs.readFileSync(this.getVueContent(buildFileName), 'utf8');
         let vueData = vueContent + ""
@@ -96,8 +63,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 = {};

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)

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,10 +15,7 @@ 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'));
     configContent = {

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('Fail：' + 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();
@@ -17,31 +19,30 @@ async function pull(name) {
 
     let configContent = JSON.parse(fs.readFileSync(timerPath + "config.json", 'utf8'));
 
-    if (await getBusToken()) {
-      let body = {
-        "id": configContent.id,
-      }
-      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');
+    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');
 
+      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 {
-        console.log(chalk.red('Fail：' + res.returnInfo));
+        newContent = res.data.trigger.tsource;
       }
+
+      fs.writeFileSync(timerPath + `${name}.java`, newContent, 'utf8');
+
+    } else {
+      console.log(chalk.red('Fail：' + 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('Fail：' + 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]
@@ -16,31 +16,30 @@ async function pull(argvs) {
         const triggersPath = path.join(process.cwd(), `triggers/${namePath}/`);
         let configContent = JSON.parse(fs.readFileSync(triggersPath + "config.json", 'utf8'));
 
-        if (await getBusToken()) {
-            let body = {
-                "id": configContent.id,
-            }
-            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);
+        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();
 
+            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 {
-                console.log(chalk.red('Fail：' + res.returnInfo));
+                newContent = res.data.trigger.triggerSource;
             }
+
+            fs.writeFileSync(triggersPath + `${name}.java`, newContent);
+
+        } else {
+            console.log(chalk.red('Fail：' + res.returnInfo));
         }
     }
 }

package/utils/checkVersion.js

@@ -3,6 +3,8 @@ const inquirer = require("inquirer")
 const exec = require('child_process').execSync;
 const chalk = require("chalk")
 const { readCache, writeCache } = require("./cache")
+const fs = require('fs');
+const path = require('path');
 
 function checkNpmVersion() {
     let currentVersion = Number(config.version.replace(/\./g, ""));
@@ -77,6 +79,7 @@ async function checkUpdate(path = process.cwd()) {
 
     let onlineVersion;
     try {
+        checkAndReplaceJar();
         onlineVersion = checkNpmVersion();
         cache[cacheKey] = {
             timestamp: now
@@ -99,4 +102,55 @@ async function checkUpdate(path = process.cwd()) {
     return false
 }
 
-module.exports = { checkUpdate }
+function checkAndReplaceJar(projectPath = process.cwd()) {
+    const projectLibPath = path.join(projectPath, 'lib');
+    const templateLibPath = path.join(__dirname, '../template/lib');
+
+    if (!fs.existsSync(projectLibPath)) {
+        console.log(chalk.red('Project lib folder does not exist.'));
+        return;
+    }
+
+    const projectJar = fs.readdirSync(projectLibPath).find(file => file.startsWith('ccopenapi') && file.endsWith('.jar'));
+    if (!projectJar) {
+        return;
+    }
+
+    const projectVersion = projectJar.match(/ccopenapi-(\d+\.\d+\.\d+)/)?.[1];
+    if (!projectVersion) {
+        console.log(chalk.red('Failed to parse the version of the ccopenapi jar in the project.'));
+        return;
+    }
+
+    const templateJar = fs.readdirSync(templateLibPath).find(file => file.startsWith('ccopenapi') && file.endsWith('.jar'));
+    if (!templateJar) {
+        console.log(chalk.yellow('No ccopenapi jar found in the template lib folder.'));
+        return;
+    }
+
+    const templateVersion = templateJar.match(/ccopenapi-(\d+\.\d+\.\d+)/)?.[1];
+    if (!templateVersion) {
+        console.log(chalk.red('Failed to parse the version of the ccopenapi jar in the template.'));
+        return;
+    }
+
+    const compareVersions = (v1, v2) => {
+        const [major1, minor1, patch1] = v1.split('.').map(Number);
+        const [major2, minor2, patch2] = v2.split('.').map(Number);
+        if (major1 !== major2) return major1 - major2;
+        if (minor1 !== minor2) return minor1 - minor2;
+        return patch1 - patch2;
+    };
+
+    if (compareVersions(templateVersion, projectVersion) > 0) {
+        // Delete the old jar file
+        fs.unlinkSync(path.join(projectLibPath, projectJar));
+        // Copy the new jar file
+        fs.copyFileSync(
+            path.join(templateLibPath, templateJar),
+            path.join(projectLibPath, templateJar)
+        );
+    }
+}
+
+module.exports = { checkUpdate };

package/utils/config.js

@@ -1,18 +1,81 @@
 const fs = require("fs");
 const path = require("path");
-
+// 引入解密函数
+const { getDevConsoleConfig, decryptCloudCCDevInfo } = require("./utils");
+const { readCache } = require("./cache")
+/**
+ * 1.0版本的配置文件
+ * @param {string} projectPath baseUrl
+ * @returns 
+ */
 function getPackageJson_old(projectPath = process.cwd()) {
     const packageJson = JSON.parse(fs.readFileSync(path.join(projectPath, "package.json")), 'utf8');
     return packageJson.devConsoleConfig;
 }
-
-function getPackageJson(projectPath = process.cwd()) {
-    let config = getPackageJson_old(projectPath);
-    if (!config) {
-        config = require(path.join(projectPath, "cloudcc-cli.config.js"))
-        config = config[config.use]
+/**
+ * 2.0版本的配置文件
+ * 配置参数移入cloudcc-cli.config.js,最多需要配置9个参数
+ * @param {string} projectPath baseUrl
+ * @returns 
+ */
+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 = await getDevConsoleConfig(projectPath, config)
     return config
 }
+/**
+ * 3.0版本的配置文件
+ * 将多个参数压缩到一个参数重，方便配置
+ * @param {string} projectPath baseUrl
+ * @returns 
+ */
+async function getPackageJson3(projectPath = process.cwd()) {
+    let config = require(path.join(projectPath, "cloudcc-cli.config.js"))
+    config = config[config.use]
+    // 检查并解密CloudCCDev信息
+    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"
+            }
+            config = await getDevConsoleConfig(projectPath, config)
+        }
+    } else {
+        config = null;
+    }
+    return config;
+}
 
-module.exports = { getPackageJson }
+
+/**
+ * 从缓存读取
+ * @returns 配置参数
+ */
+async function getPackageJsonCache(projectPath = process.cwd()) {
+    let config = require(path.join(projectPath, "cloudcc-cli.config.js"));
+    const cacheData = readCache()[config[config.use].safetyMark || config[config.use].secretKey];
+
+    if (cacheData && cacheData.timestamp) {
+        const oneHour = 60 * 60 * 1000; // 1小时的毫秒数
+        const currentTime = Date.now();
+        if (currentTime - cacheData.timestamp > oneHour) {
+            return null;
+        }
+    }
+    return cacheData;
+}
+
+async function getPackageJson(projectPath = process.cwd()) {
+    return getPackageJson_old(projectPath) || await getPackageJsonCache(projectPath) || await getPackageJson3(projectPath) || await getPackageJson2(projectPath)
+}
+
+
+module.exports = {
+    getPackageJson,
+}