@cloudbase/framework-plugin-low-code 1.7.45 → 1.7.46

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.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/lib/index.js CHANGED
@@ -452,32 +452,33 @@ class LowCodePlugin extends framework_core_1.Plugin {
452
452
  var _a, _b;
453
453
  return __awaiter(this, void 0, void 0, function* () {
454
454
  try {
455
+ const isAdminPortal = (0, lowcode_builder_1.buildAsAdminPortalByBuildType)(this._resolvedInputs.buildTypeList);
455
456
  this._time("DEPLOY");
456
457
  if (this._miniprogramePlugin) {
457
458
  yield this._miniprogramePlugin.deploy();
458
459
  }
459
460
  if (this._enablePrivatelink) {
460
461
  if (this._privatelinkGatewayMeta) {
461
- try {
462
- const res = yield this.api.cloudbaseManager.commonService('lowcode', '2021-01-08').call({
463
- Action: 'BindGatewayAppDomain',
464
- Param: {
465
- GatewayEnvId: this._privatelinkGatewayMeta.gatewayEnvId,
466
- GatewayId: this._privatelinkGatewayMeta.gatewayId,
467
- Domain: this._privatelinkGatewayMeta.domain,
468
- EnvId: this.api.envId,
469
- Target: 'domain_app',
470
- WeAppId: (0, lowcode_builder_1.buildAsAdminPortalByBuildType)(this._resolvedInputs.buildTypeList)
471
- ? 'app_enterprise'
472
- : this._resolvedInputs.appId,
473
- PubPlatform: (0, lowcode_builder_1.buildAsWebByBuildType)(this._resolvedInputs.buildTypeList) ? 'web' : 'minapp',
474
- PubEnvType: ((_a = this._resolvedInputs.deployOptions) === null || _a === void 0 ? void 0 : _a.mode) === lowcode_builder_1.DEPLOY_MODE.UPLOAD ? 'prod' : 'pre',
475
- },
476
- });
477
- this.api.logger.info('BindGatewayAppDomain:', res);
478
- }
479
- catch (e) {
480
- this.api.logger.error('BindGatewayAppDomain:', e);
462
+ if (!isAdminPortal) {
463
+ try {
464
+ const res = yield this.api.cloudbaseManager.commonService('lowcode', '2021-01-08').call({
465
+ Action: 'BindGatewayAppDomain',
466
+ Param: {
467
+ GatewayEnvId: this._privatelinkGatewayMeta.gatewayEnvId,
468
+ GatewayId: this._privatelinkGatewayMeta.gatewayId,
469
+ Domain: this._privatelinkGatewayMeta.domain,
470
+ EnvId: this.api.envId,
471
+ Target: 'domain_app',
472
+ WeAppId: isAdminPortal ? 'app_enterprise' : this._resolvedInputs.appId,
473
+ PubPlatform: (0, lowcode_builder_1.buildAsWebByBuildType)(this._resolvedInputs.buildTypeList) ? 'web' : 'minapp',
474
+ PubEnvType: ((_a = this._resolvedInputs.deployOptions) === null || _a === void 0 ? void 0 : _a.mode) === lowcode_builder_1.DEPLOY_MODE.UPLOAD ? 'prod' : 'pre',
475
+ },
476
+ });
477
+ this.api.logger.info('BindGatewayAppDomain:', res);
478
+ }
479
+ catch (e) {
480
+ this.api.logger.error('BindGatewayAppDomain:', e);
481
+ }
481
482
  }
482
483
  }
483
484
  else {
@@ -486,9 +487,7 @@ class LowCodePlugin extends framework_core_1.Plugin {
486
487
  Action: 'UpdateAppDomainInvalid',
487
488
  Param: {
488
489
  EnvId: this.api.envId,
489
- WeAppId: (0, lowcode_builder_1.buildAsAdminPortalByBuildType)(this._resolvedInputs.buildTypeList)
490
- ? 'app_enterprise'
491
- : this._resolvedInputs.appId,
490
+ WeAppId: isAdminPortal ? 'app_enterprise' : this._resolvedInputs.appId,
492
491
  PubPlatform: (0, lowcode_builder_1.buildAsWebByBuildType)(this._resolvedInputs.buildTypeList) ? 'web' : 'minapp',
493
492
  PubEnvType: ((_b = this._resolvedInputs.deployOptions) === null || _b === void 0 ? void 0 : _b.mode) === lowcode_builder_1.DEPLOY_MODE.UPLOAD ? 'prod' : 'pre',
494
493
  },
@@ -649,18 +648,21 @@ class LowCodePlugin extends framework_core_1.Plugin {
649
648
  if (!this._enablePrivatelink) {
650
649
  return undefined;
651
650
  }
651
+ const isAdminPortal = (0, lowcode_builder_1.buildAsAdminPortalByBuildType)(this._resolvedInputs.buildTypeList);
652
652
  const gatewayMeta = yield this.api.cloudbaseManager
653
653
  .commonService('lowcode', '2021-01-08')
654
654
  .call({
655
655
  Action: 'GetGatewayDomainAppDetails',
656
656
  Param: {
657
657
  EnvId: envId,
658
- WeAppId: (0, lowcode_builder_1.buildAsAdminPortalByBuildType)(this._resolvedInputs.buildTypeList) ? 'app_enterprise' : appId,
658
+ WeAppId: isAdminPortal ? 'app_enterprise' : appId,
659
659
  },
660
660
  })
661
661
  .then((res) => {
662
- const { Domain, GatewayId, GatewayEnvId } = res;
663
- if (Domain && GatewayId) {
662
+ this.api.logger.info(`GetGatewayDomainAppDetails success:${res.RequestId}`);
663
+ const { Domain, GatewayId, GatewayEnvId, BindDomainAppList = [] } = res;
664
+ const item = BindDomainAppList.find((item) => item.WeAppId === appId || (isAdminPortal ? item.WeAppId === 'app_enterprise' : false));
665
+ if (Domain && GatewayId && (item === null || item === void 0 ? void 0 : item.IsBindDomain)) {
664
666
  return {
665
667
  gatewayId: GatewayId,
666
668
  gatewayEnvId: GatewayEnvId,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudbase/framework-plugin-low-code",
3
- "version": "1.7.45",
3
+ "version": "1.7.46",
4
4
  "description": "云开发 Tencent CloudBase Framework Low Code Plugin,将低码配置生成完整项目并一键部署云开发资源。",
5
5
  "author": "yhsunshining@gmail.com",
6
6
  "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -34,12 +34,12 @@
34
34
  "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
35
35
  },
36
36
  "dependencies": {
37
- "@cloudbase/cals": "^1.0.81",
37
+ "@cloudbase/cals": "^1.1.1",
38
38
  "@cloudbase/framework-core": "1.9.7",
39
39
  "@cloudbase/framework-plugin-auth": "1.9.7",
40
40
  "@cloudbase/framework-plugin-website": "1.9.7",
41
- "@cloudbase/lowcode-builder": "^1.8.101",
42
- "@cloudbase/lowcode-deployer": "^1.3.9",
41
+ "@cloudbase/lowcode-builder": "^1.8.103",
42
+ "@cloudbase/lowcode-deployer": "^1.3.10",
43
43
  "archiver": "^4.0.1",
44
44
  "compressing": "^1.4.0",
45
45
  "cos-nodejs-sdk-v5": "^2.8.2",