From dabdb8acf8ece35bc83ef1c5c90822fcc77db2f2 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Thu, 17 Jul 2025 09:34:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=85=8D=E7=BD=91=E6=97=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0clientId=E5=8F=82=E6=95=B0=EF=BC=8C=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=9B=9E=E8=B0=83=E9=94=81=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 format.js                      | 14 ++++++++++++++
 star-cloud/configureNetwork.js | 13 +++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/format.js b/format.js
index 557478c..b9acb1d 100644
--- a/format.js
+++ b/format.js
@@ -245,4 +245,18 @@ export function parseNetworkJsonFromDecrypted(decrypted) {
         console.error('解析配网信息失败:', e);
     }
     return { peerId, wifiName, secretKey, deviceMac, networkMac };
+}
+
+/**
+ * 生成随机长度字符串
+ * @param length
+ * @returns {string}
+ */
+export function generateRandomString(length) {
+    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    let result = '';
+    for (let i = 0; i < length; i++) {
+        result += chars[Math.floor(Math.random() * chars.length)];
+    }
+    return result;
 }
\ No newline at end of file
diff --git a/star-cloud/configureNetwork.js b/star-cloud/configureNetwork.js
index c156ebc..6ccd68a 100644
--- a/star-cloud/configureNetwork.js
+++ b/star-cloud/configureNetwork.js
@@ -1,6 +1,6 @@
 import {
     checkRequiredFields,
-    createPackageEnd,
+    createPackageEnd, generateRandomString,
 } from "../format.js";
 import {cmdIds, Result} from "../constant.js";
 import {searchAndConnectDevice, writeBLECharacteristicValue} from "../uni/basic.js";
@@ -67,7 +67,7 @@ export async function startSearchWiFi(params = {}) {
  * @returns {Promise<unknown>}
  */
 export async function connectWiFi(params) {
-    const cardRequiredFields = ['ssid', 'password'];
+    const cardRequiredFields = ['ssid', 'password', 'clientId'];
     const missingField = checkRequiredFields(params, cardRequiredFields);
     if (missingField) {
         return new Result(Result.codes.NotMoreData, null, `参数信息不完整: ${missingField}`);
@@ -79,6 +79,7 @@ export async function connectWiFi(params) {
         return new Result(Result.codes.Fail, null, `获取网关配置失败: ${config.message}`);
     }
 
+    const clientId = params.clientId;
     let {
         ssid,
         password,
@@ -88,10 +89,10 @@ export async function connectWiFi(params) {
             starcloudUrl: config.data.starcloudUrl,
             userPeerId: config.data.userPeerId,
             scdUrl: config.data.scdUrl,
-            starlockPeerId: "0b3bd6327daafe2da24fdd0cae76c71477f32e3ef8ab",
-            clientId: "sBfWAwdMqVKIMBj4dPuRextHViC266aE",
-            secretKey: "zNn1AluC6sTVAtA4dX",
-            userPeerld: "zC2HjHNy9LsjxW2QEmceiNDTN6XSXFDUZ3fYsnBigVQX"
+            starlockPeerId: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+            clientId: clientId,
+            secretKey: generateRandomString(18),
+            userPeerld: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
         })
     } = params