Merge branch 'develop'

myems-admin/app/controllers/settings/datasource/datasource.controller.js

@@ -53,6 +53,7 @@ app.controller('DataSourceController', function(
 			{"id":"modbus-rtu", "name": "Modbus RTU"},
 			{"id":"mongodb", "name": "MongoDB"},
 			{"id":"mqtt-acrel", "name": "MQTT ACREL"},
+			{"id":"mqtt-adw300", "name": "MQTT ADW300"},
 			{"id":"mqtt-huiju", "name": "MQTT HUIJU"},
 			{"id":"mqtt-md4220", "name": "MQTT MD4220"},
 			{"id":"mqtt-seg", "name": "MQTT SEG"},

myems-api/core/datasource.py

@@ -113,6 +113,7 @@ class DataSourceCollection:
                  'modbus-tcp',
                  'mongodb',
                  'mqtt-acrel',
+                 'mqtt-adw300',
                  'mqtt-huiju',
                  'mqtt-md4220',
                  'mqtt-seg',
@@ -341,6 +342,7 @@ class DataSourceItem:
                  'modbus-tcp',
                  'mongodb',
                  'mqtt-acrel',
+                 'mqtt-adw300',
                  'mqtt-huiju',
                  'mqtt-md4220',
                  'mqtt-seg',
@@ -626,6 +628,7 @@ class DataSourceImport:
                  'modbus-tcp',
                  'mongodb',
                  'mqtt-acrel',
+                 'mqtt-adw300',
                  'mqtt-huiju',
                  'mqtt-md4220',
                  'mqtt-seg',