cloudcc-cli 1.9.8 → 2.0.0

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,
+}

package/utils/http.js

@@ -1,8 +1,7 @@
 const https = require("https")
 const http = require("http")
 const axios = require("axios")
-const { getPackageJson } = require("./config")
-
+const chalk = require("chalk")
 const httpsAgent = new https.Agent({
   rejectUnauthorized: false,
 })
@@ -22,14 +21,12 @@ const service = axios.create({
 
 service.interceptors.request.use(
   config => {
-    if (global.accessToken) {
-      config.headers.accessToken = global.accessToken
-    }
     return config
   },
   error => {
-
-    Promise.reject(error)
+    console.log()
+    console.log(error)
+    console.log()
   }
 )
 
@@ -44,12 +41,15 @@ service.interceptors.response.use(
     }
   },
   error => {
-    return Promise.reject(error)
+    console.log("")
+    console.log("error", error)
+    console.log("")
+    process.exit(1)
   }
 )
 const formateData = (data, header) => {
   if (header) {
-    Object.assign(header, { source: getPackageJson().source || "cloudcc_cli" })
+    Object.assign(header, { source: "cloudcc_cli" })
   }
   return {
     head: {
@@ -61,21 +61,6 @@ const formateData = (data, header) => {
   }
 }
 module.exports = {
-  get: (url, data = {}, responseType = '') => {
-    return service({
-      url: url,
-      method: 'get',
-      params: formateData(data),
-      responseType: responseType
-    })
-  },
-  getParams: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'get',
-      params: data,
-    })
-  },
   post: (url, data = {}, header = { appVersion: "1.0.0" }, responseType = '') => {
     return service({
       url: url,
@@ -84,40 +69,21 @@ module.exports = {
       responseType: responseType
     })
   },
-  postParams: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'post',
-      params: data,
-    })
-  },
-  postNormal: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'post',
-      data: data
-    })
-  },
-  patch: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'patch',
-      data: formateData(data)
-    })
-  },
-  delete: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'delete',
-      data: formateData(data)
-    })
+  postClass: (url, data = {}, accessToken) => {
+    if (accessToken) {
+      return service({
+        url: url,
+        method: 'post',
+        headers: {
+          "accessToken": accessToken,
+        },
+        data: data
+      })
+    } else {
+      console.log()
+      console.log(chalk.red('Failed: \nOpenAPI Token is null. \nPlease check your cloudcc-cli.config file! \nor delete the .cloudcc-cache.json file and re-run the command!'));
+      console.log()
+      process.exit(1)
+    }
   },
-  put: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'put',
-      data: formateData(data)
-    })
-  }
-
 }

package/utils/utils.js

@@ -1,98 +1,157 @@
-const { getParams, postNormal } = require("./http")
 const chalk = require("chalk")
-const { getPackageJson } = require("./config")
-const { readCache, writeCache } = require("./cache")
+const { writeCache } = require("./cache")
+const axios = require("axios")
+const BaseUrl = "https://developer.apis.cloudcc.cn"
 
-async function getBaseUrl(path, devConfig) {
-    const cache = readCache(path);
-    const cacheKey = devConfig.secretKey;
-    const now = Date.now();
-    const oneHour = 60 * 60 * 1000;
-
-    // Check if cache is valid
-    if (cache[cacheKey] &&
-        cache[cacheKey].apiSvc &&
-        cache[cacheKey].setupSvc &&
-        cache[cacheKey].timestamp &&
-        (now - cache[cacheKey].timestamp) < oneHour) {
-        global.apiSvc = cache[cacheKey].apiSvc;
-        global.setupSvc = cache[cacheKey].setupSvc;
-        return;
+const formateData = (data, header = { appVersion: "1.0.0" }) => {
+    if (header) {
+        Object.assign(header, { source: "cloudcc_cli" })
     }
-
-    if (devConfig.baseUrl) {
-        global.apiSvc = devConfig.baseUrl + (devConfig.apiSvcPrefix || "/apitfs")
-        global.setupSvc = devConfig.baseUrl + (devConfig.setupSvcPrefix || "/setup")
+    return {
+        head: {
+            ...header
+        },
+        body: {
+            ...data
+        }
+    }
+}
+/**
+ * 获取网关地址
+ * @param {object} config 配置参数
+ */
+async function getBaseUrl(config) {
+    if (config.baseUrl) {
+        config.apiSvc = config.baseUrl + (config.apiSvcPrefix || "/apisvc")
+        config.setupSvc = config.baseUrl + (config.setupSvcPrefix || "/setup")
     } else {
-        let u = "https://developer.apis.cloudcc.cn/oauth/apidomain?scope=cloudccCRM&orgId=" + devConfig.orgId
-        let res = await getParams(u)
-        global.apiSvc = res.orgapi_address
-        global.setupSvc = new URL(res.orgapi_address).origin + (devConfig.setupSvcPrefix || "/setup")
+        let u = "https://developer.apis.cloudcc.cn/oauth/apidomain?scope=cloudccCRM&orgId=" + config.orgId
+        let res = await axios({
+            url: u,
+            method: 'get'
+        })
+        if (200 == res.status && res.data && res.data.result) {
+            config.apiSvc = res.data.orgapi_address
+            config.setupSvc = new URL(res.data.orgapi_address).origin + (config.setupSvcPrefix || "/setup")
+        }
     }
-
-    // Update cache with apiSvc and setupSvc
-    cache[cacheKey] = {
-        ...(cache[cacheKey] || {}),
-        apiSvc: global.apiSvc,
-        setupSvc: global.setupSvc,
-        timestamp: now
-    };
-    writeCache(path, cache);
+    return config;
 }
-
-async function getBusToken(path = process.cwd()) {
-    let devConfig = getPackageJson(path);
-    if (!devConfig.username || !devConfig.safetyMark || !devConfig.clientId || !devConfig.openSecretKey || !devConfig.orgId) {
-        console.log(chalk.red('The security tag configuration is incorrect. Please check the documentation for configuration.'));
-        console.log();
-        return false;
+/** 
+ * 获取发布组件的token
+ * @param {object} 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"));
+        process.exit(1)
     }
+    return config
+}
+/**
+ * 获取OpenAPI的token
+ * @returns token值
+ */
+async function getBusToken(config) {
+    if (config.username && config.safetyMark && config.clientId && config.openSecretKey && config.orgId) {
+        let body = {
+            username: config.username,
+            safetyMark: config.safetyMark,
+            clientId: config.clientId,
+            secretKey: config.openSecretKey,
+            orgId: config.orgId
+        }
 
-    const cache = readCache(path);
-    const cacheKey = devConfig.secretKey;
-    const now = Date.now();
-    const oneHour = 60 * 60 * 1000;
-    // Check if cache is valid
-    if (cache[cacheKey] &&
-        cache[cacheKey].token &&
-        cache[cacheKey].apiSvc &&
-        cache[cacheKey].setupSvc &&
-        cache[cacheKey].timestamp &&
-        (now - cache[cacheKey].timestamp) < oneHour) {
-        global.accessToken = cache[cacheKey].token;
-        global.apiSvc = cache[cacheKey].apiSvc;
-        global.setupSvc = cache[cacheKey].setupSvc;
-        return cache[cacheKey].token;
+        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)
+        }
     }
+    return config;
+}
 
-    let body = {
-        username: devConfig.username,
-        safetyMark: devConfig.safetyMark,
-        clientId: devConfig.clientId,
-        secretKey: devConfig.openSecretKey,
-        orgId: devConfig.orgId
+/**
+ * 获取密钥
+ * @param {Object} config - 配置对象，需包含username
+ * @return {Promise<Object>} 返回密钥信息
+ */
+async function getSecretKey(config) {
+    try {
+        const response = await axios({
+            method: 'post',
+            url: (config.baseUrl || BaseUrl) + '/sysconfig/auth/secretkey/get',
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded'
+            },
+            data: `username=${config.username}`
+        });
+        config.secretKey = response.data.data.secretKey;
+        return config;
+    } catch (error) {
+        console.log(chalk.red('Get Plugin SecretKey Failed:', error.message));
+        process.exit(1)
     }
-    await getBaseUrl(path, devConfig)
-    // return path
-    let res = await postNormal(global.apiSvc + "/api/cauth/token", body)
-    if (res.result) {
-        global.accessToken = res.data.accessToken;
-        // Update cache
-        cache[cacheKey] = {
-            token: res.data.accessToken,
-            apiSvc: global.apiSvc,
-            setupSvc: global.setupSvc,
-            timestamp: now
-        };
+}
 
-        writeCache(path, cache);
-        return res.data.accessToken;
-    } else {
-        console.log(chalk.red(res.returnInfo));
+async function getDevConsoleConfig(projectPath = process.cwd(), config) {
+    config = await getBaseUrl(config);
+    config = await getBusToken(config);
+    config = await getSecretKey(config);
+    config = await getPluginToken(config);
+    config.timestamp = Date.now();
+    writeCache(projectPath, { [config.safetyMark || config.secretKey]: config })
+    return config;
+}
+
+/**
+  * 解密CloudCC开发信息
+  * @param {string} encryptedData - 加密后的CloudCC开发信息
+  * @return {Object} 解密后的对象
+  * {
+        "username": "cloudccone@one.lightning",
+        "baseUrl": "https://one.lightning.cloudcc.cn",
+        "orgId": "org83dd9d283484bbe20",
+        "clientId": "RElFpKQUeCs7mtObkk2xvJFFs",
+        "openSecretKey": "11a69c74-dec0-4c05-a2fd-4b6c5e485db1"
+    }
+  */
+function decryptCloudCCDevInfo(encryptedData) {
+    try {
+        const binaryData = new Uint8Array(Buffer.from(encryptedData, 'base64'));
+        const decoder = new TextDecoder();
+        const jsonString = decoder.decode(binaryData);
+        return JSON.parse(jsonString);
+    } catch (error) {
+        console.error(error);
+        return null;
     }
-    return false;
 }
+
+/**
+ * 正则表达式，用于匹配Java代码中的源代码内容
+ */
 const javaContentRegular = /\/\/\s*@SOURCE_CONTENT_START\r?\n([\s\S]*?)\r?\n\s*\/\/\s*@SOURCE_CONTENT_END/
 
 
-module.exports = { getBusToken, javaContentRegular }
+module.exports = { getDevConsoleConfig, javaContentRegular, decryptCloudCCDevInfo }