Merge commit 'mqdev' into mqaddFeature

wu_xinjun

2022-06-07 da6ff0858f4997f79f5d8cdc88b7367a5cb710b1

 src/Server.py

@@ -10,27 +10,24 @@
from zmq import device


batfile_dir = os.path.join(__file__, "..", "protos/compile.bat" )
batfile_path = os.path.abspath(batfile_dir)
os.system(batfile_path)

from protos import aerial_pb2 as pb
from engine import MessageThreads as ths
from .engine.DeviceManager import DeviceManager
from .engine.MessageQueueThread import MessageQueueThread
from .protos import aerial_pb2 as pb



class MyServer(Flask):
    def __init__(self, MQhost, MQuser, MQpassword, WEBhost, WEBport, SAVEfolder):
    def __init__(self, host, user, password, queue, port, SAVEfolder):
        Flask.__init__(self, __name__)
        # rabbit MQ
        self.MQhost = MQhost
        self.MQuser = MQuser
        self.MQpassword = MQpassword
        self.parameters = None
        # Web server
        self.WEBhost = WEBhost
        self.WEBport = WEBport
        self.SAVEfolder = SAVEfolder
        self.host = host
        self.user = user
        self.password = password
        self.queue = queue
        self.port = port
        global save_folder
        save_folder = SAVEfolder
        

        self.route('/api', methods=['POST'])(self.api)
        self.route('/', methods=['GET'])(self.hello)
        self._def_routes()
@@ -151,6 +148,7 @@
        self.run_rabbitmq()
        self.run(debug=False, host=self.WEBhost, port=self.WEBport)

<<<<<<< HEAD

if __name__ == "__main__":
    def help():
@@ -173,3 +171,5 @@
        help()
    server = MyServer(MQhost, MQuser, MQpassword, WEBhost, WEBport, SAVEfolder)
    server.run_all()
=======
>>>>>>> aa8a0ba3a86ff5dbbdfcd68c72a5e70e1c52e877