cloudcc-cli 1.6.0 → 1.6.2

package/template/packagejson

@@ -1,47 +1,43 @@
-{
-  "name": "cloudcc-plugin",
-  "version": "1.0.0",
-  "description": "cloudcc-plugin-dev",
-  "devConsoleConfig": {
-    "username": "xxx",
-    "secretKey": "xxxxx"
-  },
-  "scripts": {
-    "serve": "vue-cli-service serve"
-  },
-  "dependencies": {
-    "element-ui": "2.15.12",
-    "vue": "2.6.14",
-    "vue-custom-element": "3.3.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "babel-eslint": "^10.1.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-vue": "^6.2.2",
-    "sass": "1.26.8",
-    "sass-loader": "8.0.2",
-    "vue-template-compiler": "2.6.14"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "parserOptions": {
-      "parser": "babel-eslint"
-    },
-    "rules": {}
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
+{
+  "name": "cloudcc-plugin",
+  "version": "1.0.0",
+  "description": "cloudcc-plugin-dev",
+  "scripts": {
+    "serve": "vue-cli-service serve"
+  },
+  "dependencies": {
+    "element-ui": "2.15.12",
+    "vue": "2.6.14",
+    "vue-custom-element": "3.3.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "~4.5.0",
+    "@vue/cli-plugin-eslint": "~4.5.0",
+    "@vue/cli-service": "~4.5.0",
+    "babel-eslint": "^10.1.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.2.2",
+    "sass": "1.26.8",
+    "sass-loader": "8.0.2",
+    "vue-template-compiler": "2.6.14"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "plugin:vue/essential",
+      "eslint:recommended"
+    ],
+    "parserOptions": {
+      "parser": "babel-eslint"
+    },
+    "rules": {}
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead"
+  ]
 }

package/template/vueconfigjs

@@ -1,27 +1,27 @@
-// 打包排除依赖包
-const external = process.env.NODE_ENV == 'development' ? {} : {
-            "vue": 'Vue',
-            "vue-router": 'VueRouter',
-            'vue-echarts': 'VueECharts',
-            'element-ui': 'ELEMENT',
-            "axios": 'axios',
-            "d3": 'd3',
-            'echarts': 'echarts',
-            "jschardet": 'jschardet',
-            "crypto-js": 'CryptoJS',
-            "vue-i18n": 'VueI18n',
-}
-module.exports = {
-    publicPath: '/',
-    // 关闭生成Map文件
-    productionSourceMap: false,
-    configureWebpack: {
-    },
-    // css强制内联在js中
-    css: { extract: false },
-    // 精细化修改webpack打包逻辑
-    chainWebpack: config => {
-        // 排除某些包，禁止打包到chunck中
-        config.externals(external)
-    }
+// 打包排除依赖包
+const external = process.env.NODE_ENV == 'development' ? {} : {
+            "vue": 'Vue',
+            "vue-router": 'VueRouter',
+            'vue-echarts': 'VueECharts',
+            'element-ui': 'ELEMENT',
+            "axios": 'axios',
+            "d3": 'd3',
+            'echarts': 'echarts',
+            "jschardet": 'jschardet',
+            "crypto-js": 'CryptoJS',
+            "vue-i18n": 'VueI18n',
+}
+module.exports = {
+    publicPath: '/',
+    // 关闭生成Map文件
+    productionSourceMap: false,
+    configureWebpack: {
+    },
+    // css强制内联在js中
+    css: { extract: false },
+    // 精细化修改webpack打包逻辑
+    chainWebpack: config => {
+        // 排除某些包，禁止打包到chunck中
+        config.externals(external)
+    }
 }

package/utils/checkVersion.js

@@ -1,105 +1,105 @@
-// 导入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(
-        `
-        ********************************************************************************
-        *                                                                              *
-        *                                 CloudCC CLI                                  *
-        *                                                                              * 
-        * 当前版本:V${config.version}                                                              * 
-        * 最新版本:V${onlineVersion}                                                              *
-        * 更新内容:https://npmmirror.com/package/cloudcc-cli/home                      *
-        *                                                                              *
-        * 开发者文档: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: '是否进行自动升级？',
-        name: 'update',
-        choices: [
-            "Yes", 'No'
-        ],
-    }];
-    return inquirer.prompt(prompt)
-}
-
-/**
- * 升级cli
- */
-function update(onlineVersion) {
-    console.log()
-    console.log(chalk.green("升级中，预计3分钟完成，请稍后..."));
-    console.log()
-    let os = process.platform
-    console.log(chalk.yellow(`如无法自动更新，请使用命令更新：${'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("升级完成！请重新运行"));
-}
-
-/**
- * 检查更新
- */
-async function checkUpdate() {
-    let onlineVersion;
-    try {
-        onlineVersion = checkNpmVersion();
-    } catch (error) {
-        console.log("error", 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")
+
+/**
+* 检查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(
+        `
+        ********************************************************************************
+        *                                                                              *
+        *                                 CloudCC CLI                                  *
+        *                                                                              * 
+        * 当前版本:V${config.version}                                                              * 
+        * 最新版本:V${onlineVersion}                                                              *
+        * 更新内容:https://npmmirror.com/package/cloudcc-cli/home                      *
+        *                                                                              *
+        * 开发者文档: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: '是否进行自动升级？',
+        name: 'update',
+        choices: [
+            "Yes", 'No'
+        ],
+    }];
+    return inquirer.prompt(prompt)
+}
+
+/**
+ * 升级cli
+ */
+function update(onlineVersion) {
+    console.log()
+    console.log(chalk.green("升级中，预计3分钟完成，请稍后..."));
+    console.log()
+    let os = process.platform
+    console.log(chalk.yellow(`如无法自动更新，请使用命令更新：${'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("升级完成！请重新运行"));
+}
+
+/**
+ * 检查更新
+ */
+async function checkUpdate() {
+    let onlineVersion;
+    try {
+        onlineVersion = checkNpmVersion();
+    } catch (error) {
+        console.log("error", 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/http.js

@@ -1,122 +1,122 @@
-const https = require("https")
-const http = require("http")
-const axios = require("axios")
-
-const httpsAgent = new https.Agent({
-  rejectUnauthorized: false,
-})
-const httpAgent = new http.Agent({
-  rejectUnauthorized: false,
-})
-axios.defaults.httpsAgent = httpsAgent
-axios.defaults.httpAgent = httpAgent
-
-const service = axios.create({
-  timeout: 60000, // request timeout
-  headers: {
-    'Content-Type': 'application/json; charset=utf-8',
-  },
-})
-
-// request interceptor  
-service.interceptors.request.use(
-  config => {
-    if (global.accessToken) {
-      config.headers.accessToken = global.accessToken
-    }
-    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 {
-      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
-    })
-  },
-  getParams: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'get',
-      params: data,
-    })
-  },
-  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,
-    })
-  },
-  postNormal: (url, data = {}) => {
-    return service({
-      url: url,
-      method: 'post',
-      data: 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 https = require("https")
+const http = require("http")
+const axios = require("axios")
+
+const httpsAgent = new https.Agent({
+  rejectUnauthorized: false,
+})
+const httpAgent = new http.Agent({
+  rejectUnauthorized: false,
+})
+axios.defaults.httpsAgent = httpsAgent
+axios.defaults.httpAgent = httpAgent
+
+const service = axios.create({
+  timeout: 60000, // request timeout
+  headers: {
+    'Content-Type': 'application/json; charset=utf-8',
+  },
+})
+
+// request interceptor  
+service.interceptors.request.use(
+  config => {
+    if (global.accessToken) {
+      config.headers.accessToken = global.accessToken
+    }
+    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 {
+      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
+    })
+  },
+  getParams: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'get',
+      params: data,
+    })
+  },
+  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,
+    })
+  },
+  postNormal: (url, data = {}) => {
+    return service({
+      url: url,
+      method: 'post',
+      data: 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)
+    })
+  }
+
+}