From e3f4106cfcee9b702433a254194ffeadf8f9698d Mon Sep 17 00:00:00 2001
From: mehaotian <490272692@qq.com>
Date: Fri, 22 Apr 2022 21:17:30 +0800
Subject: [PATCH] =?UTF-8?q?fix(stat):=20=E5=A2=9E=E5=8A=A0=20uni-stat=20?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../build/webpack.nvue.conf.js                  |  6 ++++--
 .../vue-cli-plugin-uni/lib/chain-webpack.js     |  6 ++++--
 packages/vue-cli-plugin-uni/lib/env.js          | 17 +++++++++++++++--
 3 files changed, 23 insertions(+), 6 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 432077faf..709da3ec9 100644
--- a/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
+++ b/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
@@ -86,7 +86,9 @@ const plugins = [
       UNI_CLOUD_PROVIDER: process.env.UNI_CLOUD_PROVIDER,
       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)
+      UNI_AUTOMATOR_WS_ENDPOINT: JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT),
+      UNI_STAT_UNI_CLOUD: process.env.UNI_STAT_UNI_CLOUD || '',
+      UNI_STAT_DEBUG: process.env.UNI_STAT_DEBUG || ''
     }
   }),
   new webpack.BannerPlugin({
@@ -390,4 +392,4 @@ module.exports = function () {
       zlib: false
     }
   }
-}
+}
diff --git a/packages/vue-cli-plugin-uni/lib/chain-webpack.js b/packages/vue-cli-plugin-uni/lib/chain-webpack.js
index d2dad6dde..6d7e5b120 100644
--- a/packages/vue-cli-plugin-uni/lib/chain-webpack.js
+++ b/packages/vue-cli-plugin-uni/lib/chain-webpack.js
@@ -102,7 +102,9 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
       'process.env.UNI_CLOUD_PROVIDER': process.env.UNI_CLOUD_PROVIDER,
       '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)
+      'process.env.UNI_AUTOMATOR_WS_ENDPOINT': JSON.stringify(process.env.UNI_AUTOMATOR_WS_ENDPOINT),
+      'process.env.UNI_STAT_UNI_CLOUD': process.env.UNI_STAT_UNI_CLOUD || '',
+      'process.env.UNI_STAT_DEBUG': process.env.UNI_STAT_DEBUG || ''
     }
     if (process.env.UNI_USING_VUE3) {
       Object.assign(defines, {
@@ -145,4 +147,4 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
       webpackConfig.plugins.delete('progress')
     }
   }
-}
+}
diff --git a/packages/vue-cli-plugin-uni/lib/env.js b/packages/vue-cli-plugin-uni/lib/env.js
index 2c72ceb8a..7d0468888 100644
--- a/packages/vue-cli-plugin-uni/lib/env.js
+++ b/packages/vue-cli-plugin-uni/lib/env.js
@@ -314,6 +314,8 @@ if ((process.env.UNI_PLATFORM === 'mp-kuaishou' || process.env.UNI_PLATFORM ===
   process.env.SCOPED_SLOTS_COMPILER = modes[2]
 }
 
+process.env.UNI_STAT_UNI_CLOUD = ''
+process.env.UNI_STAT_DEBUG = ''
 if (
   process.env.UNI_USING_COMPONENTS ||
   process.env.UNI_PLATFORM === 'h5'
@@ -325,6 +327,11 @@ if (
 
   if (uniStatistics.enable === true) {
     process.env.UNI_USING_STAT = uniStatistics.version === '2' ? '2' : '1'
+    // 获取服务空间配置信息
+    const uniCloudConfig = uniStatistics.uniCloud || {}
+    process.env.UNI_STAT_UNI_CLOUD = JSON.stringify(uniCloudConfig)
+    process.env.UNI_STAT_DEBUG = uniStatistics.debug === true ? 'true' : 'false'
+
     if (process.env.NODE_ENV === 'production') {
       if (!process.UNI_STAT_CONFIG.appid) {
         console.log()
@@ -336,11 +343,17 @@ if (
         if (!uniStatistics.version) {
           console.log()
           console.warn(uniI18n.__('pluginUni.uniStatisticsNoVersion', {
-            0: 'https://uniapp.dcloud.io/uni-stat'
+            0: 'https://uniapp.dcloud.io/uni-stat-v2.html'
           }))
-          console.log()
         }
+        console.log()
+        console.warn(`已开启 uni统计${uniStatistics.version}.0 版本`)
+        console.log()
       }
+    } else {
+      console.log()
+      console.warn(`已开启 uni统计${uniStatistics.version}.0 版本`)
+      console.log()
     }
   }
 }
-- 
GitLab