@tapd/tplugin-core 1.32.1-alpha.0 → 1.33.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/src/tapd.js +13 -5
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tapd/tplugin-core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.33.0",
|
|
4
4
|
"main": "src/index.js",
|
|
5
5
|
"description": "tplugin-core",
|
|
6
6
|
"scripts": {
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"author": "",
|
|
20
20
|
"license": "",
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@tapd/tapd-node-sdk": "^1.
|
|
22
|
+
"@tapd/tapd-node-sdk": "^1.53.0",
|
|
23
23
|
"js-yaml": "^4.1.0"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"src",
|
|
34
34
|
"!src/config.js"
|
|
35
35
|
],
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "8592f1b8ac1b0abe0aaa41945c2926f751a203c2"
|
|
37
37
|
}
|
package/src/tapd.js
CHANGED
|
@@ -34,13 +34,21 @@ function configYaml() {
|
|
|
34
34
|
function configEnv(key) {
|
|
35
35
|
const config = configYaml();
|
|
36
36
|
let curConfig = config;
|
|
37
|
-
key.split('.').forEach((ele) => {
|
|
37
|
+
// key.split('.').forEach((ele) => {
|
|
38
|
+
// if (curConfig[ele]) {
|
|
39
|
+
// curConfig = curConfig[ele];
|
|
40
|
+
// } else {
|
|
41
|
+
// return;
|
|
42
|
+
// }
|
|
43
|
+
// });
|
|
44
|
+
// forEach中的return，不会退出函数，导致属性不存在时，直接返回了整个env对象
|
|
45
|
+
for (const ele of key.split('.')) {
|
|
38
46
|
if (curConfig[ele]) {
|
|
39
|
-
|
|
47
|
+
curConfig = curConfig[ele];
|
|
40
48
|
} else {
|
|
41
|
-
|
|
49
|
+
return; // 直接返回，退出整个函数
|
|
42
50
|
}
|
|
43
|
-
}
|
|
51
|
+
}
|
|
44
52
|
const rioToken = process.env.RIO_TOKEN || '';
|
|
45
53
|
return curConfig;
|
|
46
54
|
}
|
|
@@ -48,7 +56,7 @@ function configEnv(key) {
|
|
|
48
56
|
// 从 环境变量和配置文件中夹在 配置信息
|
|
49
57
|
const clientID = process.env.TAPD_CLIENT_ID || configEnv('env.client_id');
|
|
50
58
|
const clientSecret = process.env.TAPD_CLIENT_SECRET || configEnv('env.client_secret');
|
|
51
|
-
const address = process.env.TAPD_API_PATH || sysConfig.tapd.apiPath;
|
|
59
|
+
const address = process.env.TAPD_API_PATH ||configEnv('env.api_path')|| sysConfig.tapd.apiPath;
|
|
52
60
|
const rioToken = process.env.RIO_TOKEN || '';
|
|
53
61
|
|
|
54
62
|
|