@alicloud/console-base-conf-parse-env 1.4.6 → 1.4.7-beta.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.
@@ -6,7 +6,11 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.default = getChannel;
8
8
  var _consoleOneConfig = _interopRequireDefault(require("@alicloud/console-one-config"));
9
- function getFallbackChannel(site) {
9
+ function getFallbackChannel(site, mainDomain) {
10
+ // 兜底逻辑,非 OneConsole 应用可能没获取到全局变量
11
+ if (mainDomain === 'idptcloud01.com') {
12
+ return 'EA134';
13
+ }
10
14
  switch (site) {
11
15
  case 'INTL':
12
16
  return 'SIN';
@@ -18,7 +22,7 @@ function getFallbackChannel(site) {
18
22
  return site;
19
23
  }
20
24
  }
21
- function getChannel(site) {
25
+ function getChannel(site, mainDomain) {
22
26
  var _ref = window,
23
27
  ALIYUN_ECS_CONSOLE_CONFIG = _ref.ALIYUN_ECS_CONSOLE_CONFIG,
24
28
  $BUY_CONFIG = _ref.$BUY_CONFIG;
@@ -33,5 +37,5 @@ function getChannel(site) {
33
37
  // CommonBuy 环境
34
38
  channel = $BUY_CONFIG.channelId;
35
39
  }
36
- return channel || getFallbackChannel(site);
40
+ return channel || getFallbackChannel(site, mainDomain);
37
41
  }
@@ -20,7 +20,6 @@ function parseEnv() {
20
20
  hostname = _ref.location.hostname;
21
21
  var ENV = (0, _getEnv.default)();
22
22
  var SITE = (0, _getSite.default)();
23
- var MAIN_RESOURCE_CDN = _consoleOneConfig.default.MAIN_RESOURCE_CDN;
24
23
  var ENV_IS_DEV = ENV === _enum.EEnv.DEV;
25
24
  var ENV_IS_DAILY = ENV === _enum.EEnv.DAILY;
26
25
  var ENV_IS_PRE = ENV === _enum.EEnv.PRE;
@@ -63,6 +62,15 @@ function parseEnv() {
63
62
 
64
63
  // 输出主域名,方便非 console 的业务方使用
65
64
  var MAIN_DOMAIN = "".concat(suffixDomain, ".").concat(topDomain);
65
+
66
+ // 获取当前页面的渠道
67
+ var CHANNEL = (0, _getChannel.default)(SITE, MAIN_DOMAIN);
68
+
69
+ // 获取主域名的资源 CDN
70
+ var MAIN_RESOURCE_CDN = _consoleOneConfig.default.MAIN_RESOURCE_CDN;
71
+ if (CHANNEL === 'EA134') {
72
+ MAIN_RESOURCE_CDN = 'idptcloud01cdn.com';
73
+ }
66
74
  return {
67
75
  ENV: ENV,
68
76
  ENV_IS_DEV: ENV_IS_DEV,
@@ -73,7 +81,7 @@ function parseEnv() {
73
81
  DOMAIN_IS_4SERVICE: DOMAIN_IS_4SERVICE,
74
82
  DOMAIN_IS_CONSOLE: DOMAIN_IS_CONSOLE,
75
83
  SITE: SITE,
76
- CHANNEL: (0, _getChannel.default)(SITE),
84
+ CHANNEL: CHANNEL,
77
85
  FECS_HOST: FECS_HOST,
78
86
  FECS_URL_BASE: FECS_URL_BASE,
79
87
  MAIN_DOMAIN: MAIN_DOMAIN,
@@ -1,5 +1,9 @@
1
1
  import ONE_CONF from '@alicloud/console-one-config';
2
- function getFallbackChannel(site) {
2
+ function getFallbackChannel(site, mainDomain) {
3
+ // 兜底逻辑,非 OneConsole 应用可能没获取到全局变量
4
+ if (mainDomain === 'idptcloud01.com') {
5
+ return 'EA134';
6
+ }
3
7
  switch (site) {
4
8
  case 'INTL':
5
9
  return 'SIN';
@@ -11,7 +15,7 @@ function getFallbackChannel(site) {
11
15
  return site;
12
16
  }
13
17
  }
14
- export default function getChannel(site) {
18
+ export default function getChannel(site, mainDomain) {
15
19
  var _ref = window,
16
20
  ALIYUN_ECS_CONSOLE_CONFIG = _ref.ALIYUN_ECS_CONSOLE_CONFIG,
17
21
  $BUY_CONFIG = _ref.$BUY_CONFIG;
@@ -26,5 +30,5 @@ export default function getChannel(site) {
26
30
  // CommonBuy 环境
27
31
  channel = $BUY_CONFIG.channelId;
28
32
  }
29
- return channel || getFallbackChannel(site);
33
+ return channel || getFallbackChannel(site, mainDomain);
30
34
  }
@@ -14,7 +14,6 @@ export default function parseEnv() {
14
14
  hostname = _ref.location.hostname;
15
15
  var ENV = getEnv();
16
16
  var SITE = getSite();
17
- var MAIN_RESOURCE_CDN = ONE_CONF.MAIN_RESOURCE_CDN;
18
17
  var ENV_IS_DEV = ENV === EEnv.DEV;
19
18
  var ENV_IS_DAILY = ENV === EEnv.DAILY;
20
19
  var ENV_IS_PRE = ENV === EEnv.PRE;
@@ -57,6 +56,15 @@ export default function parseEnv() {
57
56
 
58
57
  // 输出主域名,方便非 console 的业务方使用
59
58
  var MAIN_DOMAIN = "".concat(suffixDomain, ".").concat(topDomain);
59
+
60
+ // 获取当前页面的渠道
61
+ var CHANNEL = getChannel(SITE, MAIN_DOMAIN);
62
+
63
+ // 获取主域名的资源 CDN
64
+ var MAIN_RESOURCE_CDN = ONE_CONF.MAIN_RESOURCE_CDN;
65
+ if (CHANNEL === 'EA134') {
66
+ MAIN_RESOURCE_CDN = 'idptcloud01cdn.com';
67
+ }
60
68
  return {
61
69
  ENV: ENV,
62
70
  ENV_IS_DEV: ENV_IS_DEV,
@@ -67,7 +75,7 @@ export default function parseEnv() {
67
75
  DOMAIN_IS_4SERVICE: DOMAIN_IS_4SERVICE,
68
76
  DOMAIN_IS_CONSOLE: DOMAIN_IS_CONSOLE,
69
77
  SITE: SITE,
70
- CHANNEL: getChannel(SITE),
78
+ CHANNEL: CHANNEL,
71
79
  FECS_HOST: FECS_HOST,
72
80
  FECS_URL_BASE: FECS_URL_BASE,
73
81
  MAIN_DOMAIN: MAIN_DOMAIN,
@@ -1,2 +1,2 @@
1
1
  import { IConfEnv } from '../types';
2
- export default function getChannel(site: IConfEnv['SITE']): string;
2
+ export default function getChannel(site: IConfEnv['SITE'], mainDomain: string): string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alicloud/console-base-conf-parse-env",
3
- "version": "1.4.6",
3
+ "version": "1.4.7-beta.0",
4
4
  "description": "ConsoleBase CONF.ENV parse",
5
5
  "license": "MIT",
6
6
  "sideEffects": false,