diff --git a/env.js b/env.js index 4675c6b..14d2d3c 100644 --- a/env.js +++ b/env.js @@ -1,7 +1,7 @@ // uni版本号 -export const uniVersion = '1.0.20' +export const uniVersion = '1.0.21' // uni构建号 -export const uniBuildNumber = 21 +export const uniBuildNumber = 22 // web版本号 export const webVersion = '1.0.1' diff --git a/star-cloud/configureNetwork.js b/star-cloud/configureNetwork.js index 6ccd68a..7067a60 100644 --- a/star-cloud/configureNetwork.js +++ b/star-cloud/configureNetwork.js @@ -67,7 +67,7 @@ export async function startSearchWiFi(params = {}) { * @returns {Promise} */ export async function connectWiFi(params) { - const cardRequiredFields = ['ssid', 'password', 'clientId']; + const cardRequiredFields = ['ssid', 'password', 'clientId', 'starLockPeerId', 'userPeerId']; const missingField = checkRequiredFields(params, cardRequiredFields); if (missingField) { return new Result(Result.codes.NotMoreData, null, `参数信息不完整: ${missingField}`); @@ -80,6 +80,8 @@ export async function connectWiFi(params) { } const clientId = params.clientId; + const userPeerId = params.userPeerId; + const starLockPeerId = params.starLockPeerId; let { ssid, password, @@ -87,12 +89,11 @@ export async function connectWiFi(params) { starcloudRpcPeerId: config.data.starcloudRpcPeerId, starcloudReportPeerId: config.data.starcloudReportPeerId, starcloudUrl: config.data.starcloudUrl, - userPeerId: config.data.userPeerId, + userPeerId: userPeerId, scdUrl: config.data.scdUrl, - starlockPeerId: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + starlockPeerId: starLockPeerId, clientId: clientId, secretKey: generateRandomString(18), - userPeerld: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }) } = params