cloudcc-cli 1.3.3 → 1.3.4

package/utils/checkVersion.js

@@ -1,90 +1,90 @@
-// 导入cli配置文件
-const config = require("../package.json")
-const inquirer = require("inquirer")
-const exec = require('child_process').execSync;
-const chalk = require("chalk")
-/**
-* 检查版本号
-*/
-function checkNpmVersion() {
-    let currentVersion = Number(config.version.replace(/\./g, ""));
-    let onlineVersionNum
-    let onlineVersion = '0.0.1'
-
-    // 从npm官网获取版本号
-    // onlineVersion = exec(`npm view cloudcc-cli version --registry http://registry.npmjs.org`)
-    // onlineVersion = onlineVersion.toString("utf8").trim();
-
-    // 从阿里源获取版本号
-    try {
-        onlineVersion = exec(`curl -s http://www.npmmirror.com/package/cloudcc-cli`)
-        onlineVersion = onlineVersion.toString("utf8").trim().split('img title="')[1].split('" src')[0];
-    } catch (e) {
-    }
-    onlineVersionNum = Number(onlineVersion.replace(/\./g, ""));
-    // 如果结果大于0，那么提示升级
-    if (onlineVersionNum - currentVersion > 0) {
-        console.log();
-        console.log(chalk.green("Cloudcc-cli发现新版本！"));
-        console.log();
-        console.log(chalk.green("当前版本：v" + config.version));
-        console.log(chalk.green("最新版本：v" + onlineVersion));
-        console.log();
-        console.log(chalk.yellow(`如无法自动更新，请使用命令更新：npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`));
-        return onlineVersion;
-    }
-    return null;
-}
-
-/**
-* 是否升级
-* @returns 对象
-*/
-function askUpdate() {
-    console.log();
-    const prompt = [{
-        type: 'list',
-        message: '是否进行自动升级？',
-        name: 'update',
-        choices: [
-            "Yes", 'No'
-        ],
-    }];
-    return inquirer.prompt(prompt)
-}
-
-/**
- * 升级cli
- */
-function update(onlineVersion) {
-    console.log()
-    console.log(chalk.green("升级中，请稍后..."));
-    exec(`npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`)
-    console.log()
-    console.log(chalk.green("升级完成！请重新运行"));
-}
-
-/**
- * 检查更新
- */
-async function checkUpdate() {
-    let onlineVersion;
-    try {
-        onlineVersion = checkNpmVersion();
-    } catch (error) {
-        onlineVersion = false;
-    }
-    if (onlineVersion) {
-        let res = await askUpdate()
-        if ("Yes" == res.update) {
-            update(onlineVersion)
-            return true;
-        } else {
-            return false
-        }
-    }
-    return false
-}
-
-
-module.exports = { checkUpdate }
+// 导入cli配置文件
+const config = require("../package.json")
+const inquirer = require("inquirer")
+const exec = require('child_process').execSync;
+const chalk = require("chalk")
+/**
+* 检查版本号
+*/
+function checkNpmVersion() {
+    let currentVersion = Number(config.version.replace(/\./g, ""));
+    let onlineVersionNum
+    let onlineVersion = '0.0.1'
+
+    // 从npm官网获取版本号
+    // onlineVersion = exec(`npm view cloudcc-cli version --registry http://registry.npmjs.org`)
+    // onlineVersion = onlineVersion.toString("utf8").trim();
+
+    // 从阿里源获取版本号
+    try {
+        onlineVersion = exec(`curl -s http://www.npmmirror.com/package/cloudcc-cli`)
+        onlineVersion = onlineVersion.toString("utf8").trim().split('img title="')[1].split('" src')[0];
+    } catch (e) {
+    }
+    onlineVersionNum = Number(onlineVersion.replace(/\./g, ""));
+    // 如果结果大于0，那么提示升级
+    if (onlineVersionNum - currentVersion > 0) {
+        console.log();
+        console.log(chalk.green("Cloudcc-cli发现新版本！"));
+        console.log();
+        console.log(chalk.green("当前版本：v" + config.version));
+        console.log(chalk.green("最新版本：v" + onlineVersion));
+        console.log();
+        console.log(chalk.yellow(`如无法自动更新，请使用命令更新：npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`));
+        return onlineVersion;
+    }
+    return null;
+}
+
+/**
+* 是否升级
+* @returns 对象
+*/
+function askUpdate() {
+    console.log();
+    const prompt = [{
+        type: 'list',
+        message: '是否进行自动升级？',
+        name: 'update',
+        choices: [
+            "Yes", 'No'
+        ],
+    }];
+    return inquirer.prompt(prompt)
+}
+
+/**
+ * 升级cli
+ */
+function update(onlineVersion) {
+    console.log()
+    console.log(chalk.green("升级中，请稍后..."));
+    exec(`npm install -g cloudcc-cli@${onlineVersion} --registry http://registry.npmmirror.com`)
+    console.log()
+    console.log(chalk.green("升级完成！请重新运行"));
+}
+
+/**
+ * 检查更新
+ */
+async function checkUpdate() {
+    let onlineVersion;
+    try {
+        onlineVersion = checkNpmVersion();
+    } catch (error) {
+        onlineVersion = false;
+    }
+    if (onlineVersion) {
+        let res = await askUpdate()
+        if ("Yes" == res.update) {
+            update(onlineVersion)
+            return true;
+        } else {
+            return false
+        }
+    }
+    return false
+}
+
+
+module.exports = { checkUpdate }

package/utils/deploy.js

@@ -1,9 +1,9 @@
-/**
- * 版本发布
- */
-const axios = require("axios")
-module.exports = {
-    deploy: (url) => {
-        axios.post(url);
-    },
+/**
+ * 版本发布
+ */
+const axios = require("axios")
+module.exports = {
+    deploy: (url) => {
+        axios.post(url);
+    },
 }

package/utils/encryption.js

@@ -1,20 +1,20 @@
-const CryptoJS = require("crypto-js");
-
-const keyCode = "646576636f6e736f6c652d7376633132"
-module.exports = {
-    en(word, keyStr = keyCode) {
-        let enc = CryptoJS.AES.encrypt(word, CryptoJS.enc.Hex.parse(keyStr), {
-            mode: CryptoJS.mode.ECB,
-            padding: CryptoJS.pad.Pkcs7
-        })
-        return enc.ciphertext.toString()
-    },
-
-    de(word, keyStr = keyCode) {
-        let dec = CryptoJS.AES.decrypt(CryptoJS.format.Hex.parse(word), CryptoJS.enc.Hex.parse(keyStr), {
-            mode: CryptoJS.mode.ECB,
-            padding: CryptoJS.pad.Pkcs7
-        })
-        return CryptoJS.enc.Utf8.stringify(dec)
-    }
-};
+const CryptoJS = require("crypto-js");
+
+const keyCode = "646576636f6e736f6c652d7376633132"
+module.exports = {
+    en(word, keyStr = keyCode) {
+        let enc = CryptoJS.AES.encrypt(word, CryptoJS.enc.Hex.parse(keyStr), {
+            mode: CryptoJS.mode.ECB,
+            padding: CryptoJS.pad.Pkcs7
+        })
+        return enc.ciphertext.toString()
+    },
+
+    de(word, keyStr = keyCode) {
+        let dec = CryptoJS.AES.decrypt(CryptoJS.format.Hex.parse(word), CryptoJS.enc.Hex.parse(keyStr), {
+            mode: CryptoJS.mode.ECB,
+            padding: CryptoJS.pad.Pkcs7
+        })
+        return CryptoJS.enc.Utf8.stringify(dec)
+    }
+};

package/utils/http.js

@@ -1,95 +1,95 @@
-const axios = require("axios")
-const encry = require("./encryption")
-const service = axios.create({
-  timeout: 60000, // request timeout
-  headers: {
-    'Content-Type': 'application/json; charset=utf-8',
-  },
-})
-
-// request interceptor  
-service.interceptors.request.use(
-  config => {
-    // config.data = encry.en(JSON.stringify(config.data))
-    return config
-  },
-  error => {
-    // Do something with request error
-    Promise.reject(error)
-  }
-)
-
-// response interceptor
-service.interceptors.response.use(
-  response => {
-    const code = response.data.code || 200
-    if (code !== 200) {
-      return Promise.reject(null == response.data.msg ? "未知异常" : response.data.msg)
-    } else {
-      // response.data= JSON.parse(encry.de(response.data));
-      return response.data;
-    }
-  },
-  error => {
-    return Promise.reject(error)
-  }
-)
-const formateData = (data, header) => {
-  if (header) {
-    Object.assign(header, { source: "cloudcc_cli" })
-  }
-  return {
-    head: {
-      ...header
-    },
-    body: {
-      ...data
-    }
-  }
-}
-module.exports = {
-  get: (url, data = {}, responseType = '') => {
-    return service({
-      url: url,
-      method: 'get',
-      params: formateData(data),
-      responseType: responseType
-    })
-  },
-  post: (url, data = {}, header = { appVersion: "1.0.0" }, responseType = '') => {
-    return service({
-      url: url,
-      method: 'post',
-      data: formateData(data, header),
-      responseType: responseType
-    })
-  },
-  postParams: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'post',
-      params: data
-    })
-  },
-  patch: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'patch',
-      data: formateData(data)
-    })
-  },
-  delete: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'delete',
-      data: formateData(data)
-    })
-  },
-  put: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'put',
-      data: formateData(data)
-    })
-  }
-}
+const axios = require("axios")
+const encry = require("./encryption")
+const service = axios.create({
+  timeout: 60000, // request timeout
+  headers: {
+    'Content-Type': 'application/json; charset=utf-8',
+  },
+})
+
+// request interceptor  
+service.interceptors.request.use(
+  config => {
+    // config.data = encry.en(JSON.stringify(config.data))
+    return config
+  },
+  error => {
+    // Do something with request error
+    Promise.reject(error)
+  }
+)
+
+// response interceptor
+service.interceptors.response.use(
+  response => {
+    const code = response.data.code || 200
+    if (code !== 200) {
+      return Promise.reject(null == response.data.msg ? "未知异常" : response.data.msg)
+    } else {
+      // response.data= JSON.parse(encry.de(response.data));
+      return response.data;
+    }
+  },
+  error => {
+    return Promise.reject(error)
+  }
+)
+const formateData = (data, header) => {
+  if (header) {
+    Object.assign(header, { source: "cloudcc_cli" })
+  }
+  return {
+    head: {
+      ...header
+    },
+    body: {
+      ...data
+    }
+  }
+}
+module.exports = {
+  get: (url, data = {}, responseType = '') => {
+    return service({
+      url: url,
+      method: 'get',
+      params: formateData(data),
+      responseType: responseType
+    })
+  },
+  post: (url, data = {}, header = { appVersion: "1.0.0" }, responseType = '') => {
+    return service({
+      url: url,
+      method: 'post',
+      data: formateData(data, header),
+      responseType: responseType
+    })
+  },
+  postParams: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'post',
+      params: data
+    })
+  },
+  patch: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'patch',
+      data: formateData(data)
+    })
+  },
+  delete: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'delete',
+      data: formateData(data)
+    })
+  },
+  put: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'put',
+      data: formateData(data)
+    })
+  }
+}

package/utils/md2html.js

@@ -1,89 +1,89 @@
-/**
- * 将md编译为html，并复制到dist/plu
- */
-const fs = require('fs'); //文件模块
-const path = require('path'); //路径模块
-const marked = require('marked'); //md转html模块
-
-/**
-* 检测文件改动
-*/
-function watchFile(target) {
-    fs.watchFile(target, {
-        persistent: true, //是否持续监听
-        interval: 200, //刷新间隔
-    }, (curr, prev) => {
-        if (curr.mtime == prev.mtime) { //比较修改时间，判断保存后内容是否真的发生了变化
-            return false;
-        }
-        change()
-    });
-}
-/**
- * 转换
- * @param {target} 编译文件名称 
- * @param {outPath} 保存路径 
- */
-function change(target = "README", outPath = "dist") {
-    //读取文件
-    const data = fs.readFileSync(target + ".md", 'utf-8')
-    const html = marked(data); //将md内容转为html内容
-    let template = createTemplate();
-    template = template.replace('{{{content}}}', html); //替换html内容占位标记
-
-    let css = fs.readFileSync(path.join(__dirname) + '/github-markdown.min.css', 'utf8')
-    template = template.replace('{{{style}}}', css); //替换css内容占位标记
-    createFile(template, target, outPath);
-
-}
-/**
- * 创建页面模板
- * @returns {string} 页面骨架字符串
- */
-
-function createTemplate() {
-    const template = `<!DOCTYPE html>
-        <html>
-            <head>
-            <meta charset="utf-8" >
-            <meta name="viewport" content="width=device-width, initial-scale=1">
-            <title>开发日志</title>
-            <style>
-                .markdown-body {
-                    box-sizing: border-box;
-                    min-width: 200px;
-                    max-width: 980px;
-                    margin: 0 auto;
-                    padding: 45px;
-                }
-                @media (max-width: 767px) {
-                    .markdown-body {
-                        padding: 15px;
-                    }
-                }
-                {{{style}}}
-            </style>
-            </head>
-            <body>
-                <article class="markdown-body">
-                    {{{content}}}
-                </article>  
-            </body>
-        </html>`;
-    return template;
-}
-
-/**
- * 创建html文件
- * @param {string} content 写入html的文件内容
- */
-function createFile(content, fileName, outPath = "public") {
-    const suffix = 'html'; //文件格式
-    const fullName = fileName + '.' + suffix;  //文件全名
-    const file = path.join(outPath, fullName); //文件地址
-    fs.writeFileSync(file, content, 'utf-8')
-}
-
-module.exports = {
-    createFile, createTemplate, change, watchFile
+/**
+ * 将md编译为html，并复制到dist/plu
+ */
+const fs = require('fs'); //文件模块
+const path = require('path'); //路径模块
+const marked = require('marked'); //md转html模块
+
+/**
+* 检测文件改动
+*/
+function watchFile(target) {
+    fs.watchFile(target, {
+        persistent: true, //是否持续监听
+        interval: 200, //刷新间隔
+    }, (curr, prev) => {
+        if (curr.mtime == prev.mtime) { //比较修改时间，判断保存后内容是否真的发生了变化
+            return false;
+        }
+        change()
+    });
+}
+/**
+ * 转换
+ * @param {target} 编译文件名称 
+ * @param {outPath} 保存路径 
+ */
+function change(target = "README", outPath = "dist", outFile = "README") {
+    //读取文件
+    const data = fs.readFileSync(target + ".md", 'utf-8')
+    const html = marked(data); //将md内容转为html内容
+    let template = createTemplate();
+    template = template.replace('{{{content}}}', html); //替换html内容占位标记
+
+    let css = fs.readFileSync(path.join(__dirname) + '/github-markdown.min.css', 'utf8')
+    template = template.replace('{{{style}}}', css); //替换css内容占位标记
+    createFile(template, outPath, outFile);
+
+}
+/**
+ * 创建页面模板
+ * @returns {string} 页面骨架字符串
+ */
+
+function createTemplate() {
+    const template = `<!DOCTYPE html>
+        <html>
+            <head>
+            <meta charset="utf-8" >
+            <meta name="viewport" content="width=device-width, initial-scale=1">
+            <title>开发日志</title>
+            <style>
+                .markdown-body {
+                    box-sizing: border-box;
+                    min-width: 200px;
+                    max-width: 980px;
+                    margin: 0 auto;
+                    padding: 45px;
+                }
+                @media (max-width: 767px) {
+                    .markdown-body {
+                        padding: 15px;
+                    }
+                }
+                {{{style}}}
+            </style>
+            </head>
+            <body>
+                <article class="markdown-body">
+                    {{{content}}}
+                </article>  
+            </body>
+        </html>`;
+    return template;
+}
+
+/**
+ * 创建html文件
+ * @param {string} content 写入html的文件内容
+ */
+function createFile(content, outPath = "dist", outFile) {
+    const suffix = 'html'; //文件格式
+    const fullName = outFile + '.' + suffix;  //文件全名
+    const file = path.join(outPath, fullName); //文件地址
+    fs.writeFileSync(file, content, 'utf-8')
+}
+
+module.exports = {
+    createFile, createTemplate, change, watchFile
 }