From 5cc9106b0fc0dd19c913112e31e80dac08344d90 Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Thu, 20 Oct 2022 16:13:48 +0800
Subject: [PATCH] feat(uniCloud): secure network config

---
 packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js | 3 ++-
 packages/vue-cli-plugin-uni/lib/chain-webpack.js             | 3 ++-
 packages/vue-cli-plugin-uni/lib/env.js                       | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js b/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
index db325fec1..a97f587cf 100644
--- a/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
+++ b/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
@@ -91,7 +91,8 @@ const plugins = [
       UNI_PLATFORM: JSON.stringify(process.env.UNI_PLATFORM),
       VUE_APP_PLATFORM: JSON.stringify(process.env.UNI_PLATFORM),
       UNI_CLOUD_PROVIDER: process.env.UNI_CLOUD_PROVIDER,
-      UNI_SECURE_NETWORK: process.env.UNI_SECURE_NETWORK,
+      UNI_SECURE_NETWORK_ENABLE: process.env.UNI_SECURE_NETWORK_ENABLE,
+      UNI_SECURE_NETWORK_CONFIG: process.env.UNI_SECURE_NETWORK_CONFIG,
       UNICLOUD_DEBUG: process.env.UNICLOUD_DEBUG,
       RUN_BY_HBUILDERX: process.env.RUN_BY_HBUILDERX,
       UNI_AUTOMATOR_WS_ENDPOINT: JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT),
diff --git a/packages/vue-cli-plugin-uni/lib/chain-webpack.js b/packages/vue-cli-plugin-uni/lib/chain-webpack.js
index f4076ded6..ac63ff416 100644
--- a/packages/vue-cli-plugin-uni/lib/chain-webpack.js
+++ b/packages/vue-cli-plugin-uni/lib/chain-webpack.js
@@ -135,7 +135,8 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
       'process.env.UNI_PLATFORM': JSON.stringify(process.env.UNI_PLATFORM),
       'process.env.UNI_SUB_PLATFORM': JSON.stringify(process.env.UNI_SUB_PLATFORM),
       'process.env.UNI_CLOUD_PROVIDER': process.env.UNI_CLOUD_PROVIDER,
-      'process.env.UNI_SECURE_NETWORK': process.env.UNI_SECURE_NETWORK,
+      'process.env.UNI_SECURE_NETWORK_ENABLE': process.env.UNI_SECURE_NETWORK_ENABLE,
+      'process.env.UNI_SECURE_NETWORK_CONFIG': process.env.UNI_SECURE_NETWORK_CONFIG,
       'process.env.UNICLOUD_DEBUG': process.env.UNICLOUD_DEBUG,
       'process.env.RUN_BY_HBUILDERX': process.env.RUN_BY_HBUILDERX,
       'process.env.UNI_AUTOMATOR_WS_ENDPOINT': JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT),
diff --git a/packages/vue-cli-plugin-uni/lib/env.js b/packages/vue-cli-plugin-uni/lib/env.js
index e498d0bfa..369b0016a 100644
--- a/packages/vue-cli-plugin-uni/lib/env.js
+++ b/packages/vue-cli-plugin-uni/lib/env.js
@@ -131,7 +131,7 @@ if (!process.env.UNI_CLOUD_PROVIDER && process.env.UNI_CLOUD_SPACES) {
 }
 
 // 安全网络
-process.env.UNI_SECURE_NETWORK = isEnableSecureNetwork(manifestJsonObj, process.env.UNI_PLATFORM)
+process.env.UNI_SECURE_NETWORK_ENABLE = isEnableSecureNetwork(manifestJsonObj, process.env.UNI_PLATFORM)
 
 // 初始化环境变量
 process.env.UNI_CLI_CONTEXT = require('@dcloudio/uni-cli-shared/lib/util').getCLIContext()
@@ -590,4 +590,4 @@ runByHBuilderX && console.log(uniI18n.__('compiling'))
 
 module.exports = {
   manifestPlatformOptions: platformOptions
-}
+}
-- 
GitLab