cloudcc-cli 1.6.0 → 1.6.2

package/utils/utils.js

@@ -1,44 +1,54 @@
-const { getParams, postNormal } = require("./http")
-const fs = require("fs");
-const path = require("path")
-
-/**
- * 获得配置信息
- * @returns 配置信息
- */
-function getPackageJson() {
-    const packageJson = JSON.parse(fs.readFileSync(path.join(process.cwd(), "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() {
-    let devConfig = getPackageJson();
-    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 true;
-    }
-    return false
-}
-
-
-module.exports = { getBusToken }
+const { getParams, postNormal } = require("./http")
+const fs = require("fs");
+const path = require("path")
+
+/**
+ * 获得配置信息
+ * @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);
+    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
+}
+
+module.exports = { getBusToken, getPackageJson }