update

bash/git_update.sh

@@ -3,8 +3,8 @@ set -e
 # git更新
 git pull origin master --force
 # 配置文件复制到supervisor管理
-cp -r conf/*.conf /etc/supervisor/conf.d/
-cp -r var_conf/push_stream_ + $device_name
+cp -r ../conf/common/*.conf /etc/supervisor/conf.d/
+cp -r ../conf/var/$device_name/*.conf  /etc/supervisor/conf.d/
 # 更新配置文件
 supervisorctl reread
 supervisorctl update

bash/test.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+echo $device_name
+cp -r ../conf/var/$device_name/*.conf  /etc/supervisor/conf.d/

src/ceshi.py

@@ -1,12 +1,3 @@
-import serial
-import time
-import struct
-import json
-import paho.mqtt.client as mqtt
-
-from api import add
-from db.models.log_data_model import LOT_DATA
-
 import subprocess
 import time
 import paho.mqtt.client as mqtt

src/sensor_to_local.py

@@ -2,7 +2,7 @@ import time
 
 import serial
 
-from api import add
+from db.api import add
 from db.models.log_data_model import LOT_DATA
 
 if __name__ == '__main__':

src/sensor_to_server.py

@@ -5,7 +5,7 @@ import time
 import serial
 import paho.mqtt.client as mqtt
 
-from api import add
+from db.api import add
 from db.models.log_data_model import LOT_DATA
 
 

test.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-echo $device_name