cloudcc-cli 1.6.4 → 1.6.6

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, 
+  headers: {
+    'Content-Type': 'application/json; charset=utf-8',
+  },
+})
+
+
+service.interceptors.request.use(
+  config => {
+    if (global.accessToken) {
+      config.headers.accessToken = global.accessToken
+    }
+    return config
+  },
+  error => {
+    
+    Promise.reject(error)
+  }
+)
+
+
+service.interceptors.response.use(
+  response => {
+    const code = response.data.code || 200
+    if (code !== 200) {
+      return Promise.reject(null == response.data.msg ? "Unknown exception" : 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)
+    })
+  }
+
+}

package/utils/utils.js

@@ -1,60 +1,58 @@
-const { getParams, postNormal } = require("./http")
-const fs = require("fs");
-const path = require("path")
-const chalk = require("chalk")
-
-/**
- * 获得配置信息
- * @returns 配置信息
- */
-function getPackageJson_old(projectPath = process.cwd()) {
-    const packageJson = JSON.parse(fs.readFileSync(path.join(projectPath, "package.json")), 'utf8');
-    return packageJson.devConsoleConfig;
-}
-/**
- * 获取业务访问baseurl
- */
-async function getBaseUrl(orgId) {
-    let u = "https://developer.apis.cloudcc.cn/oauth/apidomain?scope=cloudccCRM&orgId=" + orgId
-    let res = await getParams(u)
-    global.baseUrl = res.orgapi_address
-}
-/**
- * 获取业务token
- */
-async function getBusToken(path) {
-    let devConfig = getPackageJson(path);
-    if(!devConfig.username||!devConfig.safetyMark||!devConfig.clientId||!devConfig.openSecretKey||!devConfig.orgId){
-        console.log(chalk.red('安全标记配置有误，请查看文档进行配置：https://cloudccone.feishu.cn/wiki/IE0RwAOUFitPEMko1IxcaYMwnGx'));
-        console.log();
-        return false;
-    }
-    let body = {
-        username: devConfig.username,
-        safetyMark: devConfig.safetyMark,
-        clientId: devConfig.clientId,
-        secretKey: devConfig.openSecretKey,
-        orgId: devConfig.orgId
-    }
-    await getBaseUrl(devConfig.orgId)
-    let res = await postNormal(global.baseUrl + "/api/cauth/token", body)
-    if (res.result) {
-        global.accessToken = res.data.accessToken
-        return res.data.accessToken;
-    }
-    return false
-}
-
-/**
- * 获取配置参数
- */
-function getPackageJson(projectPath = process.cwd()) {
-    let config = getPackageJson_old(projectPath);
-    if (!config) {
-        config = require(path.join(projectPath, "cloudcc-cli.config.js"))
-        config = config[config.use]
-    }
-    return config
-}
-
+const { getParams, postNormal } = require("./http")
+const fs = require("fs");
+const path = require("path")
+const chalk = require("chalk")
+
+
+function getPackageJson_old(projectPath = process.cwd()) {
+    const packageJson = JSON.parse(fs.readFileSync(path.join(projectPath, "package.json")), 'utf8');
+    return packageJson.devConsoleConfig;
+}
+
+async function getBaseUrl(devConfig) {
+    if ('private' == devConfig.version) {
+        global.apiSvc = devConfig.baseUrl + (devConfig.apiSvcPrefix || "/apitfs")
+        global.setupSvc = devConfig.baseUrl + (devConfig.setupSvcPrefix || "/ccsetup")
+    } else {
+        let u = "https://developer.apis.cloudcc.cn/oauth/apidomain?scope=cloudccCRM&orgId=" + devConfig.orgId
+        let res = await getParams(u)
+        global.apiSvc = res.orgapi_address
+        global.setupSvc = new URL(res.orgapi_address).origin + (devConfig.setupSvcPrefix || "/ccsetup")
+    }
+}
+
+
+async function getBusToken(path) {
+    let devConfig = getPackageJson(path);
+    if (!devConfig.username || !devConfig.safetyMark || !devConfig.clientId || !devConfig.openSecretKey || !devConfig.orgId) {
+        console.log(chalk.red('The security tag configuration is incorrect. Please check the documentation for configuration.'));
+        console.log();
+        return false;
+    }
+    let body = {
+        username: devConfig.username,
+        safetyMark: devConfig.safetyMark,
+        clientId: devConfig.clientId,
+        secretKey: devConfig.openSecretKey,
+        orgId: devConfig.orgId
+    }
+    await getBaseUrl(devConfig)
+    let res = await postNormal(global.apiSvc + "/api/cauth/token", body)
+    if (res.result) {
+        global.accessToken = res.data.accessToken
+        return res.data.accessToken;
+    }
+    return false
+}
+
+
+function getPackageJson(projectPath = process.cwd()) {
+    let config = getPackageJson_old(projectPath);
+    if (!config) {
+        config = require(path.join(projectPath, "cloudcc-cli.config.js"))
+        config = config[config.use]
+    }
+    return config
+}
+
 module.exports = { getBusToken, getPackageJson }