cloudcc-cli 1.9.7 → 1.9.8

package/java/com/cloudcc/core/SendEmail.java

@@ -5,14 +5,15 @@ public class SendEmail {
 
     }
 
-    //Receive address, cc address, password address, subject, email content, text content
+    // Receive address, cc address, password address, subject, email content, text
+    // content
     public ServiceResult sendMailFromSystem(String[] toAddress, String[] ccAddress, String bccAddress, String subject,
             String content, boolean isText) {
         ServiceResult srt = new ServiceResult();
         return srt;
     }
 
-    //Email template id, receipt address, cc address, password address, record id
+    // Email template id, receipt address, cc address, password address, record id
     public ServiceResult sendEmailNew(String templateId, String[] toAddress, String[] ccAddress, String bccAddress,
             String recordId) {
         ServiceResult srt = new ServiceResult();

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

@@ -4,6 +4,7 @@ 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;
@@ -117,9 +118,21 @@ public class Tool {
             String cachePath = new File("").getAbsolutePath() + "/.cloudcc-cache.json";
             File cacheFile = new File(cachePath);
 
+            // 如果缓存文件不存在，执行刷新token命令
             if (!cacheFile.exists()) {
-                System.err.println("缓存文件不存在: " + cachePath);
-                return null;
+                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;
+                }
             }
 
             // 读取文件内容
@@ -135,15 +148,33 @@ public class Tool {
             // 使用Fastjson解析JSON内容
             JSONObject jsonObject = JSONObject.parseObject(jsonContent);
 
-            // 检查secretKey是否存在
+            // 检查secretKey是否存在，如果不存在，执行刷新token命令
             if (!jsonObject.containsKey(secretKey)) {
-                System.err.println("缓存文件中不存在该secretKey: " + secretKey);
-                return null;
+                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()) {
@@ -153,6 +184,11 @@ public class Tool {
         } 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());
@@ -161,7 +197,74 @@ public class Tool {
         }
     }
 
-    public static void main(String[] args) {
-        System.out.println(getConfig());
+    /**
+     * 执行命令 cc get token 刷新token
+     * 
+     * @return 执行是否成功
+     */
+    private static boolean executeGetTokenCommand() {
+        try {
+            ProcessBuilder processBuilder = new ProcessBuilder("cc", "get", "token");
+            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);
+                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();
+            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());
+            e.printStackTrace();
+            return null;
+        }
     }
 }

package/java/com/cloudcc/core/TriggerInvoker.java

@@ -21,6 +21,7 @@ public class TriggerInvoker {
 
     }
 
+    @SuppressWarnings("rawtypes")
     public ServiceResult handler(CCObject data) throws Exception {
         String objectApiName = data.getObjectApiName();
         ServiceResult sr = new ServiceResult();

package/package.json

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

package/template/index.js

@@ -1,6 +1,33 @@
 const fs = require("fs");
 const chalk = require("chalk")
 const path = require("path")
+
+// 添加递归复制文件夹的函数
+function copyFolderSync(source, target) {
+    // 确保目标文件夹存在
+    if (!fs.existsSync(target)) {
+        fs.mkdirSync(target, { recursive: true });
+    }
+
+    // 读取源文件夹内容
+    const files = fs.readdirSync(source);
+
+    // 遍历并复制每个文件/文件夹
+    files.forEach(file => {
+        const sourcePath = path.join(source, file);
+        const targetPath = path.join(target, file);
+
+        // 判断是文件还是文件夹
+        if (fs.statSync(sourcePath).isDirectory()) {
+            // 如果是文件夹，递归复制
+            copyFolderSync(sourcePath, targetPath);
+        } else {
+            // 如果是文件，直接复制
+            fs.copyFileSync(sourcePath, targetPath);
+        }
+    });
+}
+
 module.exports = function (creator, options, callback) {
     const { name, description } = options;
 
@@ -15,6 +42,15 @@ module.exports = function (creator, options, callback) {
     const public = path.join(projectPath, "public");
     fs.mkdirSync(public)
 
+    const libPath = path.join(projectPath, "lib");
+    fs.mkdirSync(libPath)
+
+    const templateLibPath = path.join(__dirname, "lib");
+    if (fs.existsSync(templateLibPath)) {
+        copyFolderSync(templateLibPath, libPath);
+        console.log(`${chalk.grey(`Copy lib folder to ${name}/lib`)} ${chalk.green('✔ ')}`);
+    }
+
     creator.copyTpl('cloudcc-cli.configjs', path.join(projectPath, "cloudcc-cli.config.js"))
 
     creator.copyTpl('gitignore', path.join(projectPath, ".gitignore"))
@@ -45,7 +81,8 @@ module.exports = function (creator, options, callback) {
         console.log(`${chalk.grey(`Create directory: ${name}/public`)} ${chalk.green('✔ ')}`);
         console.log(`${chalk.grey(`Create file: ${name}/public/index.html`)} ${chalk.green('✔ ')}`);
 
-        console.log(`${chalk.grey(`Create file: ${name}/src`)} ${chalk.green('✔ ')}`);
+        console.log(`${chalk.grey(`Create directory: ${name}/lib`)} ${chalk.green('✔ ')}`);
+        console.log(`${chalk.grey(`Create directory: ${name}/src`)} ${chalk.green('✔ ')}`);
         console.log(`${chalk.grey(`Create file: ${name}/src/App.vue`)} ${chalk.green('✔ ')}`);
         console.log(`${chalk.grey(`Create file: ${name}/src/main.js`)} ${chalk.green('✔ ')}`);
 

package/core/core/CCObject.java

@@ -1,48 +0,0 @@
-package com.cloudcc.core;
-
-import java.util.HashMap;
-
-/**
- * @author T.han
- * @date 2023/8/17 16:18
- * @project CloudccNewPro
- * @Description //TODO
- */
-public class CCObject extends HashMap<String,Object> {
-    public static final String OBJECT_API = "CCObjectAPI";
-    public static final String IS_SHARED = "isShared";
-
-    public CCObject() {
-        /* compiled code */
-        
-    }
-
-    public CCObject(String ccobj) {
-        /* compiled code */
-        put("CCObjectAPI", ccobj);
-
-    }
-
-    public CCObject(String ccobj, String isShared) {
-        /* compiled code */
-        put("CCObjectAPI", ccobj);
-        put("isShared", "isShared");
-    }
-
-    public void putSumValue(String sumValueKey, String value) {
-        /* compiled code */
-        put("sum" + sumValueKey, value);
-    }
-
-    public Object getSumValue(String sumValueKey) {
-        /* compiled code */
-        return get("sum" + sumValueKey);
-    }
-
-    public String getObjectApiName() {
-        /* compiled code */
-        return (String)get("CCObjectAPI");
-    }
-
-
-}