@steedos/service-package-registry 2.1.66 → 2.1.67
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/package.service.js +6 -6
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/service-package-registry",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.67",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "package.service.js",
|
|
6
6
|
"scripts": {
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"author": "",
|
|
10
10
|
"license": "ISC",
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@steedos/service-package-loader": "2.1.
|
|
12
|
+
"@steedos/service-package-loader": "2.1.67",
|
|
13
13
|
"fs-extra": "8.1.0",
|
|
14
14
|
"i18next": "20.3.2",
|
|
15
15
|
"json-stringify-safe": "5.0.1",
|
|
@@ -26,5 +26,5 @@
|
|
|
26
26
|
"publishConfig": {
|
|
27
27
|
"access": "public"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "55195daf99312e32a604c8cb6ff8a37cb545824b"
|
|
30
30
|
}
|
package/package.service.js
CHANGED
|
@@ -349,8 +349,8 @@ module.exports = {
|
|
|
349
349
|
getCloudSaasPurchasedPackages:{
|
|
350
350
|
async handler() {
|
|
351
351
|
const settings = this.settings;
|
|
352
|
-
const apiKey = settings.STEEDOS_CLOUD_API_KEY
|
|
353
|
-
const spaceId = settings.STEEDOS_CLOUD_SPACE_ID
|
|
352
|
+
const apiKey = settings.STEEDOS_CLOUD_API_KEY || process.env.STEEDOS_CLOUD_API_KEY
|
|
353
|
+
const spaceId = settings.STEEDOS_CLOUD_SPACE_ID || process.env.STEEDOS_CLOUD_SPACE_ID
|
|
354
354
|
const url = settings.STEEDOS_CLOUD_URL
|
|
355
355
|
|
|
356
356
|
if(!apiKey || !spaceId || !url){
|
|
@@ -445,8 +445,8 @@ module.exports = {
|
|
|
445
445
|
|
|
446
446
|
const settings = this.settings;
|
|
447
447
|
if (url && url.startsWith(settings.STEEDOS_CLOUD_URL + '/api/pkg/download')) {
|
|
448
|
-
const apiKey = settings.STEEDOS_CLOUD_API_KEY
|
|
449
|
-
const spaceId = settings.STEEDOS_CLOUD_SPACE_ID
|
|
448
|
+
const apiKey = settings.STEEDOS_CLOUD_API_KEY || process.env.STEEDOS_CLOUD_API_KEY
|
|
449
|
+
const spaceId = settings.STEEDOS_CLOUD_SPACE_ID || process.env.STEEDOS_CLOUD_SPACE_ID
|
|
450
450
|
const cloudUrl = settings.STEEDOS_CLOUD_URL
|
|
451
451
|
|
|
452
452
|
if (!apiKey || !spaceId || !cloudUrl) {
|
|
@@ -525,8 +525,8 @@ module.exports = {
|
|
|
525
525
|
|
|
526
526
|
// 初始化工作区数据
|
|
527
527
|
// 获取环境变量中工作区信息
|
|
528
|
-
const spaceId = settings.STEEDOS_CLOUD_SPACE_ID;
|
|
529
|
-
const apiKey = settings.STEEDOS_CLOUD_API_KEY;
|
|
528
|
+
const spaceId = settings.STEEDOS_CLOUD_SPACE_ID || process.env.STEEDOS_CLOUD_SPACE_ID;
|
|
529
|
+
const apiKey = settings.STEEDOS_CLOUD_API_KEY || process.env.STEEDOS_CLOUD_API_KEY;
|
|
530
530
|
|
|
531
531
|
if (!spaceId || !apiKey) {
|
|
532
532
|
throw new Error('请配置环境变量STEEDOS_CLOUD_SPACE_ID和STEEDOS_CLOUD_API_KEY。');
|