cloudcc-cli 1.6.5 → 1.6.6

package/src/recordType/get.js

@@ -1,13 +1,10 @@
 const { getBusToken } = require("../../utils/utils")
 const { postNormal } = require("../../utils/http")
-/**
- * 获取对象的记录类型
- */
+
 async function get(path, prefix) {
-    // 获取token成功后，发布内容
+    
     if (await getBusToken(path)) {
-        let url = new URL(global.baseUrl).origin
-        let res = await postNormal(url + "/apisvc/api/batch/getRecordType", { prefix: prefix })
+        let res = await postNormal(global.apiSvc + "/api/batch/getRecordType", { prefix: prefix })
         console.log(JSON.stringify(res.data.recordTypeList))
         return res.data
     }

package/src/script/create.js

@@ -2,10 +2,7 @@ const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
-/**
- * 创建文件
- * @param {string} name 文件名称
- */
+
 async function create(argvs) {
     let res = await checkUpdate();
     if (!res) {
@@ -20,11 +17,11 @@ async function create(argvs) {
             fs.writeFileSync(path.join(filePath, body.scriptName + ".js"), fileTmp)
             fs.writeFileSync(path.join(filePath, "config.json"), JSON.stringify(body))
             console.log()
-            console.log(chalk.green("创建成功：" + body.scriptName))
+            console.log(chalk.green("Successfully Created:" + body.scriptName))
             console.log()
         } catch (e) {
             console.log()
-            console.log(chalk.red("创建失败：" + e))
+            console.log(chalk.red("Creation Failed:" + e))
             console.log()
         }
     }

package/src/script/publish.js

@@ -1,4 +1,4 @@
-// 检查cli版本更新功能
+
 const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
@@ -6,10 +6,7 @@ const chalk = require("chalk")
 const { post } = require("../../utils/http")
 const { getPackageJson } = require("../../utils/utils")
 const BaseUrl = "https://developer.apis.cloudcc.cn"
-/**
- * 发布脚本
- * @param {string} argvs 参数
- */
+
 async function publish(argvs) {
   let name = argvs[2]
   let res = await checkUpdate();
@@ -21,47 +18,43 @@ async function publish(argvs) {
 
     if (classContent) {
       let devConsoleConfig = getPackageJson()
-      // 如果不是私有化部署，那么需要获取token
+      
       if ("private" != devConsoleConfig.version) {
         devConsoleConfig = { "accessToken": await getToken(devConsoleConfig) };
       }
-      console.log(chalk.green('发布中，请稍后...'));
+      console.log(chalk.green('Posting, please wait...'));
       configContent.scriptContent = classContent
       let res = await post((devConsoleConfig.baseUrl || BaseUrl) + "/devconsole/script/saveClientScript", configContent, devConsoleConfig)
       if (res.result) {
         console.log();
-        console.log(chalk.green('发布成功！'));
+        console.log(chalk.green('Success！'));
         console.log();
-        // 组件发布成功后，判断下配置文件是否有id，如果没有，那么将id存储到配置中
+        
         if (!configContentOld.id) {
           configContentOld.id = res.data
           fs.writeFileSync(path.join(srcPath, "config.json"), JSON.stringify(configContentOld))
         }
       } else {
         console.log();
-        console.log(chalk.red('发布失败：' + res.returnInfo));
+        console.log(chalk.red('Fail：' + res.returnInfo));
         console.log();
       }
     } else {
       console.log();
-      console.log(chalk.red('脚本内容无效'));
+      console.log(chalk.red('Invalid Script Content'));
       console.log();
     }
   }
 }
 
 
-/**
- * 请求用户token
- * @param {用户信息} devConsoleConfig
- * @returns token
- */
+
 async function getToken(devConsoleConfig) {
   let res = await post(devConsoleConfig.baseUrl || BaseUrl + "/sysconfig/auth/pc/1.0/post/tokenInfo", devConsoleConfig);
   if (res.returnCode == 200) {
     return res.data.accessToken;
   } else {
-    console.error(chalk.red(`登录失败`, JSON.stringify(res)));
+    console.error(chalk.red(`Login failed`, JSON.stringify(res)));
     return null;
   }
 }

package/src/timer/create.js

@@ -2,10 +2,7 @@ const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
-/**
- * 创建文件
- * @param {string} name 文件名称
- */
+
 async function create(name) {
     let res = await checkUpdate();
     if (!res) {
@@ -16,11 +13,11 @@ async function create(name) {
             fs.writeFileSync(path.join(timerPath, name + ".java"), javaTmp)
             fs.writeFileSync(path.join(timerPath, "config.json"), `{"name":"${name}","version":"3"}`)
             console.log()
-            console.log(chalk.green("创建成功：" + name))
+            console.log(chalk.green("Successfully Created:" + name))
             console.log()
         } catch (e) {
             console.log()
-            console.log(chalk.red("创建失败：" + e))
+            console.log(chalk.red("Creation Failed:" + e))
             console.log()
         }
     }

package/src/timer/publish.js

@@ -1,4 +1,4 @@
-// 检查cli版本更新功能
+
 const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
@@ -6,20 +6,17 @@ const chalk = require("chalk")
 const { postNormal } = require("../../utils/http")
 
 const { getBusToken } = require("../../utils/utils")
-/**
- * 发布文件
- * @param {string} name 文件名称
- */
+
 async function publish(name) {
   let res = await checkUpdate();
   if (!res) {
     console.log();
-    console.log(chalk.green('发布中，请稍后...'));
+    console.log(chalk.green('Posting, please wait...'));
     console.log();
     const timerPath = path.join(process.cwd(), `timer/${name}/`);
     let classContent = fs.readFileSync(timerPath + `${name}.java`, 'utf8');
     let configContent = JSON.parse(fs.readFileSync(timerPath + "config.json", 'utf8'));
-    // 获取token成功后，发布内容
+    
     if (await getBusToken()) {
       let body = {
         "id": configContent.id,
@@ -28,18 +25,17 @@ async function publish(name) {
         "source": encodeURI(classContent),
         "folderId": "wgd"
       }
-      let url = new URL(global.baseUrl).origin
-      let res = await postNormal(url + "/setup/api/ccPeak/save", body)
+      let res = await postNormal(global.setupSvc + "/api/ccPeak/save", body)
       if (res.result) {
-        console.log(chalk.green('发布成功！'));
+        console.log(chalk.green('Success！'));
         console.log();
-        // 组件发布成功后，判断下配置文件是否有id，如果没有，那么将id存储到配置中
+        
         if (!configContent.id) {
           configContent.id = res.data
           fs.writeFileSync(path.join(timerPath, "config.json"), JSON.stringify(configContent))
         }
       } else {
-        console.log(chalk.red('发布失败：' + res.returnInfo));
+        console.log(chalk.red('Fail：' + res.returnInfo));
       }
     }
   }

package/src/token/get.js

@@ -1,7 +1,5 @@
 const { getBusToken } = require("../../utils/utils")
-/**
- * 获取token
- */
+
 async function get(path) {
     let token = await getBusToken(path)
     if (token) {

package/src/triggers/create.js

@@ -2,31 +2,23 @@ const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
-/**
- * 创建文件
- * @param {string} name 文件名称
- */
-async function create(name) {
+
+async function create(argvs) {
     let res = await checkUpdate();
     if (!res) {
-        const triggersPath = path.join(process.cwd(), "triggers/" + name);
+        let body = JSON.parse(decodeURI(argvs[2]))
+        const triggersPath = path.join(process.cwd(), "triggers/" + body.name);
         try {
             fs.mkdirSync(triggersPath, { recursive: true })
             const javaTmp = `System.out.print("hello CloudCC");`
-            fs.writeFileSync(path.join(triggersPath, name + ".java"), javaTmp)
-            fs.writeFileSync(path.join(triggersPath, "config.json"),
-                `{
-    "isactive":false,
-    "targetObjectId":"account",
-    "triggerTime":"beforeInsert",
-    "version":"3"
-}`)
+            fs.writeFileSync(path.join(triggersPath, body.name + ".java"), javaTmp)
+            fs.writeFileSync(path.join(triggersPath, "config.json"), JSON.stringify(body))
             console.log()
-            console.log(chalk.green("创建成功：" + name))
+            console.log(chalk.green("Successfully Created:" + body.name))
             console.log()
         } catch (e) {
             console.log()
-            console.log(chalk.red("创建失败：" + e))
+            console.log(chalk.red("Creation Failed:" + e))
             console.log()
         }
     }

package/src/triggers/index.js

@@ -2,7 +2,7 @@ const cc = {}
 cc.create = require("./create")
 cc.publish = require("./publish")
 function Classes(action, argvs) {
-  cc[action](argvs[2])
+  cc[action](argvs)
 }
 
 module.exports = Classes;

package/src/triggers/publish.js

@@ -1,24 +1,22 @@
-// 检查cli版本更新功能
+
 const { checkUpdate } = require("../../utils/checkVersion")
 const fs = require("fs");
 const path = require("path")
 const chalk = require("chalk")
 const { postNormal } = require("../../utils/http")
 const { getBusToken } = require("../../utils/utils")
-/**
- * 发布文件
- * @param {string} name 文件名称
- */
-async function publish(name) {
+
+async function publish(argvs) {
+  let name = argvs[2]
   let res = await checkUpdate();
   if (!res) {
     console.log();
-    console.log(chalk.green('发布中，请稍后...'));
+    console.log(chalk.green('Posting, please wait...'));
     console.log();
     const triggersPath = path.join(process.cwd(), `triggers/${name}/`);
     let classContent = fs.readFileSync(triggersPath + `${name}.java`, 'utf8');
     let configContent = JSON.parse(fs.readFileSync(triggersPath + "config.json", 'utf8'));
-    // 获取token成功后，发布内容
+    
     if (await getBusToken()) {
       let body = {
         "id": configContent.id,
@@ -31,19 +29,18 @@ async function publish(name) {
         "triggerSource": encodeURI(classContent),
         "folderId": "wgd"
       }
-      let url = new URL(global.baseUrl).origin
-      let res = await postNormal(url + "/setup/api/triggerSetup/saveTrigger", body)
+      let res = await postNormal(global.setupSvc + "/api/triggerSetup/saveTrigger", body)
       if (res.result) {
-        console.log(chalk.green('发布成功！'));
+        console.log(chalk.green('Success！'));
         console.log();
-        // 组件发布成功后，判断下配置文件是否有id，如果没有，那么将id存储到配置中
+        
         if (!configContent.id) {
           configContent.id = res.data.id
           configContent.apiname = res.data.apiname
           fs.writeFileSync(path.join(triggersPath, "config.json"), JSON.stringify(configContent))
         }
       } else {
-        console.log(chalk.red('发布失败：' + res.returnInfo));
+        console.log(chalk.red('Fail：' + res.returnInfo));
       }
     }
   }

package/template/index.js

@@ -40,19 +40,19 @@ module.exports = function (creator, options, callback) {
 
     creator.fs.commit(() => {
         console.log();
-        console.log(`${chalk.grey(`创建项目: ${name}`)} ${chalk.green('✔ ')}`);
+        console.log(`${chalk.grey(`Create project: ${name}`)} ${chalk.green('✔ ')}`);
 
-        console.log(`${chalk.grey(`创建目录: ${name}/public`)} ${chalk.green('✔ ')}`);
-        console.log(`${chalk.grey(`创建文件: ${name}/public/index.html`)} ${chalk.green('✔ ')}`);
+        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(`创建目录: ${name}/src`)} ${chalk.green('✔ ')}`);
-        console.log(`${chalk.grey(`创建文件: ${name}/src/App.vue`)} ${chalk.green('✔ ')}`);
-        console.log(`${chalk.grey(`创建文件: ${name}/src/main.js`)} ${chalk.green('✔ ')}`);
+        console.log(`${chalk.grey(`Create file: ${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('✔ ')}`);
 
-        console.log(`${chalk.grey(`创建文件: ${name}/babel.config.js`)} ${chalk.green('✔ ')}`);
-        console.log(`${chalk.grey(`创建文件: ${name}/package.json`)} ${chalk.green('✔ ')}`);
-        console.log(`${chalk.grey(`创建文件: ${name}/vue.config.js`)} ${chalk.green('✔ ')}`);
-        console.log(`${chalk.grey(`创建文件: ${name}/cloudcc-cli.config.js`)} ${chalk.green('✔ ')}`);
+        console.log(`${chalk.grey(`Create file: ${name}/babel.config.js`)} ${chalk.green('✔ ')}`);
+        console.log(`${chalk.grey(`Create file: ${name}/package.json`)} ${chalk.green('✔ ')}`);
+        console.log(`${chalk.grey(`Create file: ${name}/vue.config.js`)} ${chalk.green('✔ ')}`);
+        console.log(`${chalk.grey(`Create file: ${name}/cloudcc-cli.config.js`)} ${chalk.green('✔ ')}`);
         callback();
     });
 }

package/template/indexvue

@@ -14,12 +14,12 @@ export default {
   data() {
     return {
       componentInfo: {
-        // 组件唯一标识，全局唯一
+        // Component unique identifier, globally unique
         component: "cloudcc-demo-01",
         // 组件名称，在页面编辑器显示的名字
         compName: "cloudcc-demo-01",
-        // 组件描述信息
-        compDesc: "组件描述信息",
+        // Component description information
+        compDesc: "Component description information",
       },
       isLock: false,
     };

package/tool/branch/index.js

@@ -0,0 +1,25 @@
+const exec = require('child_process').execSync;
+const fs = require("fs")
+function checkBranch(inBranch, notInBranch, condition = '') {
+    exec(`git remote prune origin`)
+    let in_branch = exec(`git branch -r --merged origin/${inBranch}`).toString("utf8").trim().split("\n  ")
+    let guolv = [];
+    in_branch.map((branch) => {
+        try {
+            let containsBranch = ""
+            if (branch.indexOf("origin/HEAD") == -1) {
+                containsBranch = exec(`git branch -r --contains "${branch}"`).toString("utf8").trim().split("\n  ")
+            }
+            if (branch.indexOf(condition) != -1 && containsBranch.includes("origin/" + inBranch) && !containsBranch.includes("origin/" + notInBranch) && ('origin/' + inBranch) != branch) {
+                guolv.push(branch)
+            }
+        } catch (error) {
+            console.log(error)
+        }
+
+    })
+    fs.writeFileSync("./tool/branch/" + inBranch + "_" + notInBranch, guolv.join("\n").toString("utf8").trim(), 'utf-8')
+}
+
+checkBranch("one-master-B", "one-master-A");
+checkBranch("v17-dev-2024-06-14", "one-master-B");

package/tool/checkLange/checkLang.js

@@ -0,0 +1,68 @@
+const fs = require("fs")
+const path = require("path")
+
+const chineseRegex = /[\u4e00-\u9fa5]/;
+
+const folderPath = './';
+
+const excludeFolders = ['.git',"node_modules"];
+const excludeFiles = ['checkLang.js',];
+
+let length = 0;
+
+function checkFilesInFolder(folderPath) {
+  fs.readdir(folderPath, (err, files) => {
+    if (err) {
+      console.error('Error reading directory:', err);
+      return;
+    }
+
+    files.forEach(file => {
+      const filePath = path.join(folderPath, file);
+
+      fs.stat(filePath, (err, stats) => {
+        if (err) {
+          console.error('Error stating file:', err);
+          return;
+        }
+
+        if (stats.isFile() && (file.endsWith('.vue') || file.endsWith('.js')|| file.endsWith('.scss')|| file.endsWith('.css'))) {
+          if (!excludeFiles.includes(file)) {
+            fs.readFile(filePath, 'utf8', (err, data) => {
+              if (err) {
+                console.error('Error reading file:', err);
+                return;
+              }
+
+              if (chineseRegex.test(data)) {
+                length++;
+                console.log(`have "${filePath}"`);
+              } 
+            });
+          } else {
+            // console.log(`jump filePath"${filePath}"`);
+          }
+        } else if (stats.isDirectory()) {
+          if (!excludeFolders.includes(file)) {
+            checkFilesInFolder(filePath);
+          } else {
+            // console.log(`jump filePath"${filePath}"`);
+          }
+        }
+      });
+    });
+
+  });
+}
+
+checkFilesInFolder(folderPath);
+
+function getLength() {
+  setTimeout(() => {
+    console.log(`==============================================================`)
+    console.log(`total ${length} files have chinese`);
+    console.log(`==============================================================`)
+  }, 1000);
+}
+
+getLength();

package/tool/checkLange/clearLang.js

@@ -0,0 +1,85 @@
+const fs = require('fs');
+const path = require('path');
+
+// /* */
+const reg1 = /\/\*[\s\S]*?\*\//g;
+
+// <!-- -->
+const reg2 = /<!--[\s\S]*?-->/gm;
+
+// // 
+const reg3 =/\/\/(?!.*eslint-disable-next-line).*$/gm;
+
+const excludeFolders = ['.git', "node_modules", 'tool', 'public', path.join('src', 'utils', 'i18n')];
+
+function readDirectory(directory) {
+    fs.readdir(directory, (err, files) => {
+        if (err) {
+            console.error('can not read dir:', err);
+            return;
+        }
+
+        files.forEach(file => {
+            const filePath = path.join(directory, file);
+
+            if (excludeFolders.some(folder => filePath.startsWith(folder))) {
+                return;
+            }
+
+            fs.stat(filePath, (err, stats) => {
+                if (err) {
+                    console.error('can not read file:', err);
+                    return;
+                }
+
+                if (stats.isDirectory()) {
+                    readDirectory(filePath);
+                } else if (stats.isFile() && (file.endsWith('.vue') || file.endsWith('.js')|| file.endsWith('.scss')|| file.endsWith('.css'))) {
+                    removeChineseComments(filePath);
+                }
+            });
+        });
+    });
+}
+
+function removeChineseComments(filePath) {
+    fs.readFile(filePath, 'utf8', (err, data) => {
+        if (err) {
+            console.error('can not read file:', err);
+            return;
+        }
+        const newData = data
+        .replace(/\/\*\s*eslint-disable no-useless-escape\s*\*\//g, "https_eslint-disable_no-useless-escape")
+        .replace(/<!--\s*eslint-disable-next-line\s*-->/g, "https_eslint-disable-next-line")
+        .replace(/http:\/\//g, "http_bimo")
+        .replace(/https:\/\//g, "https_bimo")
+        .replace(reg1, '')
+        .replace(reg2, '')
+        .replace(reg3, '')
+        .replace(/http_bimo/g, "http://")
+        .replace(/https_bimo/g, "https://")
+        .replace(/https_eslint-disable_no-useless-escape/g, "/* eslint-disable no-useless-escape */")
+        .replace(/https_eslint-disable-next-line/g, "<!-- eslint-disable-next-line -->")
+
+        fs.writeFile(filePath, newData, 'utf8', (err) => {
+            if (err) {
+                console.error('can not write file:', err);
+                return;
+            }
+
+            console.log(`done: ${filePath}`);
+        });
+    });
+}
+
+function main() {
+    const directory = "./";
+    if (!directory) {
+        console.error('pls set dir');
+        return;
+    }
+
+    readDirectory(directory);
+}
+
+main();

package/utils/checkVersion.js

@@ -1,27 +1,25 @@
-// 导入cli配置文件
+
 const config = require("../package.json")
 const inquirer = require("inquirer")
 const exec = require('child_process').execSync;
 const chalk = require("chalk")
 
-/**
-* 检查cli版本号
-*/
+
 function checkNpmVersion() {
     let currentVersion = Number(config.version.replace(/\./g, ""));
     let onlineVersionNum
     let onlineVersion = '0.0.1'
 
-    // 从阿里源获取版本号
+    
     onlineVersion = exec(`npm view cloudcc-cli version --registry http://registry.npmmirror.com`)
     onlineVersion = onlineVersion.toString("utf8").trim();
 
-    // 从阿里源获取版本号
-    // try {
-    //     onlineVersion = exec(`curl -s https://npmmirror.com/api/info?pkgName=cloudcc-cli`)
-    //     onlineVersion = JSON.parse(onlineVersion.toString("utf8").trim()).data['dist-tags'].latest
-    // } catch (e) {
-    // }
+    
+    
+    
+    
+    
+    
     onlineVersionNum = Number(onlineVersion.replace(/\./g, ""));
 
     console.log(chalk.green(
@@ -30,32 +28,27 @@ function checkNpmVersion() {
         *                                                                              *
         *                                 CloudCC CLI                                  *
         *                                                                              * 
-        * 当前版本:V${config.version}                                                              * 
-        * 最新版本:V${onlineVersion}                                                              *
-        * 更新内容:https://npmmirror.com/package/cloudcc-cli/home                      *
+        * Current Version:V${config.version}                                                              * 
+        * Latest Version:V${onlineVersion}                                                              *
         *                                                                              *
-        * 开发者文档:https://cloudccone.feishu.cn/wiki/JZ7CwcRfriU8taknCKCcwKEmncd     *
         *                                                                              *
         ********************************************************************************
         `
     ))
 
-    // 如果结果大于0，那么提示升级
+    
     if (onlineVersionNum - currentVersion > 0) {
         return onlineVersion;
     }
     return null;
 }
 
-/**
-* 是否升级
-* @returns 对象
-*/
+
 function askUpdate() {
     console.log();
     const prompt = [{
         type: 'list',
-        message: '是否进行自动升级？',
+        message: 'Do you want to perform automatic upgrade?',
         name: 'update',
         choices: [
             "Yes", 'No'
@@ -64,23 +57,19 @@ function askUpdate() {
     return inquirer.prompt(prompt)
 }
 
-/**
- * 升级cli
- */
+
 function update(onlineVersion) {
     console.log()
-    console.log(chalk.green("升级中，预计3分钟完成，请稍后..."));
+    console.log(chalk.green("Upgrading, estimated to be completed in 3 minutes, please wait..."));
     console.log()
     let os = process.platform
-    console.log(chalk.yellow(`如无法自动更新，请使用命令更新：${'darwin' == os ? 'sudo' : ''} npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`));
+    console.log(chalk.yellow(`If it fails to update automatically, please use the command to update：${'darwin' == os ? 'sudo' : ''} npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`));
     exec(`${'darwin' == os ? 'sudo' : ''} npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`)
     console.log()
-    console.log(chalk.green("升级完成！请重新运行"));
+    console.log(chalk.green("Upgrade completed! Please re-run"));
 }
 
-/**
- * 检查更新
- */
+
 async function checkUpdate() {
     let onlineVersion;
     try {