cloudcc-cli 2.2.2 → 2.2.4

package/src/timer/detail.js

@@ -0,0 +1,84 @@
+const fs = require("fs");
+const path = require("path")
+
+const { getPackageJson } = require("../../utils/config")
+const { postClass } = require("../../utils/http")
+
+/**
+ * 获取定时类详细信息
+ * @param {string} name - 定时类名称（优先从本地查询）
+ * @param {string} id - 定时类ID（当没有name时从服务器查询）
+ * @returns {Object} 定时类详细信息
+ */
+async function detail(name, id) {
+    // 如果有 name，优先查询本地
+    if (name && name !== '') {
+        const schedulePath = path.join(process.cwd(), `schedule/${name}/`);
+        const configPath = schedulePath + "config.json";
+        const javaFilePath = schedulePath + `${name}.java`;
+
+        // 先尝试从本地文件获取详情
+        if (fs.existsSync(configPath) && fs.existsSync(javaFilePath)) {
+            let configContent = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+            let javaContent = fs.readFileSync(javaFilePath, 'utf8');
+            return {
+                name: configContent.name,
+                version: configContent.version,
+                id: configContent.id || null,
+                source: javaContent,
+                published: !!configContent.id,
+                fromLocal: true
+            };
+        }
+
+        // 本地文件不完整，从服务器拉取
+        if (!fs.existsSync(configPath)) {
+            throw new Error('Schedule not found in local directory: ' + schedulePath);
+        }
+
+        let configContent = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+
+        if (!configContent.id) {
+            throw new Error('Schedule has not been published. Please publish first to fetch details from server.');
+        }
+
+        // 使用本地 config 中的 id 从服务器获取详细信息
+        let body = {
+            "id": configContent.id,
+        }
+        let config = await getPackageJson();
+        let res = await postClass(config.setupSvc + "/api/ccPeak/detail", body, config.accessToken)
+
+        if (res.result) {
+            return {
+                ...res.data.trigger,
+                fromLocal: false
+            };
+        } else {
+            throw new Error('Get Schedule Details Failed: ' + res.returnInfo);
+        }
+    }
+
+    // 如果没有 name，用 id 从服务器查询
+    if (id && id !== '') {
+        let body = {
+            "id": id,
+        }
+        let config = await getPackageJson();
+        let res = await postClass(config.setupSvc + "/api/ccPeak/detail", body, config.accessToken)
+
+        if (res.result) {
+            return {
+                ...res.data.trigger,
+                fromLocal: false
+            };
+        } else {
+            throw new Error('Get Schedule Details Failed: ' + res.returnInfo);
+        }
+    }
+
+    // 既没有 name 也没有 id，报错
+    throw new Error('Either schedule name or id must be provided');
+}
+
+module.exports = detail;

package/src/timer/get.js

@@ -1,8 +1,8 @@
 const { getPackageJson } = require("../../utils/config")
 const { postClass } = require("../../utils/http")
 
-async function get(arg1, arg2) {
-    let body = JSON.parse(decodeURI(arg1))
+async function get(arg1, arg2, isMcp = false) {
+    let body = arg1 != null && arg1 != '' ? JSON.parse(decodeURI(arg1)) : { shownum: "2000", showpage: "1", fid: "", sname: '', rptcond: '', rptorder: '' }
     let config = await getPackageJson(arg2);
     let res = await postClass(config.setupSvc + "/api/ccPeak/list", body, config.accessToken)
     if (res.result) {
@@ -11,10 +11,13 @@ async function get(arg1, arg2) {
             id: item.id,
             name: item.name
         }))
-        console.log(JSON.stringify(simpleList))
+        if (!isMcp) {
+            console.log(JSON.stringify(simpleList))
+        }
         return simpleList
     } else {
         console.error('error:', res.message);
+        throw new Error('Get Schedule Failed: ' + res.message);
     }
 }
 

package/src/timer/publish.js

@@ -10,12 +10,12 @@ const { postClass } = require("../../utils/http")
 async function publish(name) {
   let res = await checkUpdate();
   if (!res) {
-    console.log();
+    console.error();
     const now = new Date();
     const timeStr = now.getFullYear() + '-' + String(now.getMonth() + 1).padStart(2, '0') + '-' + String(now.getDate()).padStart(2, '0') + ' ' + String(now.getHours()).padStart(2, '0') + ':' + String(now.getMinutes()).padStart(2, '0') + ':' + String(now.getSeconds()).padStart(2, '0');
-    console.log(chalk.green(timeStr));
-    console.log(chalk.green('Posting, please wait...'));
-    console.log();
+    console.error(chalk.green(timeStr));
+    console.error(chalk.green('Posting, please wait...'));
+    console.error();
     const timerPath = path.join(process.cwd(), `schedule/${name}/`);
     let fullContent = fs.readFileSync(timerPath + `${name}.java`, 'utf8');
 
@@ -35,15 +35,15 @@ async function publish(name) {
     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();
+      console.error(chalk.green('Success！'));
+      console.error();
 
       if (!configContent.id) {
         configContent.id = res.data
         fs.writeFileSync(path.join(timerPath, "config.json"), JSON.stringify(configContent))
       }
     } else {
-      console.log(chalk.red('Pull Schedule Failed' + res.returnInfo));
+      console.error(chalk.red('Publish Schedule Failed' + res.returnInfo));
     }
   }
 }

package/src/timer/pull.js

@@ -11,16 +11,16 @@ const { postClass } = require("../../utils/http")
 async function pull(name) {
   let res = await checkUpdate();
   if (!res) {
-    console.log();
+    console.error();
     const now = new Date();
     const timeStr = now.getFullYear() + '-' + String(now.getMonth() + 1).padStart(2, '0') + '-' + String(now.getDate()).padStart(2, '0') + ' ' + String(now.getHours()).padStart(2, '0') + ':' + String(now.getMinutes()).padStart(2, '0') + ':' + String(now.getSeconds()).padStart(2, '0');
-    console.log(chalk.green(timeStr));
-    console.log(chalk.green('Pulling, please wait...'));
-    console.log();
+    console.error(chalk.green(timeStr));
+    console.error(chalk.green('Pulling, please wait...'));
+    console.error();
     const timerPath = path.join(process.cwd(), `schedule/${name}/`);
     let configContent = JSON.parse(fs.readFileSync(timerPath + "config.json", 'utf8'));
     if (!configContent.id) {
-      console.log(chalk.red('Schedule ID is not exist, please publish first！'));
+      console.error(chalk.red('Schedule ID is not exist, please publish first！'));
       return;
     }
     let body = {
@@ -29,8 +29,8 @@ async function pull(name) {
     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
+      console.error(chalk.green('Success！'));
+      console.error
       let fullContent = fs.readFileSync(timerPath + `${name}.java`, 'utf8');
 
       let newContent = '';
@@ -46,7 +46,7 @@ async function pull(name) {
       fs.writeFileSync(timerPath + `${name}.java`, newContent, 'utf8');
 
     } else {
-      console.log(chalk.red('Pull Schedule Failed：' + res.returnInfo));
+      console.error(chalk.red('Pull Schedule Failed：' + res.returnInfo));
     }
   }
 }

package/src/timer/pullList.js

@@ -7,7 +7,7 @@ const { postClass } = require("../../utils/http");
  * 批量拉取定时器详情并生成本地文件
  * @param timer id
  */
-async function pullList(arg1, arg2) {
+async function pullList(arg1, arg2, isMcp = false) {
     const body = { id: arg1 };
     let config = await getPackageJson(arg2);
     const res = await postClass(config.setupSvc + "/api/ccPeak/detail", body, config.accessToken);
@@ -29,9 +29,11 @@ async function pullList(arg1, arg2) {
             version: "2"
         };
         fs.writeFileSync(path.join(folderPath, "config.json"), JSON.stringify(configJson, null, 4), "utf8");
-        console.log("true");
+        if (!isMcp) {
+            console.log("true");
+        }
     } catch (e) {
-        console.log(`Error occurred while processing timer id: ${args[2]}, message: ${e.message}${JSON.stringify(res)}}`);
+        console.error(`Error occurred while processing timer id: ${args[2]}, message: ${e.message}${JSON.stringify(res)}}`);
     }
 }
 

package/src/token/get.js

@@ -3,7 +3,7 @@ const { getBusToken } = require("../../utils/utils")
 async function get(path) {
     let token = await getBusToken(path)
     if (token) {
-        console.log(token)
+        console.error(token)
         return token;
     }
 }

package/src/triggers/create.js

@@ -7,6 +7,7 @@ const { getPackageJson } = require("../../utils/config.js")
 async function create(argvs) {
     let res = await checkUpdate();
     if (!res) {
+        let config = await getPackageJson();
         let body = JSON.parse(decodeURI(argvs[2]))
         const baseTriggersPath = path.join(process.cwd(), "triggers");
         const objectFolderPath = path.join(baseTriggersPath, `${body.schemetableName.toLowerCase()}`);
@@ -31,17 +32,16 @@ public class ${body.name} extends CCTrigger {
 }`
 
             fs.writeFileSync(path.join(triggersPath, body.name + ".java"), javaTmp);
-            let config = await getPackageJson();
             body.version = config.extandVersion || "2";
             body.isactive = true;
             fs.writeFileSync(path.join(triggersPath, "config.json"), JSON.stringify(body));
-            console.log();
-            console.log(chalk.green("Successfully Created:" + body.name));
-            console.log();
+            console.error();
+            console.error(chalk.green("Successfully Created:" + body.name));
+            console.error();
         } catch (e) {
-            console.log()
-            console.log(chalk.red("Creation Trigger Failed:" + e))
-            console.log()
+            console.error()
+            console.error(chalk.red("Creation Trigger Failed:" + e))
+            console.error()
         }
     }
 }

package/src/triggers/detail.js

@@ -0,0 +1,90 @@
+const fs = require("fs");
+const path = require("path")
+
+const { getPackageJson } = require("../../utils/config")
+const { postClass } = require("../../utils/http")
+
+/**
+ * 获取触发器详细信息
+ * @param {string} namePath - 触发器路径 "objectName/triggerName"（优先从本地查询）
+ * @param {string} id - 触发器ID（当没有namePath时从服务器查询）
+ * @returns {Object} 触发器详细信息
+ */
+async function detail(namePath, id) {
+    // 如果有 namePath，优先查询本地
+    if (namePath && namePath !== '') {
+        const triggerPath = path.join(process.cwd(), `triggers/${namePath}/`);
+        const configPath = triggerPath + "config.json";
+        const triggerName = namePath.split("/")[1];
+        const javaFilePath = triggerPath + `${triggerName}.java`;
+
+        // 先尝试从本地文件获取详情
+        if (fs.existsSync(configPath) && fs.existsSync(javaFilePath)) {
+            let configContent = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+            let javaContent = fs.readFileSync(javaFilePath, 'utf8');
+            return {
+                name: configContent.name,
+                apiname: configContent.apiname,
+                schemetableName: configContent.schemetableName,
+                targetObjectId: configContent.targetObjectId,
+                triggerTime: configContent.triggerTime,
+                version: configContent.version,
+                isactive: configContent.isactive,
+                id: configContent.id || null,
+                source: javaContent,
+                published: !!configContent.id,
+                fromLocal: true
+            };
+        }
+
+        // 本地文件不完整，从服务器拉取
+        if (!fs.existsSync(configPath)) {
+            throw new Error('Trigger not found in local directory: ' + triggerPath);
+        }
+
+        let configContent = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+
+        if (!configContent.id) {
+            throw new Error('Trigger has not been published. Please publish first to fetch details from server.');
+        }
+
+        // 使用本地 config 中的 id 从服务器获取详细信息
+        let body = {
+            "id": configContent.id,
+        }
+        let config = await getPackageJson();
+        let res = await postClass(config.setupSvc + "/api/trigger/newobjtrigger", body, config.accessToken)
+
+        if (res.result) {
+            return {
+                ...res.data.trigger,
+                fromLocal: false
+            };
+        } else {
+            throw new Error('Get Trigger Details Failed: ' + res.returnInfo);
+        }
+    }
+
+    // 如果没有 namePath，用 id 从服务器查询
+    if (id && id !== '') {
+        let body = {
+            "id": id,
+        }
+        let config = await getPackageJson();
+        let res = await postClass(config.setupSvc + "/api/trigger/newobjtrigger", body, config.accessToken)
+
+        if (res.result) {
+            return {
+                ...res.data.trigger,
+                fromLocal: false
+            };
+        } else {
+            throw new Error('Get Trigger Details Failed: ' + res.returnInfo);
+        }
+    }
+
+    // 既没有 namePath 也没有 id，报错
+    throw new Error('Either trigger path or id must be provided');
+}
+
+module.exports = detail;

package/src/triggers/get.js

@@ -1,7 +1,7 @@
 const { getPackageJson } = require("../../utils/config")
 const { postClass } = require("../../utils/http")
 
-async function get(args) {
+async function get(args, isMcp = false) {
     let body = JSON.parse(decodeURI(args[2]))
     let config = await getPackageJson(args[3]);
     let res = await postClass(config.setupSvc + "/api/triggerSetup/getTriggerByCondition", body, config.accessToken)
@@ -11,7 +11,9 @@ async function get(args) {
             id: item.id,
             name: item.name
         }))
-        console.log(JSON.stringify(simpleList))
+        if (!isMcp) {
+            console.log(JSON.stringify(simpleList))
+        }
         return simpleList
     } else {
         console.error('error:', res.message);

package/src/triggers/index.js

@@ -4,6 +4,7 @@ cc.publish = require("./publish")
 cc.pull = require("./pull")
 cc.get = require("./get")
 cc.pullList = require("./pullList")
+cc.detail = require("./detail")
 function Classes(action, argvs) {
   cc[action](argvs)
 }

package/src/triggers/publish.js

@@ -11,12 +11,12 @@ async function publish(argvs) {
   let name = namePath.split("/")[1]
   let res = await checkUpdate();
   if (!res) {
-    console.log();
+    console.error();
     const now = new Date();
     const timeStr = now.getFullYear() + '-' + String(now.getMonth() + 1).padStart(2, '0') + '-' + String(now.getDate()).padStart(2, '0') + ' ' + String(now.getHours()).padStart(2, '0') + ':' + String(now.getMinutes()).padStart(2, '0') + ':' + String(now.getSeconds()).padStart(2, '0');
-    console.log(chalk.green(timeStr));
-    console.log(chalk.green('Posting, please wait...'));
-    console.log();
+    console.error(chalk.green(timeStr));
+    console.error(chalk.green('Posting, please wait...'));
+    console.error();
     const triggersPath = path.join(process.cwd(), `triggers/${namePath}/`);
     let fullContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
 
@@ -39,8 +39,8 @@ async function publish(argvs) {
     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();
+      console.error(chalk.green('Success！'));
+      console.error();
 
       if (!configContent.id) {
         configContent.id = res.data.id
@@ -48,7 +48,7 @@ async function publish(argvs) {
         fs.writeFileSync(path.join(triggersPath, "config.json"), JSON.stringify(configContent))
       }
     } else {
-      console.log(chalk.red('Publish Trigger Failed：' + res.returnInfo));
+      console.error(chalk.red('Publish Trigger Failed：' + res.returnInfo));
     }
   }
 }

package/src/triggers/pull.js

@@ -10,16 +10,16 @@ async function pull(argvs) {
     let name = namePath.split("/")[1]
     let res = await checkUpdate();
     if (!res) {
-        console.log();
+        console.error();
         const now = new Date();
         const timeStr = now.getFullYear() + '-' + String(now.getMonth() + 1).padStart(2, '0') + '-' + String(now.getDate()).padStart(2, '0') + ' ' + String(now.getHours()).padStart(2, '0') + ':' + String(now.getMinutes()).padStart(2, '0') + ':' + String(now.getSeconds()).padStart(2, '0');
-        console.log(chalk.green(timeStr));
-        console.log(chalk.green('Pulling, please wait...'));
-        console.log();
+        console.error(chalk.green(timeStr));
+        console.error(chalk.green('Pulling, please wait...'));
+        console.error();
         const triggersPath = path.join(process.cwd(), `triggers/${namePath}/`);
         let configContent = JSON.parse(fs.readFileSync(triggersPath + "config.json", 'utf8'));
         if (!configContent.id) {
-            console.log(chalk.red('Trigger ID is not exist, please publish first！'));
+            console.error(chalk.red('Trigger ID is not exist, please publish first！'));
             return;
         }
         let body = {
@@ -28,8 +28,8 @@ async function pull(argvs) {
         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();
+            console.error(chalk.green('Success！'));
+            console.error();
 
             let fullContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
             let newContent = '';
@@ -45,7 +45,7 @@ async function pull(argvs) {
             fs.writeFileSync(triggersPath + `${name}.java`, newContent);
 
         } else {
-            console.log(chalk.red('Pull Trigger Failed：' + res.returnInfo));
+            console.error(chalk.red('Pull Trigger Failed：' + res.returnInfo));
         }
     }
 }

package/src/triggers/pullList.js

@@ -7,7 +7,7 @@ const { postClass } = require("../../utils/http");
  * 批量拉取触发器详情并生成本地文件
  * @param trigger id
  */
-async function pullList(args) {
+async function pullList(args, isMcp = false) {
     const body = { id: args[2] };
     let config = await getPackageJson(args[3]);
     const res = await postClass(config.setupSvc + "/api/trigger/newobjtrigger", body, config.accessToken);
@@ -34,9 +34,11 @@ async function pullList(args) {
             isactive: typeof trigger.isactive === 'boolean' ? trigger.isactive : true
         };
         fs.writeFileSync(path.join(folderPath, "config.json"), JSON.stringify(configJson, null, 4), "utf8");
-        console.log("true");
+        if (!isMcp) {
+            console.log("true");
+        }
     } catch (e) {
-        console.log(`Error occurred while processing trigger id: ${args[2]}, message: ${e.message}${JSON.stringify(res)}}`);
+        console.error(`Error occurred while processing trigger id: ${args[2]}, message: ${e.message}${JSON.stringify(res)}}`);
     }
 }
 

package/src/version/get.js

@@ -2,9 +2,9 @@ const chalk = require("chalk")
 const pkg = require("../../package.json")
 
 function get() {
-    console.log()
-    console.log(chalk.green(`cloudcc-cli version: ${pkg.version}`));
-    console.log()
+    console.error()
+    console.error(chalk.green(`cloudcc-cli version: ${pkg.version}`));
+    console.error()
 }
 
 module.exports = get;

package/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=ccopenapi
+groupId=com.cloudcc.core
+version=0.0.3

package/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,18 @@
+com/cloudcc/core/CCObject.class
+com/cloudcc/core/TriggerTimeEnum.class
+com/cloudcc/core/UserInfo.class
+com/cloudcc/core/SendEmail.class
+com/cloudcc/core/PeakInterf.class
+com/cloudcc/core/TimeUtil.class
+com/cloudcc/core/CCTriggerHandler.class
+com/cloudcc/core/Tool.class
+com/cloudcc/core/TriggerInvoker.class
+com/cloudcc/core/CCSchedule.class
+com/cloudcc/core/OperatationEnum.class
+com/cloudcc/core/TriggerMethod.class
+com/cloudcc/core/ServiceResult.class
+com/cloudcc/core/DevLogger.class
+com/cloudcc/core/CCService.class
+com/cloudcc/core/CCTrigger.class
+com/cloudcc/core/CCTriggerDemo.class
+com/cloudcc/core/Tool$1.class

package/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,19 @@
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/ServiceResult.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/TriggerInvoker.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/UserInfo.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/Tool.java
+/Users/xuhm/Documents/cloudcc-cli/classes/TestDtt/TestDttTest.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/CCService.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/CCSchedule.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/SendEmail.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/OperatationEnum.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/CCTriggerHandler.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/TriggerMethod.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/CCTriggerDemo.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/TriggerTimeEnum.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/CCTrigger.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/DevLogger.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/PeakInterf.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/TimeUtil.java
+/Users/xuhm/Documents/cloudcc-cli/java/com/cloudcc/core/CCObject.java
+/Users/xuhm/Documents/cloudcc-cli/classes/TestDtt/TestDtt.java