chore(boards): 调整micropython下TinyWebDB服务端地址
This commit is contained in:
@@ -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)
|
||||
raise RuntimeError("API request failed or WiFi is not connected", e)
|
||||
|
||||
@@ -2845,7 +2845,7 @@
|
||||
<block type="iot_tiny_web_db_init">
|
||||
<value name="ADDR">
|
||||
<shadow type="text">
|
||||
<field name="TEXT">https://mixio.mixly.cn</field>
|
||||
<field name="TEXT">https://mixio.mixly.cn/tinydb</field>
|
||||
</shadow>
|
||||
</value>
|
||||
<value name="USERNAME">
|
||||
|
||||
@@ -2743,7 +2743,7 @@
|
||||
<block type="iot_tiny_web_db_init">
|
||||
<value name="ADDR">
|
||||
<shadow type="text">
|
||||
<field name="TEXT">https://mixio.mixly.cn</field>
|
||||
<field name="TEXT">https://mixio.mixly.cn/tinydb</field>
|
||||
</shadow>
|
||||
</value>
|
||||
<value name="USERNAME">
|
||||
|
||||
@@ -2627,7 +2627,7 @@
|
||||
<block type="iot_tiny_web_db_init">
|
||||
<value name="ADDR">
|
||||
<shadow type="text">
|
||||
<field name="TEXT">https://mixio.mixly.cn</field>
|
||||
<field name="TEXT">https://mixio.mixly.cn/tinydb</field>
|
||||
</shadow>
|
||||
</value>
|
||||
<value name="USERNAME">
|
||||
|
||||
@@ -2665,7 +2665,7 @@
|
||||
<block type="iot_tiny_web_db_init">
|
||||
<value name="ADDR">
|
||||
<shadow type="text">
|
||||
<field name="TEXT">https://mixio.mixly.cn</field>
|
||||
<field name="TEXT">https://mixio.mixly.cn/tinydb</field>
|
||||
</shadow>
|
||||
</value>
|
||||
<value name="USERNAME">
|
||||
|
||||
@@ -3157,7 +3157,7 @@
|
||||
<block type="iot_tiny_web_db_init">
|
||||
<value name="ADDR">
|
||||
<shadow type="text">
|
||||
<field name="TEXT">https://mixio.mixly.cn</field>
|
||||
<field name="TEXT">https://mixio.mixly.cn/tinydb</field>
|
||||
</shadow>
|
||||
</value>
|
||||
<value name="USERNAME">
|
||||
|
||||
@@ -2427,7 +2427,7 @@
|
||||
<block type="iot_tiny_web_db_init">
|
||||
<value name="ADDR">
|
||||
<shadow type="text">
|
||||
<field name="TEXT">https://mixio.mixly.cn</field>
|
||||
<field name="TEXT">https://mixio.mixly.cn/tinydb</field>
|
||||
</shadow>
|
||||
</value>
|
||||
<value name="USERNAME">
|
||||
|
||||
Reference in New Issue
Block a user