cloudcc-cli 1.9.9 → 2.0.1

package/README.md

@@ -1,3 +1,22 @@
+# ReleaseV2.0.1
+#### Release Date: 2025-4-2
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * update error message
+    * Add verification to the pull method
+    * publish plugin change http
+
+# ReleaseV2.0.0
+#### Release Date: 2025-4-2
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * Simplify developer information configuration
+    * Add component compilation error capture
+    * change http methods
+    * auto update ccopenapi.jar
+
 # ReleaseV1.9.9
 #### Release Date: 2025-3-12
 #### Release Scope: Full

package/java/com/cloudcc/core/CCService.java

@@ -24,15 +24,13 @@ public class CCService {
 	public String URL;
 	protected Map<String, Object> record_new;
 	protected Map<String, Object> record_old;
-	public Map<String, String> Config = Tool.getConfig();
+	public Map<String, String> Config = Tool.executeGetTokenCommand();
 	public ServiceResult trigger = new ServiceResult();
 	public String objectApiName;
-	String orgId = Config.get("orgId");
 
 	public CCService(UserInfo userInfo) {
-		this.URL = Config.get("apiSvc");
-		this.ACCESSTOKEN = Config.get("token");
-		this.path = URL + "/openApi/common";
+		this.ACCESSTOKEN = Config.get("accessToken"); // 修复键名
+		this.path = Config.get("apiSvc") + "/openApi/common";
 	}
 
 	@SuppressWarnings("rawtypes")
@@ -87,6 +85,8 @@ public class CCService {
 				}
 				orst.add(co);
 			}
+		} else {
+			System.err.println("cquery报错: " + relObj.getString("returnInfo"));
 		}
 		return orst;
 	}

package/java/com/cloudcc/core/Tool.java

@@ -1,270 +1,47 @@
 package com.cloudcc.core;
 
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import com.alibaba.fastjson.JSONObject;
 
 public class Tool {
-    /**
-     * 读取cloudcc-cli.config.js文件内容，解析use属性，获取对应内容
-     * 
-     * @return Map包含currentEnv和对应的配置信息
-     */
-    public static Map<String, String> getConfig() {
-        Map<String, String> result = new HashMap<>();
-        try {
-            // 获取配置文件路径
-            String configPath = new File("").getAbsolutePath() + "/cloudcc-cli.config.js";
-            File configFile = new File(configPath);
-
-            if (!configFile.exists()) {
-                System.err.println("配置文件不存在: " + configPath);
-                return null;
-            }
-
-            // 读取文件内容
-            StringBuilder content = new StringBuilder();
-            try (BufferedReader reader = new BufferedReader(new FileReader(configFile))) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    // 跳过注释行
-                    if (line.trim().startsWith("//")) {
-                        continue;
-                    }
-                    content.append(line).append("\n");
-                }
-            }
-
-            String fileContent = content.toString();
-
-            // 替换 'module.exports = ' 为空字符串，并移除注释
-            String jsonStr = fileContent.replaceFirst("module\\.exports\\s*=\\s*", "")
-                    .replaceAll("//[^\\n]*", ""); // 移除单行注释
-
-            // 使用正则表达式提取配置对象，处理最后可能有多余的分号
-            Pattern configPattern = Pattern.compile("\\{([\\s\\S]*)\\}\\s*;?\\s*$");
-            Matcher configMatcher = configPattern.matcher(jsonStr);
-            if (configMatcher.find()) {
-                jsonStr = "{" + configMatcher.group(1) + "}";
-            }
-
-            // 使用正则表达式提取use值
-            Pattern usePattern = Pattern.compile("\"use\"\\s*:\\s*\"([^\"]*)\"");
-            Matcher useMatcher = usePattern.matcher(jsonStr);
-
-            if (!useMatcher.find()) {
-                System.err.println("无法找到use属性");
-                return null;
-            }
-
-            String currentEnv = useMatcher.group(1);
-            result.put("currentEnv", currentEnv);
-
-            // 创建更精确的正则表达式来匹配环境配置块
-            Pattern envPattern = Pattern.compile(
-                    "\"" + Pattern.quote(currentEnv) + "\"\\s*:\\s*\\{([^\\{\\}]*(\\{[^\\{\\}]*\\})*[^\\{\\}]*)\\}");
-            Matcher envMatcher = envPattern.matcher(jsonStr);
-
-            if (envMatcher.find()) {
-                String envConfig = envMatcher.group(1);
-                // 解析配置项（考虑到键和值可能包含更复杂的内容）
-                Pattern itemPattern = Pattern.compile("\"([^\"]+)\"\\s*:\\s*\"([^\"]*)\"");
-                Matcher itemMatcher = itemPattern.matcher(envConfig);
-                while (itemMatcher.find()) {
-                    result.put(itemMatcher.group(1), itemMatcher.group(2));
-                }
-
-                // 获取secretKey
-                String secretKey = result.get("secretKey");
-                if (secretKey != null) {
-                    // 从缓存文件中读取相关信息
-                    Map<String, Object> cacheData = readCache(secretKey);
-                    if (cacheData != null) {
-                        // 将缓存信息添加到结果中
-                        for (Map.Entry<String, Object> entry : cacheData.entrySet()) {
-                            result.put(entry.getKey(), String.valueOf(entry.getValue()));
-                        }
-                    }
-                }
-            } else {
-                System.err.println("无法找到环境配置: " + currentEnv);
-            }
-
-            return result;
-        } catch (IOException e) {
-            System.err.println("读取配置文件失败: " + e.getMessage());
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * 读取.cloudcc-cache.json缓存文件并根据secretKey获取相关信息
-     * 
-     * @param secretKey 密钥
-     * @return 包含缓存信息的Map
-     */
-    private static Map<String, Object> readCache(String secretKey) {
-        try {
-            // 获取缓存文件路径
-            String cachePath = new File("").getAbsolutePath() + "/.cloudcc-cache.json";
-            File cacheFile = new File(cachePath);
-
-            // 如果缓存文件不存在，执行刷新token命令
-            if (!cacheFile.exists()) {
-                boolean refreshed = executeGetTokenCommand();
-                if (refreshed) {
-                    // 重新检查缓存文件是否存在
-                    if (cacheFile.exists()) {
-                        return readCacheAfterRefresh(secretKey);
-                    } else {
-                        System.err.println("获取token失败");
-                        return null;
-                    }
-                } else {
-                    System.err.println("获取token失败");
-                    return null;
-                }
-            }
-
-            // 读取文件内容
-            StringBuilder content = new StringBuilder();
-            try (BufferedReader reader = new BufferedReader(new FileReader(cacheFile))) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    content.append(line).append("\n");
-                }
-            }
-
-            String jsonContent = content.toString();
-            // 使用Fastjson解析JSON内容
-            JSONObject jsonObject = JSONObject.parseObject(jsonContent);
-
-            // 检查secretKey是否存在，如果不存在，执行刷新token命令
-            if (!jsonObject.containsKey(secretKey)) {
-                System.out.println("缓存文件中不存在该secretKey: " + secretKey + "，正在获取新的token...");
-                boolean refreshed = executeGetTokenCommand();
-                if (refreshed) {
-                    return readCacheAfterRefresh(secretKey);
-                } else {
-                    System.err.println("获取token失败");
-                    return null;
-                }
-            }
-
-            // 获取secretKey对应的数据
-            JSONObject secretKeyData = jsonObject.getJSONObject(secretKey);
-
-            // 检查时间戳是否过期（大于1小时）或者不存在
-            if (!secretKeyData.containsKey("timestamp") ||
-                    (System.currentTimeMillis() - secretKeyData.getLongValue("timestamp") > 60 * 60 * 1000)) {
-                boolean refreshed = executeGetTokenCommand();
-                if (refreshed) {
-                    // 重新读取缓存文件
-                    return readCacheAfterRefresh(secretKey);
-                } else {
-                    System.err.println("刷新Token失败");
-                }
-            }
-
-            // 将JSON对象转换为Map
-            Map<String, Object> resultMap = new HashMap<>();
-            for (String key : secretKeyData.keySet()) {
-                resultMap.put(key, secretKeyData.get(key));
-            }
-            return resultMap;
-        } catch (IOException e) {
-            System.err.println("读取缓存文件失败: " + e.getMessage());
-            e.printStackTrace();
-            // 发生IO异常时，尝试获取新的token
-            boolean refreshed = executeGetTokenCommand();
-            if (refreshed) {
-                return readCacheAfterRefresh(secretKey);
-            }
-            return null;
-        } catch (Exception e) {
-            System.err.println("解析缓存文件失败: " + e.getMessage());
-            e.printStackTrace();
-            return null;
-        }
-    }
 
     /**
      * 执行命令 cc get token 刷新token
      * 
      * @return 执行是否成功
      */
-    private static boolean executeGetTokenCommand() {
+    public static Map<String, String> executeGetTokenCommand() {
         try {
-            ProcessBuilder processBuilder = new ProcessBuilder("cc", "get", "token");
+            ProcessBuilder processBuilder = new ProcessBuilder("cc", "get", "config");
             processBuilder.redirectErrorStream(true);
             Process process = processBuilder.start();
 
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
-                // consume the stream if necessary
-            }
-
+            // 等待命令执行完成
             int exitCode = process.waitFor();
-            return exitCode == 0;
-        } catch (IOException | InterruptedException e) {
-            System.err.println("执行命令失败: " + e.getMessage());
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    /**
-     * 在刷新token后重新读取缓存文件
-     * 
-     * @param secretKey 密钥
-     * @return 包含缓存信息的Map
-     */
-    private static Map<String, Object> readCacheAfterRefresh(String secretKey) {
-        try {
-            // 获取缓存文件路径
-            String cachePath = new File("").getAbsolutePath() + "/.cloudcc-cache.json";
-            File cacheFile = new File(cachePath);
-
-            if (!cacheFile.exists()) {
-                System.err.println("缓存文件不存在: " + cachePath);
+            if (exitCode != 0) {
+                System.err.println("命令执行失败，退出码: " + exitCode);
                 return null;
             }
 
-            // 读取文件内容
-            StringBuilder content = new StringBuilder();
-            try (BufferedReader reader = new BufferedReader(new FileReader(cacheFile))) {
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                StringBuilder output = new StringBuilder();
                 String line;
                 while ((line = reader.readLine()) != null) {
-                    content.append(line).append("\n");
+                    output.append(line);
                 }
+                // 使用 fastjson 将 JSON 数据转换为 Map
+                return JSONObject.parseObject(output.toString(),
+                        new com.alibaba.fastjson.TypeReference<Map<String, String>>() {
+                        });
             }
 
-            String jsonContent = content.toString();
-            JSONObject jsonObject = JSONObject.parseObject(jsonContent);
-
-            if (!jsonObject.containsKey(secretKey)) {
-                System.err.println("缓存文件中不存在该secretKey: " + secretKey);
-                return null;
-            }
-
-            JSONObject secretKeyData = jsonObject.getJSONObject(secretKey);
-            Map<String, Object> resultMap = new HashMap<>();
-            for (String key : secretKeyData.keySet()) {
-                resultMap.put(key, secretKeyData.get(key));
-            }
-            return resultMap;
-        } catch (Exception e) {
-            System.err.println("刷新后读取缓存失败: " + e.getMessage());
+        } catch (IOException | InterruptedException e) {
+            System.err.println("执行命令失败: " + e.getMessage());
             e.printStackTrace();
-            return null;
+            return null; // 返回一个空的Map
         }
     }
 }

package/package.json

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

package/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.cloudcc.core</groupId>
     <artifactId>ccopenapi</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
     <packaging>jar</packaging>
     <name>ccopenapi</name>
     <dependencies>

package/src/classes/create.js

@@ -49,7 +49,7 @@ 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":"${getPackageJson().extandVersion || '2'}"}`)
+            fs.writeFileSync(path.join(classesPath, "config.json"), `{"name":"${name}","version":"${await getPackageJson().extandVersion || '2'}"}`)
             console.log()
             console.log(chalk.green("Successfully Created:" + name))
             console.log()

package/src/classes/publish.js

@@ -2,9 +2,12 @@ const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
-const { postNormal } = require("../../utils/http")
+const { postClass } = require("../../utils/http")
 
-const { getBusToken, javaContentRegular } = require("../../utils/utils")
+const { javaContentRegular } = require("../../utils/utils")
+
+
+const { getPackageJson } = require("../../utils/config")
 
 async function publish(name) {
   let res = await checkUpdate();
@@ -19,26 +22,25 @@ async function publish(name) {
     let classContent = sourceMatch ? sourceMatch[1] : fullContent;
     let configContent = JSON.parse(fs.readFileSync(classPath + "config.json", 'utf8'));
 
-    if (await getBusToken()) {
-      let body = {
-        "id": configContent.id,
-        "name": name,
-        "source": encodeURIComponent(classContent.trim()),
-        "version": configContent.version || "2",
-        "folderId": "wgd"
-      }
-      let res = await postNormal(global.setupSvc + "/api/ccfag/save", body)
-      if (res.result) {
-        console.log(chalk.green('Success！'));
-        console.log();
+    let body = {
+      "id": configContent.id,
+      "name": name,
+      "source": encodeURIComponent(classContent.trim()),
+      "version": configContent.version || "2",
+      "folderId": "wgd"
+    }
+    let config = await getPackageJson();
+    let res = await postClass(config.setupSvc + "/api/ccfag/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(classPath, "config.json"), JSON.stringify(configContent))
-        }
-      } else {
-        console.log(chalk.red('Fail：' + res.returnInfo));
+      if (!configContent.id) {
+        configContent.id = res.data
+        fs.writeFileSync(path.join(classPath, "config.json"), JSON.stringify(configContent))
       }
+    } else {
+      console.log(chalk.red('Failed：' + res.returnInfo));
     }
   }
 }

package/src/classes/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();
@@ -14,32 +16,35 @@ async function pull(name) {
         console.log();
         const classPath = path.join(process.cwd(), `classes/${name}/`);
         let configContent = JSON.parse(fs.readFileSync(classPath + "config.json", 'utf8'));
-        if (await getBusToken()) {
-            let body = {
-                "id": configContent.id,
-            }
-            let res = await postNormal(global.setupSvc + "/api/ccfag/detail", body)
-            if (res.result) {
-                console.log(chalk.green('Success！'));
-                console.log();
-
-                let fullContent = fs.readFileSync(classPath + `${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.source;
-                }
+        if (!configContent.id) {
+            console.log(chalk.red('Class ID is not exist, please publish first！'));
+            return;
+        }
+        let body = {
+            "id": configContent.id,
+        }
+        let config = await getPackageJson();
+        let res = await postClass(config.setupSvc + "/api/ccfag/detail", body, config.accessToken)
+        if (res.result) {
+            console.log(chalk.green('Success！'));
+            console.log();
 
-                fs.writeFileSync(classPath + `${name}.java`, newContent, 'utf8');
+            let fullContent = fs.readFileSync(classPath + `${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.source;
             }
+
+            fs.writeFileSync(classPath + `${name}.java`, newContent, 'utf8');
+
+        } else {
+            console.log(chalk.red('Pull Fail：' + res.returnInfo));
         }
     }
 }

package/src/config/get.js

@@ -1,20 +1,9 @@
 
-const chalk = require("chalk")
-const path = require("path")
+const { getPackageJson } = require("../../utils/config.js")
 
 async function get(projectPath = process.cwd()) {
-    let config = require(path.join(projectPath, "cloudcc-cli.config.js"))
-    if (config) {
-        console.log();
-        Object.keys(config).map((item) => {
-            if (item == config.use) {
-                console.log(chalk.green(`*${item}`));
-            } else if ("use" != item) {
-                console.log(item);
-            }
-        })
-        console.log();
-    }
+    const config = await getPackageJson();
+    console.log(config);
 }
 
 module.exports = get;