cloudcc-cli 1.6.5 → 1.6.6

package/utils/http.js

@@ -12,13 +12,13 @@ axios.defaults.httpsAgent = httpsAgent
 axios.defaults.httpAgent = httpAgent
 
 const service = axios.create({
-  timeout: 60000, // request timeout
+  timeout: 60000, 
   headers: {
     'Content-Type': 'application/json; charset=utf-8',
   },
 })
 
-// request interceptor  
+
 service.interceptors.request.use(
   config => {
     if (global.accessToken) {
@@ -27,17 +27,17 @@ service.interceptors.request.use(
     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)
+      return Promise.reject(null == response.data.msg ? "Unknown exception" : response.data.msg)
     } else {
       return response.data;
     }

package/utils/utils.js

@@ -3,29 +3,29 @@ 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
+
+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")
+    }
 }
-/**
- * 获取业务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'));
+    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;
     }
@@ -36,8 +36,8 @@ async function getBusToken(path) {
         secretKey: devConfig.openSecretKey,
         orgId: devConfig.orgId
     }
-    await getBaseUrl(devConfig.orgId)
-    let res = await postNormal(global.baseUrl + "/api/cauth/token", body)
+    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;
@@ -45,9 +45,7 @@ async function getBusToken(path) {
     return false
 }
 
-/**
- * 获取配置参数
- */
+
 function getPackageJson(projectPath = process.cwd()) {
     let config = getPackageJson_old(projectPath);
     if (!config) {