cloudcc-cli 1.8.2 → 1.8.4

package/README.md

@@ -1,3 +1,17 @@
+# ReleaseV1.8.4
+#### Release Date: 2025-1-24
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * Add trigger timing directory
+
+# ReleaseV1.8.3
+#### Release Date: 2025-1-22
+#### Release Scope: Full
+#### Release Content
+* Optimization
+    * Adjust the encoding
+
 # ReleaseV1.8.2
 #### Release Date: 2025-1-21
 #### Release Scope: Full

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "description": "cloudcc-cli",
   "keywords": [
     "cloudcc",
@@ -16,7 +16,7 @@
   },
   "scripts": {
     "cc-pull": "git fetch --tags -f && git pull",
-    "publish-lib": "npm publish --registry https://registry.npmjs.org && git add . && git commit -m '发布新版' && git push && curl https://npmmirror.com/sync/cloudcc-cli"
+    "publish-lib": "npm publish --registry https://registry.npmjs.org && git add . && git commit -m 'update version' && git push && curl https://npmmirror.com/sync/cloudcc-cli"
   },
   "dependencies": {
     "axios": "^0.21.4",

package/src/classes/create.js

@@ -2,6 +2,7 @@ const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
+const { getPackageJson } = require("../../utils/config.js")
 
 async function create(name) {
     let res = await checkUpdate();
@@ -9,8 +10,8 @@ async function create(name) {
         const classesPath = path.join(process.cwd(), "classes/" + name);
         try {
             fs.mkdirSync(classesPath, { recursive: true })
-            const javaTmp = 
-`// @SOURCE_CONTENT_START
+            const javaTmp =
+                `// @SOURCE_CONTENT_START
 public class ${name}{
     private UserInfo userInfo;
     
@@ -27,7 +28,7 @@ public class ${name}{
 // @SOURCE_CONTENT_END    
 `
             fs.writeFileSync(path.join(classesPath, name + ".java"), javaTmp)
-            fs.writeFileSync(path.join(classesPath, "config.json"), `{"name":"${name}","version":"3"}`)
+            fs.writeFileSync(path.join(classesPath, "config.json"), `{"name":"${name}","version":"${getPackageJson().extandVersion || '2'}"}`)
             console.log()
             console.log(chalk.green("Successfully Created:" + name))
             console.log()

package/src/classes/publish.js

@@ -23,8 +23,8 @@ async function publish(name) {
       let body = {
         "id": configContent.id,
         "name": name,
-        "source": encodeURI(classContent),
-        "version": configContent.version,
+        "source": encodeURIComponent(classContent),
+        "version": configContent.version || "2",
         "folderId": "wgd"
       }
       let res = await postNormal(global.setupSvc + "/api/ccfag/save", body)

package/src/timer/create.js

@@ -2,6 +2,7 @@ const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
+const { getPackageJson } = require("../../utils/config.js")
 
 async function create(name) {
     let res = await checkUpdate();
@@ -13,7 +14,7 @@ async function create(name) {
 System.out.print("hello World");
 // @SOURCE_CONTENT_END`
             fs.writeFileSync(path.join(timerPath, name + ".java"), javaTmp)
-            fs.writeFileSync(path.join(timerPath, "config.json"), `{"name":"${name}","version":"3"}`)
+            fs.writeFileSync(path.join(timerPath, "config.json"), `{"name":"${name}","version":"${getPackageJson().extandVersion || '2'}"}`)
             console.log()
             console.log(chalk.green("Successfully Created:" + name))
             console.log()

package/src/timer/publish.js

@@ -25,8 +25,8 @@ async function publish(name) {
       let body = {
         "id": configContent.id,
         "name": name,
-        "version": configContent.version,
-        "source": encodeURI(classContent),
+        "version": configContent.version || "2",
+        "source": encodeURIComponent(classContent),
         "folderId": "wgd"
       }
       let res = await postNormal(global.setupSvc + "/api/ccPeak/save", body)

package/src/triggers/create.js

@@ -2,13 +2,15 @@ const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
+const { getPackageJson } = require("../../utils/config.js")
 
 async function create(argvs) {
     let res = await checkUpdate();
     if (!res) {
         let body = JSON.parse(decodeURI(argvs[2]))
+        console.log(decodeURI(argvs[2]))
         const baseTriggersPath = path.join(process.cwd(), "triggers");
-        const objectFolderPath = path.join(baseTriggersPath, `${body.schemetableName.toLowerCase()}`);
+        const objectFolderPath = path.join(baseTriggersPath, `${body.schemetableName.toLowerCase()}`, body.triggerTime);
         const triggersPath = path.join(objectFolderPath, body.name);
 
         try {
@@ -21,6 +23,7 @@ System.out.print("hello World");
 // @SOURCE_CONTENT_END`
 
             fs.writeFileSync(path.join(triggersPath, body.name + ".java"), javaTmp);
+            body.version = getPackageJson().extandVersion || "2";
             fs.writeFileSync(path.join(triggersPath, "config.json"), JSON.stringify(body));
             console.log();
             console.log(chalk.green("Successfully Created:" + body.name));

package/src/triggers/publish.js

@@ -7,20 +7,20 @@ const { getBusToken } = require("../../utils/utils")
 
 async function publish(argvs) {
   let namePath = argvs[2]
-  let name = namePath.split("/")[1]
+  let name = path.basename(namePath, '.java')
+  let dirPath = path.dirname(namePath) // 获取不包含文件名的目录路径
   let res = await checkUpdate();
   if (!res) {
     console.log();
     console.log(chalk.green('Posting, please wait...'));
     console.log();
-    const triggersPath = path.join(process.cwd(), `triggers/${namePath}/`);
-    let fullContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
+    let fullContent = fs.readFileSync(namePath, 'utf8');
 
     // 提取标记之间的内容
     const sourceMatch = fullContent.match(/\/\/ @SOURCE_CONTENT_START\n([\s\S]*?)\n\/\/ @SOURCE_CONTENT_END/);
     let classContent = sourceMatch ? sourceMatch[1] : fullContent;
 
-    let configContent = JSON.parse(fs.readFileSync(triggersPath + "config.json", 'utf8'));
+    let configContent = JSON.parse(fs.readFileSync(path.join(dirPath, "config.json"), 'utf8'));
 
     if (await getBusToken()) {
       let body = {
@@ -30,8 +30,8 @@ async function publish(argvs) {
         "targetObjectId": configContent.targetObjectId,
         "triggerTime": configContent.triggerTime,
         "name": name,
-        "version": configContent.version,
-        "triggerSource": encodeURI(classContent),
+        "version": configContent.version || "2",
+        "triggerSource": encodeURIComponent(classContent),
         "folderId": "wgd"
       }
       let res = await postNormal(global.setupSvc + "/api/triggerSetup/saveTrigger", body)