From 8c62d078cc52c1961040b7755cc6c44e96de71b5 Mon Sep 17 00:00:00 2001
From: xyj <10908227994@qq.com>
Date: Sat, 2 Dec 2023 10:34:03 +0800
Subject: [PATCH] test

---
 MQTT.py                          |   6 +-
 __pycache__/api.cpython-310.pyc  | Bin 929 -> 1169 bytes
 __pycache__/tool.cpython-310.pyc | Bin 857 -> 858 bytes
 ceshi.py                         | 107 +++++++++++++++----------------
 update.sh                        |   1 +
 5 files changed, 54 insertions(+), 60 deletions(-)

diff --git a/MQTT.py b/MQTT.py
index e5b9a40..501de0f 100644
--- a/MQTT.py
+++ b/MQTT.py
@@ -8,7 +8,7 @@ from tool import push_stream, close_stream, update, exec_sh
 class MQTT:
     def on_connect(self, client, userdata, flags, rc):
         if rc == 0:
-            client.subscribe('lot_stream')
+            client.subscribe('lot_mqtt')
 
     # Message receiving callback
     def on_message(self, client, userdata, msg):
@@ -34,12 +34,12 @@ class MQTT:
 
     def __init__(self):
         self.client = mqtt.Client()
-        self.client.username_pw_set("ceshi", "123456")
+        self.client.username_pw_set("demo", "123456")
         # Specify callback function
         self.client.on_connect = self.on_connect
         self.client.on_message = self.on_message
         # Establish a connection
-        self.client.connect('60.204.152.17', 1883)
+        self.client.connect('ceshi-mqtt.lihaink.cn', 1883)
         # Publish a message
         self.client.loop_forever(retry_first_connection=True)
 
diff --git a/__pycache__/api.cpython-310.pyc b/__pycache__/api.cpython-310.pyc
index 61c07879042cf82cea2f9de7fdfda0f6d51f1bc7..de2f028115c3a80e0a2188cbabaa543be2f1a2f3 100644
GIT binary patch
delta 636
zcmZ8dO=}cE5UuK&%=FC8Og5`g(Of(RA>dU+2yQNtkHZFnEx4@PoiMtcS$bMxmW>e-
zym=Vbv*2-mgBSf9bMo%hyH<~h5gYo|>+0%PuljRXMOl%iG0^(){-s*;s%!-()xG=M
zIus#-1nG~sjzpwm5$l#{=|m(=eqogAOk~6Z73?z^N`CH(MH$KX97J2TWI}OCVh>i+
z>eJ0Ttmd0LyZ!F^?s}bFvi{aicVn~q`t8Bo+s=O?z?{|ou#l?uba}AqnFaD@7(pFv
zycw#o&5Of1GtP63Y7V9|`-0C;uhV(x$}X2j#1%cJU3Lj3k%cKt@r)r@JcB*xfe)4)
z-$gi~+$6Cmampn7!1f@3r!@Tud&_zk@d%H=v`C0daSDwov)ClWlen}4WBWGON^o^3
z8)lYVUFR=cBUT4ejg(c+aG4P>jFDr8w~)VMzs&ONHhcBVInO`RcbJ42bqpw6bu?{v
z{7;x4DBG6<J6NI13+VupE9o0fsx$k}woZ*tT%_{Fno;AT%xz(g|9o}RD0K2}ND=N2
xXtHr`BA0Te&9Vch^^bwZN;4jRs0;aeq#luZDBS}N963v{O(P~O^EgkC{|2Did!YaT

delta 395
zcmYjLO-sW-6x_FMlTDh$S_OOX<Sht-cM&Rj^8+-e6)e%+O0a3dZVGzyP`rnD7CiQ6
z2>Kg@;2-c$sBa^PdzhU!%zHDX^K1v1@4E!w+e0EFS_bPdEjPCX5J5zHVyBF=)ZtF*
zayRYrZliZ5Ug~onxh1VJ6}DjWHV=d&+&SS(0?tU-{WMpPL#VyISj$tX^K7am&g}3c
z8to6GVfpa_Vf6%S8*Q{IicmWTw^uSRl5D!5$}tMa1yQ}~9WJ0>ebJk9qb84l8>V>J
zQXTx7ZRHyl80h`MGP0Uo%VH$rB3{Kw8wUjoJP2R_?4EwB6_mnW_1ZcrxGyfZl*}`o
z6q&kHO}Qq+LX)x)xIK<_5$B0wM(P_d7yiXI1%9)4(oD=Iau+KTZM=*yVAR9>0eCcM
GdF%)CZBRA<

diff --git a/__pycache__/tool.cpython-310.pyc b/__pycache__/tool.cpython-310.pyc
index f7a1fa9d9c9bb5e4f73f951b2d061b97b2104a2e..f549089987e014fd70635e81013dc57c6197b975 100644
GIT binary patch
delta 94
zcmcb~c8iTSpO=@50SE-zvr=6)^2#%@vZN%IBu+M9vSGc&oSd67xsXYXQG9X~qw3_n
lOs<L&K((4|MS?)8hyz6Mf(U*PAr2xWCeLG(m~71~2LSHV6G8w0

delta 93
zcmcb`c9V@apO=@50SFpfGgF;6^2#%@Fem4xOg3b)VJ#8>icc<LQezaG9L1<Qc^{Lj
iqBu}UldVV)NELB_2wo7u4<f`sg!trnj1rS=nB@SJKM}Y9

diff --git a/ceshi.py b/ceshi.py
index 99a1e41..df94ff7 100644
--- a/ceshi.py
+++ b/ceshi.py
@@ -376,66 +376,59 @@ def run_no_client():
                 'wind_direction': winddirection_data}
         data = LOT_DATA(**data, create_time=int(time.time()))
         # TODO 判断数据是否正常
-        r = add(data)
+        add(data)
 
 
-def t1():
-    import time
-    while (1):
-        time.sleep(2)
-        data = {
-            "wind_speed": 1,
-            "wind_direction": 6,
-            "ambient_temperature": 66,
-            "ambient_humidity": 78,
-            "carbon_dioxide": 94,
-            "ambient_air_pressure": 48,
-            "rainfall": 3,
-            "ambient_lighting": 59,
-            "soil_temperature": 71,
-            "soil_moisture": 19,
-            "soil_conductivity": 62,
-            "soil_PH": 49,
-            "soil_potassium_phosphate_nitrogen": 5,
-            "soil_potassium_phosphate_phosphorus": 5,
-            "soil_potassium_phosphate_potassium": 86,
-            "create_time": int(time.time())
-        }
-        client.publish('lot_data', payload=json.dumps(data, ensure_ascii=False), qos=0)
+class UPLOAD:
+    def __init__(self):
+        self.times = 3
+        self.client = mqtt.Client(transport="websockets")
+        self.client.username_pw_set("demo", "123456")
+        # Specify callback function
+        self.client.on_connect = self.on_connect
+        # Establish a connection
+        self.client.connect('ceshi-mqtt.lihaink.cn', 8083)
+        # Publish a message
+        self.client.loop_forever()
 
-
-def t2():
-    print("1")
-
-
-time = 3
-
-from threading import Thread
-
-
-def on_connect(client, userdata, flags, rc):
-    global time
-    if rc == 0:
-        print("连接成功，执行数据推送和本地存储")
-        nt1 = Thread(target=t1)
-        nt1.start()
-    else:
-        if time != 0:
-            time -= 1
-            client.reconnect()
+    def on_connect(self, client, userdata, flags, rc):
+        from threading import Thread
+        if rc == 0:
+            print("连接成功，执行数据推送和本地存储")
+            nt1 = Thread(target=self.t1)
+            nt1.start()
         else:
-            print("3次失败，执行本地存储")
-            nt2 = Thread(target=t2)
-            nt2.start()
+            if self.times != 0:
+                self.times -= 1
+                client.reconnect()
+            else:
+                print("3次失败，执行本地存储")
+                nt2 = Thread(target=self.t2)
+                nt2.start()
 
+    def t2(self):
+        print("1")
 
-client = mqtt.Client(transport="websockets")
-client.username_pw_set("demo", "123456")
-# Specify callback function
-client.on_connect = on_connect
-# Establish a connection
-client.connect('ceshi-mqtt.lihaink.cn', 8083)
-# Publish a message
-client.loop_forever()
-
-# Message receiving callback
+    def t1(self):
+        import time
+        while (1):
+            time.sleep(60)
+            data = {
+                "wind_speed": 1,
+                "wind_direction": 6,
+                "ambient_temperature": 66,
+                "ambient_humidity": 78,
+                "carbon_dioxide": 94,
+                "ambient_air_pressure": 48,
+                "rainfall": 3,
+                "ambient_lighting": 59,
+                "soil_temperature": 71,
+                "soil_moisture": 19,
+                "soil_conductivity": 62,
+                "soil_PH": 49,
+                "soil_potassium_phosphate_nitrogen": 5,
+                "soil_potassium_phosphate_phosphorus": 5,
+                "soil_potassium_phosphate_potassium": 86,
+                "create_time": int(time.time())
+            }
+            self.client.publish('demo', payload=json.dumps(data, ensure_ascii=False), qos=0)
diff --git a/update.sh b/update.sh
index 2861bc0..c6ac1a9 100644
--- a/update.sh
+++ b/update.sh
@@ -5,4 +5,5 @@ git pull origin master
 # 配置文件复制到supervisor管理
 cp -r conf/*.conf /etc/supervisor/conf.d/
 # 更新配置文件
+supervisorctl reread
 supervisorctl update