From 3d2f57fd19266e6f72a291d9c1b05d69b2257afd Mon Sep 17 00:00:00 2001
From: DCloud_LXH <283700113@qq.com>
Date: Mon, 17 Oct 2022 14:41:56 +0800
Subject: [PATCH] fix(app): deviceId is used plus module

---
 src/platforms/app-plus/helpers/uuid.js              | 6 ------
 src/platforms/app-plus/service/api/device/system.js | 6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 src/platforms/app-plus/helpers/uuid.js

diff --git a/src/platforms/app-plus/helpers/uuid.js b/src/platforms/app-plus/helpers/uuid.js
deleted file mode 100644
index 57b043717..000000000
--- a/src/platforms/app-plus/helpers/uuid.js
+++ /dev/null
@@ -1,6 +0,0 @@
-let deviceId
-
-export default function () {
-  deviceId = deviceId || plus.device.uuid
-  return deviceId
-}
diff --git a/src/platforms/app-plus/service/api/device/system.js b/src/platforms/app-plus/service/api/device/system.js
index e9c322ba0..f9241a598 100644
--- a/src/platforms/app-plus/service/api/device/system.js
+++ b/src/platforms/app-plus/service/api/device/system.js
@@ -1,6 +1,5 @@
 import { callApiSync } from '../util'
 import { getWindowInfo } from './get-window-info'
-import deviceId from 'uni-platform/helpers/uuid'
 import { sortObject } from 'uni-shared'
 
 let systemInfo = {}
@@ -21,7 +20,8 @@ export function getDeviceInfo () {
   weexGetSystemInfoSync()
   const {
     deviceBrand = '', deviceModel, osName,
-    osVersion, deviceOrientation, deviceType
+    osVersion, deviceOrientation, deviceType,
+    deviceId
   } = systemInfo
 
   const brand = deviceBrand.toLowerCase()
@@ -32,7 +32,7 @@ export function getDeviceInfo () {
     deviceBrand: brand,
     deviceModel,
     devicePixelRatio: plus.screen.scale,
-    deviceId: deviceId(),
+    deviceId,
     deviceOrientation,
     deviceType,
     model: deviceModel,
-- 
GitLab