Merge branch 'pzb' of http://192.168.136.45:3000/SERVER/AnsjerServer into pzb

Ansjer/mqtt/mqtt_client.py

@@ -11,6 +11,29 @@
 @file: mqtt_client.py
 @Contact: chanjunkai@163.com
 """
+
+# encoding: utf-8
+
+
+import paho.mqtt.client as mqtt
+
+
+def on_connect(client, userdata, flags, rc):
+    print("Connected with result code "+str(rc))
+    client.subscribe("chat")
+
+
+def on_message(client, userdata, msg):
+    print(msg.topic+" " + ":" + str(msg.payload))
+
+client = mqtt.Client()
+client.on_connect = on_connect
+client.on_message = on_message
+client.connect("192.168.136.45", 1883, 60)
+client.loop_forever()
+
+
+exit()
 import paho.mqtt.client as mqtt
 
 HOST = "192.168.136.45"

Controller/AppInfo.py

@@ -78,7 +78,9 @@ class AppInfo(View):
                                          'app_type': app_info.app_type,
                                          'downloadLink': app_info.downloadLink,
                                          'id': app_info.id,
-                                         'bundleVersion': app_info.bundleVersion})
+                                         'bundleVersion': app_info.bundleVersion,
+                                         'minAppversion':app_info.minAppversion
+                                         })
         else:
             return response.json(444, 'app_type,appBundleId')