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

---
 MQTT.py                           |   2 +-
 __pycache__/api.cpython-310.pyc   | Bin 1184 -> 0 bytes
 __pycache__/api.cpython-311.pyc   | Bin 1832 -> 0 bytes
 __pycache__/tool.cpython-311.pyc  | Bin 4017 -> 0 bytes
 conf/common/data_upload.conf      |   2 +-
 conf/common/record.conf           |   2 +-
 conf/common/sensor_to_local.conf  |   2 +-
 conf/common/sensor_to_server.conf |   2 +-
 bash/git_push.sh => git_push.sh   |   0
 9 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 __pycache__/api.cpython-310.pyc
 delete mode 100644 __pycache__/api.cpython-311.pyc
 delete mode 100644 __pycache__/tool.cpython-311.pyc
 rename bash/git_push.sh => git_push.sh (100%)

diff --git a/MQTT.py b/MQTT.py
index 91f777c..13e953b 100644
--- a/MQTT.py
+++ b/MQTT.py
@@ -3,7 +3,7 @@ import time
 
 import paho.mqtt.client as mqtt
 
-from tool import push_stream, close_stream, update, exec_sh, get_record, get_list_record, get_status
+from src.tool import push_stream, close_stream, update, exec_sh, get_record, get_list_record, get_status
 
 import os
 
diff --git a/__pycache__/api.cpython-310.pyc b/__pycache__/api.cpython-310.pyc
deleted file mode 100644
index a01e94b6a6f1812c3c66c2a2e30b4a42cc3a17c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1184
zcmZ`&&u`N(6t<l#Nz=6Z0Yf`*fMYMM#2FzrHYCK@CN^opmne<BHd|6xw#R7IO-P-%
z?Z!XRf5}%)h$|;9@SL{mHVIep^Luvv-uHdaqE-tLj9=eQdDB7Yhjs1_h@sc;sUb`Z
zF`OehwV2}4CzOCCxl_2*#dgohmkN)1g-`v`ck`gA&`J@~u&B~%5z(lOFXgqOPV2Dt
zxOYOB&w^{0F0%>?uMu5gRThC=W%v*^YCj=A+G}7FZ6%6-<f<=viZ_S}cK46s?aiZ2
zQ=hNm5Bu9YyA9Vw31jhDJJup*ZBy%TZ9T?ylI3Roo*TCZvCax^HW<&j=8J>#9mws!
zO_bg|cxPOe=p@Cqrr981EtPNJQ(G_%1C2&#j4{%9jE>PEa*-y3XBb^VY#3?G@CY+<
zLynP$J^^u;_zIv-?FGI-6K5~`4LK&nxT#>=IECso9JvIyOPkMBcD|&%uQSn`5NWd;
z%qK{$!RpWZR#z0fm1o@~YaI;IZX$~VDNcE+RjWVHUD2Dl54>FHxJY_QhszhOq@OkW
z1LFXZ5!|ZkFcBQUuZ}lx@Rj_Pk0F%Wa^}PK%q<n$;0!C4iV+@@2V^`4G9Wf1gWMy7
zT#=Ftu$By2g^K`u0Hy>lm&*VRl}@BCwW9&=v2rC>?J>*4bb16U<4u*d_0DjFcX6yk
zJcaLe+>>;UV~j3A&=I_Z8+<FO#W5F^fT+&@MQymy#HCi*chFW^Rsog=W&umCSocBs
zf$dk@cTZt+2EfD7LWn2!sx?D|GNC$e_oYa=Qq({HoTWncXq~m21@uv_nr(PP(-zuT
z1ar|T?~ltv(#j}Zm}m{oNZuDJ(?SlW{Z|(3+ap#H>Yu>NfM$^u8?qEj%crz8-2qZU
hD#Zw1LYDKKzp{@=**^pb+KNPY1sW?Nbted-;2+xr0>1zN

diff --git a/__pycache__/api.cpython-311.pyc b/__pycache__/api.cpython-311.pyc
deleted file mode 100644
index 067e1d3ce05c569034632e6ccaf2f0affdfce386..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1832
zcmb_d&ube;6n-<iE3ITnYbOp(WrwP?RT22d&8MVAB`Flrq%=M>d)cnEV`s^(R?M#B
z7;MLc91;j6heD3^$&Kp#1MQ{s((@X85CeulPrV7$L&&LbR+f}?+q5B_oq2EGo3}fo
z?|X0beX*DaZ2jy_wx9s~CXHdE$CLgooIC~x9O8jF(8MH(O-+iLdWx@_Dv@i7r}-H(
z<7drmVym9+=ggd+H}n34IpG(~LgLrFqF*vgIM1-m3U#vgRMT+udtgpFIh0clxdyfT
z@A42=YD5%1u|xJH3)?{}WHl=E%U74Ji}mHYC=F-U=T|RYx?EF5!FC+$X2XgC%V~(>
zDvPA$u*h~jaVBM2jSVYueJ0L2%wrK72M$+o@9d{`7}dY{OsI|>*-df`j8qy91P=P&
zpm+>9h+bOVggvzOM;-!^j6H69sP~5kT!Z%@Qb#7d4}4~eyd3Y4P4blPAuanuYM@E4
zBj{UX8^Idrb+Qh(mFuuhI?5II58S&$h1v`pCKNwhttmW%n{as!k-K!e$=Z<{v^tbe
zNDpD5{C1`CVrKD1;IqZHyXXax<=ZWLmGMQp?Jl%8gn|I`GZ<LF5q^zg2YOW1=8yF0
zN6QC#`A{#%dilthd9eL(JJ!!VKbn~C0nz5i0vC5rKY2Gc<_?UxLt`%1Pxj~7dJ4XT
zI(!Q^xjXv~e3!4QN@wz8<wt^(pEVTC5gZsZBIFSoe<fs-qyc<wO6Unn=s!?Gw`oEN
z>M<p}h=)Q7a;Opt_*CK$`7pA1G{{7qwVY(ePvc@JnW|JOd>XaL46>BJjfQlD4HP5n
zE4$?<UmfU6hx$^iFa3|`_vL<f&sAVIU)Pi$ChMU5L~!;CXegVwIBKuNKb`VhsdCta
zrzBl2|Dhx(mV}aK^i?HMQ}HTEGTr?aD}$Ht*hohf)tC-`3eDp(7@)4pD?^q(pT#9P
zQn(wl5AHm?b6=GiJslg>1EYFqRAasR##ztHxL56zph1W!veszxpvl5eWY=!F&49N=
z$!RS3SleE>(7^j~P}XP1PA^zZ4sInuT;4BSG9-!^!&y5B-6-H2gF7LCL6;#iKSg#0
zZ#^t{F8?BuYERNG!Jq?ubV35p3;jHPea&MZ@hbY{Z5RHE0!x>WF64HSrwdc@us?&+
xPV#i&!#Lf$a3TJ?-i4L;-}*C{iPOE8(a8M$8$CdEQcR|OC(O|s`~&<ce*y|(t}Xxo

diff --git a/__pycache__/tool.cpython-311.pyc b/__pycache__/tool.cpython-311.pyc
deleted file mode 100644
index d93acad9d6dea8968dc482415b59c38c213f6623..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4017
zcmd5<Z%iA>72mbj_Syy$4CYTbazr_k*a<lFQk66zC;lV~^b&kWs@!oQj=i&Bga0wR
z?p=_%v#M6dRVNjlP7PA?fqpp32~I`*P+6)X@c|@0?xKm}u7nh+RaAeesB$M&eCnGu
z7&{@7^QnD1`)2m-o0&InfAi+;AFHcv4A7<KDe+%C!~C5-9FSqZ@%%b89x#YOY?K)-
z)a)p$KO063P#dDg7&pqX3^M+T88smexEYy%TaXzzk1W8gh#g@(e4Y+_)5B_(Ye7lw
z^$!aB^XQcsxDoE>_kcZMWEQG@nk=>vJHaA@eDDJ5$pd4Vqou3HC5~ZM;4ToD%78K4
z&6!4DC=&ODf>O9ml7m<dBvVqjQwrbu)~K1Juo#VMW=Tegl&sex#_+->r9w%Z5JXAR
zO#VbtjBA{K(0}z?<~bdI?+sr#5fgpMh%cIu1F>K{I3Z%6oJd4FllL_{ogyH~SPaJS
zG0+FkGtxO=8D@ub5UyTn@F}kIS#EQ5Bk*`^f{aBKE~auZ!o{FbDA)lV{<pqsDD_<;
zS#%vXfoa%ESv6(UQd|Q}s}iCKNjzA)6GT;Tzp(aB#pPR*H-|QcAKw`#ccv6Bs&Y}n
zffM#iVeLgczz{{;Y{0{-aFZ^<$s$GBON7`Z7<HvMa`_W7G#7i!vNB!ZK26dU>y)P0
zG|Kdo?$ac-O{b%!tK5;;G~L`YrR4FBZjD1hIe1HVs>h;nlTsqCnWBjxk~B*)c%Qa3
zGZKXa5;5J**iIRBtjC}kW733X6k<rCTcoY6@Et7TC!!FL!uSmkQV2@#0t5Kj9AA3p
zN51~(iR<*X>-4fkb)6@!^Qx_j*t*u*iS1&hzW~vBVgBcfZ+$nj`q}2p#%Bt5Tjg#O
z?lv?E<^KSlb%*dwCBcUx-PW(hrn#VmPk<*})FtIR@~q-Iw>GeOeB;f>9}48du);-D
zE<(5nGzz7#<YFX(At?IwXtoZK2SO+W%_uW#kV~+47`XtQMfoD=zf8zbj>qyRWGq3a
zQJ>2+%cYHrMf{bHh`1Mevn9Pv756fg^fJqIkMGl@<)9_k9<&%HZGz*%{Ogi^RBpu!
zx)#J&tZPNK3U$q3gS}$iDrBixw;EYrt-A!@VWs#jW-Z7u%cr@;k|=WMCsb4JmjPz%
z`&nz+x~L!5hkAt;I##ZYcTjEG`U?jC4LSAtG4w3XT-qBs%X^|y6xb^6Rf+<81t_q+
z1`2GbaunE5<tVVf1`6z`aunFn>!6@2U6r;>>AM{p($-o2%OBD_a!lz_1Rqbci!_+O
zM5qqcBX-rb1QBDU7&Qu6jeNKz85pZ!3C3C}MkUmUnjRWvtJ8)>8l7Gu)SRwfJzm~t
zKU-?KiRm!7o-!IC_t>^PJu36m{yaSb^K{qe>EV~BNX=9IJhd-R;ioZh93?Mk?2q=?
z4vh_HCP=3eI7P$8vp@gg*~2gX`KNE5{qFOB{Piy$18$-{jME88GvLrnQ!tr~Mueao
zNyL2#K^EnXLIwqA95)_`iZfOHiMTAr<&InTlj2NgSeBF0PklZqoJe*?BjI2qKGiA2
zeL={|Qb~Gf`XVvN%Y5SzF^V7`HPKNdk3-|JIGqwDS;7rq0&b*?8iT20H3JxAlE4;O
z<LRLyM`EI8jKpQl5{*En7{QPp(o9nNI3kDPgieJ(9@e-*nwU&Tvd4js)1k~lGy(?W
z3-rM*Kt3po0XiQ3F_qMpNCI>!nm3h8sj@DuD%I6&bSZ&&5MF9LZPRAKTwR+l_Ot4m
z`kZgWoDxmd+RCVqFxVzUIe;O@zzEa-0qP2go?RIx$JJ$q>9yl*_}aTL^6;Z4t-kG6
z-<m~j?Ix|=s`DaoUd*-=XK&_bPr2&MAiZ)e?N3_HZMU3T9#LDmNK4n+Nz!sb;hJ9g
zVyCW!)V=l1h~nwVhO*Py5b^Y??mpt~+w51a-%-ZyDuH{-*gbMRs1Ah4KxoH(hUx~_
z4Ov7y{i=I_xCb@`We605%Do_PG89s;3FMkk)Mc{*@${+ge&X)m98m_xl)C|{dpAf1
zL+Vw5TowLpGSrLg_YCEkcX!Q<vpzGFt8aKP^wrQpO09R3diO3<ZEDxq9RJi__r!i;
z+kRp}QthXR{nRdFx3(`Emp@sqS+2?UuXksMv%^mt-+b`tSD!8lYNMAldY8LMW5?X}
z+>z2B%uMr1(&YK>)N*(YXW2Ep8dbfQi1*T?k@cpnlUu!8r#4#Eo?+56yyNWvrRl75
zO<s+w-X7xZc_giOZ}n}xx7D|CS$)S(-tiwO)vigaG1YsScrQN^*3WEpfzsO>9qJW7
zx#EX)H@{EU4Sa5JmuHSOFI?WPIjz*3&b7MdZU4zxYUkhIwlpf1#vJeXt>ZV2`Hz(|
z7qioI4wdgEe6Pay!izccj;ndWyNFcRS>igY^xRgeK7f+Bn&YZIzwyf(inDLaow=cM
ze!}^cgQBNb9vl7%K(DYfX^7D*<M0~^n;O$FqyJ7}`d^`Ewt6n7<Mo9fkv;x$EP+x{
z@d_RSWg5h!-viq<vMifpYBKtjW9%9I$}zRdL3zrwDCK3>%(8KImnq>q%f@s`k@E)j
Y1CW$(8_Q1WIz`U6vhRW9Xs$2+zi>Nh<NyEw

diff --git a/conf/common/data_upload.conf b/conf/common/data_upload.conf
index e76b4fc..53ac12d 100644
--- a/conf/common/data_upload.conf
+++ b/conf/common/data_upload.conf
@@ -1,5 +1,5 @@
 [program:data_upload]
-directory=/home/pi/lot_manager
+directory=/home/pi/lot_manager/src
 command=/usr/bin/python ceshi.py
 user=pi
 ;是否随开机自启 或者reload自启动
diff --git a/conf/common/record.conf b/conf/common/record.conf
index cb672a0..a616a0f 100644
--- a/conf/common/record.conf
+++ b/conf/common/record.conf
@@ -1,5 +1,5 @@
 [program:record]
-directory=/home/pi/lot_manager
+directory=/home/pi/lot_manager/src
 command=/usr/bin/bash record.sh
 user=pi
 ;是否随开机自启 或者reload自启动
diff --git a/conf/common/sensor_to_local.conf b/conf/common/sensor_to_local.conf
index d82049a..924ae2c 100644
--- a/conf/common/sensor_to_local.conf
+++ b/conf/common/sensor_to_local.conf
@@ -1,5 +1,5 @@
 [program:sensor_to_local]
-directory=/home/pi/lot_manager
+directory=/home/pi/lot_manager/src
 command=/usr/bin/python sensor_to_local.py
 user=pi
 ;是否随开机自启 或者reload自启动
diff --git a/conf/common/sensor_to_server.conf b/conf/common/sensor_to_server.conf
index e633819..13bd38a 100644
--- a/conf/common/sensor_to_server.conf
+++ b/conf/common/sensor_to_server.conf
@@ -1,5 +1,5 @@
 [program:sensor_to_server]
-directory=/home/pi/lot_manager
+directory=/home/pi/lot_manager/src
 command=/usr/bin/python sensor_to_server.py
 user=pi
 ;是否随开机自启 或者reload自启动
diff --git a/bash/git_push.sh b/git_push.sh
similarity index 100%
rename from bash/git_push.sh
rename to git_push.sh