From d78bd55b2be41076c579595127a7aaf84341ede4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 12 Dec 2024 09:10:39 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E7=A7=9F=E5=AE=A2=E9=92=A5=E5=8C=99?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E8=B6=B36=E5=B0=8F=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=A6=81=E6=AD=A2=E8=8E=B7=E5=8F=96=E5=8D=95=E6=AC=A1?=
 =?UTF-8?q?=E9=92=A5=E5=8C=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 starCloud.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/starCloud.js b/starCloud.js
index e698068..2b732b6 100644
--- a/starCloud.js
+++ b/starCloud.js
@@ -1180,13 +1180,12 @@ export const useStarCloudStore = defineStore('starCloud', {
       }
 
       const { code, data, message } = await getLockSettingDataRequest({
-        lockId: lockId
+        lockId
       })
       if (code === Result.Success.code) {
         return new Result(code, { ...data.lockFeature }, message)
-      } else {
-        return new Result(code, data, message)
       }
+      return new Result(code, data, message)
     },
 
     /**
@@ -1301,7 +1300,6 @@ export const useStarCloudStore = defineStore('starCloud', {
 
         setStorage('starCloudToken', this.accountInfo.token)
 
-        this.getServerTimestamp().then(() => {})
         return Result.Success
       }
 

From 64e75d39a6fbe876ff3e68ce09345891e58c2027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 12 Dec 2024 09:15:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E7=A7=9F=E5=AE=A2=E9=92=A5=E5=8C=99?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E8=B6=B36=E5=B0=8F=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=A6=81=E6=AD=A2=E8=8E=B7=E5=8F=96=E5=8D=95=E6=AC=A1?=
 =?UTF-8?q?=E9=92=A5=E5=8C=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 starCloud.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/starCloud.js b/starCloud.js
index 2b732b6..44202ce 100644
--- a/starCloud.js
+++ b/starCloud.js
@@ -1986,21 +1986,6 @@ export const useStarCloudStore = defineStore('starCloud', {
             }
             characteristicValueCallback(new Result(decrypted[6], { lock: this.lockInfo }))
             break
-          case cmdIds.resetDevice:
-            this.updateLockInfo({
-              token: decrypted.slice(2, 6),
-              electricQuantity: decrypted[7],
-              electricQuantityStandby: decrypted[9]
-            })
-            if (decrypted[6] === Result.Success.code) {
-              updateElectricQuantityRequest({
-                lockId: this.lockInfo.lockId,
-                electricQuantity: decrypted[7],
-                electricQuantityStandby: decrypted[9]
-              })
-            }
-            characteristicValueCallback(new Result(decrypted[6], { lock: this.lockInfo }))
-            break
           case cmdIds.resetDevice:
             this.updateLockInfo({
               token: decrypted.slice(2, 6)

From d028bbca1bc6d13589210fc78e631ca3a87504f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 12 Dec 2024 17:51:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=AF=86=E7=A0=81=E7=9B=B8=E5=85=B3=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 basic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basic.js b/basic.js
index 37ced86..120726a 100644
--- a/basic.js
+++ b/basic.js
@@ -59,7 +59,7 @@ export class Result {
     [Result.codes.NotTokenLock, { message: '用户在锁端token失效', data: {} }],
     [Result.codes.NotMoreKeyLock, { message: '锁端钥匙数量已达上限', data: {} }],
     [Result.codes.ReadyHasKeyLock, { message: '用户已是锁端用户', data: {} }],
-    [Result.codes.ReadyHasPassword, { message: '该密码已存在', data: {} }]
+    [Result.codes.ReadyHasPassword, { message: '该密码已存在，请更换。', data: {} }]
   ])
 
   constructor(code, data, message) {