From 4c0ee25604c8ecdc9f74566aa91bf1b6fdf146c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Mon, 29 Sep 2025 00:12:25 +0800 Subject: [PATCH] =?UTF-8?q?chore(boards):=20=E8=B0=83=E6=95=B4micropython?= =?UTF-8?q?=E4=B8=8BTinyWebDB=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../origin/build/lib/tiny_webdb.py | 24 ++++++++++++------- .../micropython_esp32/template.xml | 2 +- .../micropython_esp32c2/template.xml | 2 +- .../micropython_esp32c3/template.xml | 2 +- .../micropython_esp32s2/template.xml | 2 +- .../micropython_esp32s3/template.xml | 2 +- .../micropython_robot/template.xml | 2 +- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/boards/default_src/micropython/origin/build/lib/tiny_webdb.py b/boards/default_src/micropython/origin/build/lib/tiny_webdb.py index b61263be..6d69d659 100644 --- a/boards/default_src/micropython/origin/build/lib/tiny_webdb.py +++ b/boards/default_src/micropython/origin/build/lib/tiny_webdb.py @@ -2,16 +2,22 @@ import urequests as requests class TinyWebDB: - def __init__(self, url, username, password): + def __init__(self, *args): + if len(args) == 1: + self.init_with_mqtt(*args) + else: + self.init_with_user(*args) + + def init_with_user(self, url, username, password): self._api_url = "" self._username = username self._password = password self.set_url(url) - def __init__(self, mqtt_client): + def init_with_mqtt(self, mqtt_client): self._api_url = "" url, username, password = mqtt_client.get_server_info() - self.set_url('https://{}:443'.format(url)) + self.set_url('https://{}/tinydb'.format(url)) self._username = username self._password = password @@ -19,19 +25,19 @@ class TinyWebDB: key = str(key) value = str(value) result = self._request("update", "tag={}&value={}".format(key, value)) - if result["status"] == "error": + if "status" in result and result["status"] == "error": raise RuntimeError(result["message"]) def get(self, key): key = str(key) result = self._request("get", "tag={}".format(key)) - if result["status"] == "error": + if "status" in result and result["status"] == "error": raise RuntimeError(result["message"]) return result["value"] def count(self): result = self._request("count") - if result["status"] == "error": + if "status" in result and result["status"] == "error": raise RuntimeError(result["message"]) return int(result["count"]) @@ -39,14 +45,14 @@ class TinyWebDB: no = str(no) count = str(count) result = self._request("search", "no={}&count={}&tag={}&type={}".format(no, count, tag, dtype)) - if result["status"] == "error": + if "status" in result and result["status"] == "error": raise RuntimeError(result["message"]) return result["data"] def delete(self, key): key = str(key) result = self._request("delete", "tag={}".format(key)) - if result["status"] == "error": + if "status" in result and result["status"] == "error": raise RuntimeError(result["message"]) def set_url(self, url): @@ -69,4 +75,4 @@ class TinyWebDB: response.close() return result except Exception as e: - raise RuntimeError("API request failed or WiFi is not connected", e) \ No newline at end of file + raise RuntimeError("API request failed or WiFi is not connected", e) diff --git a/boards/default_src/micropython_esp32/template.xml b/boards/default_src/micropython_esp32/template.xml index 3f870e36..06b3ec1a 100644 --- a/boards/default_src/micropython_esp32/template.xml +++ b/boards/default_src/micropython_esp32/template.xml @@ -2845,7 +2845,7 @@ - https://mixio.mixly.cn + https://mixio.mixly.cn/tinydb diff --git a/boards/default_src/micropython_esp32c2/template.xml b/boards/default_src/micropython_esp32c2/template.xml index 3ac852a5..e203810c 100644 --- a/boards/default_src/micropython_esp32c2/template.xml +++ b/boards/default_src/micropython_esp32c2/template.xml @@ -2743,7 +2743,7 @@ - https://mixio.mixly.cn + https://mixio.mixly.cn/tinydb diff --git a/boards/default_src/micropython_esp32c3/template.xml b/boards/default_src/micropython_esp32c3/template.xml index 6cc6d719..e0c83e6f 100644 --- a/boards/default_src/micropython_esp32c3/template.xml +++ b/boards/default_src/micropython_esp32c3/template.xml @@ -2627,7 +2627,7 @@ - https://mixio.mixly.cn + https://mixio.mixly.cn/tinydb diff --git a/boards/default_src/micropython_esp32s2/template.xml b/boards/default_src/micropython_esp32s2/template.xml index 49b170a7..ebd662bb 100644 --- a/boards/default_src/micropython_esp32s2/template.xml +++ b/boards/default_src/micropython_esp32s2/template.xml @@ -2665,7 +2665,7 @@ - https://mixio.mixly.cn + https://mixio.mixly.cn/tinydb diff --git a/boards/default_src/micropython_esp32s3/template.xml b/boards/default_src/micropython_esp32s3/template.xml index df850542..22126ee8 100644 --- a/boards/default_src/micropython_esp32s3/template.xml +++ b/boards/default_src/micropython_esp32s3/template.xml @@ -3157,7 +3157,7 @@ - https://mixio.mixly.cn + https://mixio.mixly.cn/tinydb diff --git a/boards/default_src/micropython_robot/template.xml b/boards/default_src/micropython_robot/template.xml index ac878294..e4725ed6 100644 --- a/boards/default_src/micropython_robot/template.xml +++ b/boards/default_src/micropython_robot/template.xml @@ -2427,7 +2427,7 @@ - https://mixio.mixly.cn + https://mixio.mixly.cn/tinydb