From f862b67c991d4cf914c2c8af49f332e6488946e6 Mon Sep 17 00:00:00 2001
From: xyj <10908227994@qq.com>
Date: Thu, 7 Dec 2023 19:15:41 +0800
Subject: [PATCH] update

---
 MQTT.py                          |  11 +++++------
 __pycache__/tool.cpython-310.pyc | Bin 0 -> 2521 bytes
 2 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 __pycache__/tool.cpython-310.pyc

diff --git a/MQTT.py b/MQTT.py
index d25cff5..b645e89 100644
--- a/MQTT.py
+++ b/MQTT.py
@@ -13,9 +13,6 @@ def on_connect(client, userdata, flags, rc):
 
 
 def valid(msg, client):
-    p = subprocess.Popen(['cat /home/pi/device_name'], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    out, err = p.communicate()
-    device_name = out.decode('utf-8')
     origin_data = json.loads(msg.payload.decode('utf-8'))
     if 'msg' not in origin_data:
         client.publish('error', payload='msg must be supplied', qos=0)
@@ -23,7 +20,7 @@ def valid(msg, client):
     if 'device_name' not in origin_data:
         client.publish('error', payload='device_name must be supplied', qos=0)
         return False
-    if device_name.casefold() != origin_data['device_name'].casefold():
+    if device_name != origin_data['device_name']:
         return False
     return True
 
@@ -75,10 +72,12 @@ def exec_shutdown():
 import os
 
 if __name__ == '__main__':
-
+    p = subprocess.Popen(['cat /home/pi/device_name'], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    out, err = p.communicate()
+    device_name = out.decode('utf-8').strip()
     while True:
         try:
-            client = mqtt.Client(client_id='s')
+            client = mqtt.Client(client_id=device_name)
             client.username_pw_set("demo", "123456")
             # Specify callback function
             client.on_connect = on_connect
diff --git a/__pycache__/tool.cpython-310.pyc b/__pycache__/tool.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..721a189231dbc2d60e9f87fa8c7e70bcf403f753
GIT binary patch
literal 2521
zcmbVNOOM<{5O%j8<C*d1v3ZjR0|Ai<>>5xc!b1^KL?onWwGw+;AsMf`GvmpO+uPk<
zWk;S9NQlE;;gZAdfy17VIB?;{&*&>Cf^%+>2vqg#D<eUo*m6}r+}+hx-&ZB(=2{Ls
zkAGO_jke?bj-8_qh0dq&sjomVhmoPPI@M&A*gjpQR=cY%qpKcsnfHye>NB4Opaa%m
zA?OBcvKHu&wOItZ$>!KG&@FbHodDft<O`>J@-H~WSsF)iUyOKM=JBY!kr5o+dwkFV
ze7E6yd>4dv2859wVH8^SWA2tWAvM`{cbqTjgihR=ZhOqzArr5524I;E294TdVA~dD
zA!}~A1nvaqx0c2?<F&kq*HYE*92hYaIvJ%!+T+sB#7d`9CuODjiPDm%qeazU*>#Pt
z`g}MvfznJ=+G;N46Ti~;7H*n`s<MnLb!V5Dh!?7oJV{lS=MrzYOHHFpH-{o+#$6X`
zH#99(t(8*X8sjgEk{8BX{(Si})6T?bR26xaYHk9?Gr>5luGWUR>KkvML}7eZjY_ra
zn;;wJywHY}#zm`KFv$eaDl5I~$jfl{le^Qq4)cDR$IF{pKb50pDF!^#DlRv5Ule=Y
zncflCydP^JhKuE<X&><n!b=?k(IOta!PCfXkt;;L3Pb-HS&6X2XngQu(GcZqFr*7R
z$OeiK#2wkhCi+<d%pHjq$#W?1{!?)US|-YdLh-$@o`Mk-foPGC1ph?Tn%;qd3@zM$
z@PvI(s^6faooxb8quVYcJMc~@qcz<i@?1>@mLf=xec077d%*#ix~y@Zs;i*G`&7P(
zkc4&<+8^6>Eg;X{I_(dF+6CB0Y;KEA;d?j+tp<MV7*N5hz3tFa!Jh=RKecJnnC=Lq
zY1R!SAyDCnP2H1A)_cZdsZNa#m=SV(20NWmrF3VFcT`oD04;Xt*6~Fc<8mWcLS}l{
zQCgIpBpI!1oh0Kc&rV8iX>>S$dUhVUV8gfClpH&G(Oc;f>4A%FfTv;Yw&WQYF+TpH
zB*sf(<m71-$5EU>aT3KminAcPp>ap5C(lFMw1v!jd6C%5y4i@y3;5qFC@!M7gklCN
z4gP><iR$AI3c)iEC^-QjKa|)zPa<M*^A`N_e8|su0eqw@wer$<ZuPhZG~*@<XeVOz
zz@lp}WYIg%Az?4qNmYXDIHtjuwltXTaRaTyc!h+5_aJ5b9eLJ&U9=Xyg9qu1SioYS
z@Gi(ZO?L=r%RELO(ut!zNcwK=FmInJU4O~68Q;h=o)qbbcd2|0mdooP#@G8=mmkHk
z>WgyGX2jzDVphZ{l%u?0{6Ty#AMylJtp+S2^16YcLYW2*v0R!Es#a2_x^DvTJ})**
zDEWE?cvr?Ng<WUQn*r2uj1_K@NJ#0D-GaSsz(NY?=jpsB--D57QV(ALAocX2Gn;yB
zYJud#oXSzBK)aAmE?e?@NO-7$d)2R|+E&KxP&aG31C{Y>id8#@3aVR!HfuvNiVj>j
zH%$=MamJCa!`T&b?a|LWj~;&a=TARA`u^KLe*NVzIT$L}#?ft2fJgMg%4W&O=Tpoe
zP{ndl#3IvNFHGy{_!<U5{cjYi68YXG#>aT5Ze(L2uYwITIly>WJLTIj1OCUjcmt6a
z5(yz=6z_uQdh!iy+k_C}o(K(zc${UvCDk-WcVOC<h_gU_r28c@PvnQV-=0Bu>@*A6
zqwJwr{bUCPCIyMul?ZPeV7vOrkrpMkIE9~#1gnPp79wAvp&`%&Uh2`%4Vz&Y&WDY#
H6@~u-V(n1C

literal 0
HcmV?d00001