cloudcc-cli 1.8.1 → 1.8.3

package/README.md

@@ -1,3 +1,18 @@
+# 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
+#### Release Content
+* Optimization
+    * Create a project and stop checking the version upgrade。
+    * Add custom object search
+
 # ReleaseV1.8.1
 #### Release Date: 2025-1-21
 #### Release Scope: Full

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcc-cli",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "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/object/get.js

@@ -4,9 +4,16 @@ const { postNormal } = require("../../utils/http")
 
 async function get(path) {
     if (await getBusToken(path)) {
-        let res = await postNormal(global.setupSvc + "/api/customObject/standardObjList")
-        console.log(JSON.stringify(res.data))
-        return res.data
+        let res = await postNormal(global.setupSvc + "/api/trigger/newobjtrigger")
+        res = res.data.targetObjList.map((item) => {
+            return {
+                id: item.id,
+                objname: item.label,
+                objprefix: item.schemetable_name
+            }
+        })
+        console.log(JSON.stringify(res))
+        return res
     }
 }
 

package/src/project/create.js

@@ -4,7 +4,6 @@ const memFs = require("mem-fs")
 const memFsEditor = require("mem-fs-editor")
 const fs = require("fs")
 const path = require("path")
-const { checkUpdate } = require("../../utils/checkVersion")
 
 class Creator {
     constructor() {
@@ -13,31 +12,28 @@ class Creator {
             name: "",
             description: ""
         }
-        
+
         this.rootPath = path.resolve(__dirname, "../../");
-        
+
         this.tplDirPath = path.join(this.rootPath, "template");
     }
-    
+
     async init(name) {
-        let res = await checkUpdate();
-        if (!res) {
-            console.log()
-            console.log(chalk.green('Welcome CloudCC-CLI'));
-            console.log()
-            if (!name) {
-                this.ask().then(answers => {
-                    this.options = Object.assign({}, this.options, answers);
-                    console.log(this.options);
-                    this.write();
-                })
-            } else {
-                this.options = { name }
+        console.log()
+        console.log(chalk.green('Welcome CloudCC-CLI'));
+        console.log()
+        if (!name) {
+            this.ask().then(answers => {
+                this.options = Object.assign({}, this.options, answers);
+                console.log(this.options);
                 this.write();
-            }
+            })
+        } else {
+            this.options = { name }
+            this.write();
         }
     }
-    
+
     ask() {
         const prompt = [];
 
@@ -59,7 +55,7 @@ class Creator {
         });
         return inquirer.prompt(prompt)
     }
-    
+
     write() {
         console.log();
         console.log(chalk.green("Starting construction, please wait"));

package/src/project/create1.js

@@ -4,7 +4,6 @@ const memFs = require("mem-fs")
 const memFsEditor = require("mem-fs-editor")
 const fs = require("fs")
 const path = require("path")
-const { checkUpdate } = require("../../utils/checkVersion")
 const tplBuilder = require("../../template/index");
 const execSync = require('child_process').execSync;
 
@@ -15,31 +14,28 @@ class Creator {
             name: "",
             description: ""
         }
-        
+
         this.rootPath = path.resolve(__dirname, "../../");
-        
+
         this.tplDirPath = path.join(this.rootPath, "template");
     }
-    
+
     async init(name) {
-        let res = await checkUpdate();
-        if (!res) {
-            console.log()
-            console.log(chalk.green('Welcome CloudCC-CLI'));
-            console.log()
-            if (!name) {
-                this.ask().then(answers => {
-                    this.options = Object.assign({}, this.options, answers);
-                    console.log(this.options);
-                    this.write();
-                })
-            } else {
-                this.options = { name }
+        console.log()
+        console.log(chalk.green('Welcome CloudCC-CLI'));
+        console.log()
+        if (!name) {
+            this.ask().then(answers => {
+                this.options = Object.assign({}, this.options, answers);
+                console.log(this.options);
                 this.write();
-            }
+            })
+        } else {
+            this.options = { name }
+            this.write();
         }
     }
-    
+
     ask() {
         const prompt = [];
 
@@ -61,7 +57,7 @@ class Creator {
         });
         return inquirer.prompt(prompt)
     }
-    
+
     write() {
         console.log();
         console.log(chalk.green("Starting construction, please wait"));

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,14 @@ 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]))
         const baseTriggersPath = path.join(process.cwd(), "triggers");
-        const objectFolderPath = path.join(baseTriggersPath, body.targetObjectId);
+        const objectFolderPath = path.join(baseTriggersPath, `${body.schemetableName.toLowerCase()}`);
         const triggersPath = path.join(objectFolderPath, body.name);
 
         try {
@@ -21,6 +22,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

@@ -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)