diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff1189f..243a6ae 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,17 +2,29 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="efacc0a4-fad1-4fb5-94c4-6d77d05b7968" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/AirData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/configuration/DataConsumerConfiguration.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/controller/DataConsumerController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/data-consumer/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/Constants.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/repository/AirDataRepository.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/Constants.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/docker-rabbitmq/docker-compose.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cloudsetup.txt" beforeDir="false" afterPath="$PROJECT_DIR$/setup.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/data-consumer/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/data-consumer/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/AirData.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/configuration/DataConsumerConfiguration.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/controller/DataConsumerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/controller/DataConsumerController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data-consumer/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/data-consumer/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data-consumer/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/data-consumer/target/classes/application.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/DataIngestApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/DataIngestApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/configuration/DataIngestConfiguration.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/controller/DataIngestController.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/controller/DataIngestController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data-ingest/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/data-ingest/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data-ingest/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/data-ingest/target/classes/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/AirData.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/model/AirRawData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/DataSimulatorApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/DataSimulatorApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker-mongodb/docker-compose.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/etc-hosts-need-modify.txt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/artgeektech/iotmicroservices/Common.java" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -33,126 +45,151 @@
     <option name="MAKE_PROJECT_ON_SAVE" value="true" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="485">
-              <caret line="71" column="41" selection-start-line="71" selection-start-column="41" selection-end-line="71" selection-end-column="41" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DataConsumerController.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/controller/DataConsumerController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="464">
-              <caret line="32" column="7" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#725#726#0" expanded="true" />
-                <element signature="e#786#787#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data-ingest/src/main/resources/application.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="324">
-              <caret line="18" selection-end-line="18" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DataSimulatorApplication.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/DataSimulatorApplication.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="324">
-              <caret line="24" column="36" selection-start-line="24" selection-start-column="36" selection-end-line="24" selection-end-column="36" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="AirData.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/AirData.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="126">
-              <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DataConsumerConfiguration.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/configuration/DataConsumerConfiguration.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="13" column="49" lean-forward="true" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#361#362#0" expanded="true" />
-                <element signature="e#405#406#0" expanded="true" />
-                <element signature="e#516#517#0" expanded="true" />
-                <element signature="e#569#570#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DataConsumerApplication.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="13" column="38" selection-start-line="13" selection-start-column="38" selection-end-line="13" selection-end-column="38" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#441#442#0" expanded="true" />
-                <element signature="e#513#514#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data-consumer/src/main/resources/application.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="450">
-              <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DataIngestController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/controller/DataIngestController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="173">
-              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1259#1260#0" expanded="true" />
-                <element signature="e#1281#1282#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DataIngestConfiguration.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/configuration/DataIngestConfiguration.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="252">
-              <caret line="15" column="41" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="41" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <splitter split-orientation="horizontal" split-proportion="0.5190127">
+      <split-first>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/pom.xml">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="438">
+                  <caret line="78" column="21" lean-forward="true" selection-start-line="74" selection-start-column="8" selection-end-line="78" selection-end-column="21" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="DataConsumerController.java" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/controller/DataConsumerController.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="527">
+                  <caret line="38" column="30" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="30" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="Constants.java" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/Constants.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="85">
+                  <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="DataIngestController.java" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/controller/DataIngestController.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="425">
+                  <caret line="39" column="70" selection-start-line="39" selection-start-column="29" selection-end-line="39" selection-end-column="70" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="docker-compose.yml" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/docker-mongodb/docker-compose.yml">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="153">
+                  <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="AirData.java" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="136">
+                  <caret line="13" selection-start-line="13" selection-end-line="13" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="AirDataRepository.java" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/repository/AirDataRepository.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="119">
+                  <caret line="8" column="54" selection-start-line="8" selection-start-column="54" selection-end-line="8" selection-end-column="54" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/data-consumer/src/main/resources/application.yml">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="204">
+                  <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="DataConsumerApplication.java" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="340">
+                  <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="setup.txt" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/setup.txt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="170">
+                  <caret line="10" column="90" selection-start-line="10" selection-start-column="90" selection-end-line="10" selection-end-column="90" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <file leaf-file-name="DataIngestApplication.java" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/DataIngestApplication.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="136">
+                  <caret line="14" selection-start-line="14" selection-end-line="14" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/data-consumer/src/main/resources/application.yml">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="170">
+                  <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="docker-compose.yml" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/docker-mongodb/docker-compose.yml">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="187">
+                  <caret line="11" column="24" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -181,23 +218,31 @@
         <option value="$PROJECT_DIR$/service-registry/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/data-simulator/src/main/java/DataSimulator.java" />
         <option value="$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/AirDataSimulator.java" />
-        <option value="$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/AirData.java" />
-        <option value="$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/DataSimulatorApplication.java" />
         <option value="$PROJECT_DIR$/data-broker/pom.xml" />
         <option value="$PROJECT_DIR$/docker-compose.yml" />
-        <option value="$PROJECT_DIR$/data-ingest/src/main/resources/application.yml" />
-        <option value="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java" />
         <option value="$PROJECT_DIR$/data-ingest/pom.xml" />
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/data-consumer/pom.xml" />
-        <option value="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/DataIngestApplication.java" />
-        <option value="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java" />
         <option value="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/configuration/DataIngestConfiguration.java" />
         <option value="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/AirData.java" />
-        <option value="$PROJECT_DIR$/data-consumer/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/AirData.java" />
+        <option value="$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java" />
+        <option value="$PROJECT_DIR$/setup.txt" />
+        <option value="$PROJECT_DIR$/data-ingest/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/configuration/DataConsumerConfiguration.java" />
+        <option value="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/constant/Constants.java" />
+        <option value="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/DataIngestApplication.java" />
         <option value="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/controller/DataIngestController.java" />
+        <option value="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/Constants.java" />
+        <option value="$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/DataSimulatorApplication.java" />
+        <option value="$PROJECT_DIR$/docker-rabbitmq/docker-compose.yml" />
+        <option value="$PROJECT_DIR$/data-consumer/pom.xml" />
+        <option value="$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java" />
+        <option value="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/repository/AirDataRepository.java" />
+        <option value="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java" />
         <option value="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/controller/DataConsumerController.java" />
+        <option value="$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java" />
+        <option value="$PROJECT_DIR$/data-consumer/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/docker-mongodb/docker-compose.yml" />
       </list>
     </option>
   </component>
@@ -217,11 +262,11 @@
   <component name="NodePackageJsonFileManager">
     <packageJsonPaths />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-1677" />
-    <option name="y" value="143" />
-    <option name="width" value="1597" />
-    <option name="height" value="1057" />
+  <component name="ProjectFrameBounds" fullScreen="true">
+    <option name="x" value="52" />
+    <option name="y" value="23" />
+    <option name="width" value="1401" />
+    <option name="height" value="877" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -253,6 +298,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="AndroidView" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -295,16 +342,6 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="iotmicroservices" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
-              <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-consumer" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="iotmicroservices" type="462c0819:PsiDirectoryNode" />
-              <item name="configuration" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
               <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
@@ -321,77 +358,24 @@
               <item name="data-consumer" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
-              <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-ingest" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
-              <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-ingest" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
-              <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-ingest" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
-              <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-ingest" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
-              <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-ingest" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="iotmicroservices" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
-              <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-ingest" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="iotmicroservices" type="462c0819:PsiDirectoryNode" />
-              <item name="configuration" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
-              <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-ingest" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="iotmicroservices" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="model" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
               <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-ingest" type="462c0819:PsiDirectoryNode" />
+              <item name="data-consumer" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="iotmicroservices" type="462c0819:PsiDirectoryNode" />
-              <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="repository" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
               <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-ingest" type="462c0819:PsiDirectoryNode" />
+              <item name="data-consumer" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
@@ -399,45 +383,20 @@
             <path>
               <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
               <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-simulator" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
-              <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-simulator" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
-              <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-simulator" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
-              <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-simulator" type="462c0819:PsiDirectoryNode" />
+              <item name="data-consumer" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="iot-microservices" type="b2602c69:ProjectViewProjectNode" />
               <item name="iot-microservices" type="462c0819:PsiDirectoryNode" />
-              <item name="data-simulator" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="iotmicroservices" type="462c0819:PsiDirectoryNode" />
+              <item name="docker-mongodb" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -464,16 +423,22 @@
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.0" />
     <property name="restartRequiresConfirmation" value="false" />
-    <property name="settings.editor.selected.configurable" value="project.propCompiler" />
+    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Color Scheme Font" />
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/rabbitmq" />
+    </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+      <recent name="com.artgeektech.iotmicroservices.model" />
       <recent name="com.artgeektech.iotmicroservices" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.artgeektech.iotmicroservices" />
+      <recent name="com.artgeektech.iotmicroservices.constant" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/docker-mongodb" />
       <recent name="$PROJECT_DIR$/data-consumer/src/main/resources" />
       <recent name="$PROJECT_DIR$/data-ingest/src/main/resources" />
       <recent name="$PROJECT_DIR$/service-registry/src/main/resources" />
@@ -502,7 +467,7 @@
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.artgeektech.iotmicroservices.*" />
+          <option name="PATTERN" value="com.artgeektech.iotmicroservices.model.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -530,7 +495,7 @@
       <module name="data-consumer" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.artgeektech.iotmicroservices.*" />
+          <option name="PATTERN" value="com.artgeektech.iotmicroservices.model.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -540,7 +505,7 @@
       <module name="data-ingest" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.artgeektech.iotmicroservices.*" />
+          <option name="PATTERN" value="com.artgeektech.iotmicroservices.model.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
@@ -609,15 +574,16 @@
       <workItem from="1534526791877" duration="12291000" />
       <workItem from="1534541479364" duration="10359000" />
       <workItem from="1534585770378" duration="1197000" />
-      <workItem from="1534587153126" duration="14039000" />
+      <workItem from="1534587153126" duration="29416000" />
+      <workItem from="1534701486503" duration="1632000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="39610000" />
+    <option name="totallyTimeSpent" value="56619000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-1677" y="143" width="1597" height="1057" extended-state="0" />
+    <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -633,17 +599,16 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Messages" order="7" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="bottom" id="Java Enterprise" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Version Control" order="7" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.41145834" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.4675926" />
       <window_info anchor="bottom" id="Spring" order="7" weight="0.32923833" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.48125" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.37592593" />
       <window_info anchor="bottom" id="Problems" order="7" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28488746" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26824033" />
       <window_info anchor="right" id="Bean Validation" order="3" />
       <window_info id="Web" order="2" side_tool="true" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -652,9 +617,10 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Messages" order="7" />
       <window_info id="Learn" order="2" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32962963" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -664,45 +630,12 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1173">
-          <caret line="69" column="41" selection-start-line="69" selection-start-column="41" selection-end-line="69" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/service-registry/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/data-ingest/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="10" selection-start-line="14" selection-start-column="10" selection-end-line="14" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/data-ingest/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" selection-start-line="15" selection-end-line="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/data-simulator/pom.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/DataIngestApplication.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="34">
           <caret line="2" column="34" selection-start-line="2" selection-start-column="34" selection-end-line="2" selection-end-column="34" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#363#364#0" expanded="true" />
-            <element signature="e#437#438#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -711,9 +644,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="102">
           <caret line="9" column="47" lean-forward="true" selection-start-line="9" selection-start-column="47" selection-end-line="9" selection-end-column="47" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -730,8 +660,6 @@
           <caret line="10" column="48" selection-start-line="10" selection-start-column="48" selection-end-line="10" selection-end-column="48" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1259#1260#0" expanded="true" />
-            <element signature="e#1281#1282#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -777,13 +705,6 @@
     <entry file="file://$PROJECT_DIR$/service-registry/src/main/resources/application-node1.yml" />
     <entry file="file://$PROJECT_DIR$/service-registry/src/main/resources/application-node0.yml" />
     <entry file="file://$PROJECT_DIR$/service-registry/src/main/resources/application-single.yml" />
-    <entry file="file://$PROJECT_DIR$/cloudsetup.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="578">
-          <caret line="34" column="92" selection-start-line="34" selection-start-column="92" selection-end-line="34" selection-end-column="92" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/service-registry/src/main/java/com/artgeektech/iotmicroservices/DataIngestApplication.java" />
     <entry file="file://$PROJECT_DIR$/data-simulator/pom.xml">
       <provider selected="true" editor-type-id="text-editor" />
@@ -798,16 +719,6 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/data-simulator/src/main/java/DataSimulator.java" />
     <entry file="file://$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/AirDataSimulator.java" />
-    <entry file="file://$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/AirData.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="8" column="18" selection-start-line="7" selection-end-line="8" selection-end-column="18" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_171.jdk/Contents/Home/src.zip!/java/util/Timer.java" />
     <entry file="file://$PROJECT_DIR$/service-registry/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
@@ -817,165 +728,166 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/data-broker/pom.xml" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/artgeektech/iotmicroservices/Common.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/artgeektech/iotmicroservices/Common.java" />
+    <entry file="file://$PROJECT_DIR$/service-registry/src/main/java/com/artgeektech/iotmicroservices/EurekaServerApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
+        <state relative-caret-position="180">
+          <caret line="14" column="5" selection-start-line="12" selection-start-column="4" selection-end-line="14" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/docker-compose.yml">
+    <entry file="file://$PROJECT_DIR$/data-ingest/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
+        <state relative-caret-position="368">
+          <caret line="22" column="19" selection-start-line="13" selection-start-column="4" selection-end-line="22" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/etc-hosts-need-modify.txt">
+    <entry file="file://$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/model/AirRawData.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="18">
-          <caret line="1" column="93" selection-end-line="1" selection-end-column="93" />
+        <state relative-caret-position="-7">
+          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java">
+    <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/configuration/DataIngestConfiguration.java" />
+    <entry file="file://$PROJECT_DIR$/untitled1/dockerup" />
+    <entry file="file://$PROJECT_DIR$/etc-hosts-need-modify.txt" />
+    <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/configuration/DataConsumerConfiguration.java" />
+    <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/Constants.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="386">
-          <caret line="37" column="32" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="32" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="153">
+          <caret line="9" column="36" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/service-registry/src/main/java/com/artgeektech/iotmicroservices/EurekaServerApplication.java">
+    <entry file="file://$PROJECT_DIR$/data-ingest/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="14" column="5" selection-start-line="12" selection-start-column="4" selection-end-line="14" selection-end-column="5" />
+        <state relative-caret-position="136">
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data-ingest/pom.xml">
+    <entry file="file://$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/DataSimulatorApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="22" column="19" selection-start-line="13" selection-start-column="4" selection-end-line="22" selection-end-column="19" />
+        <state relative-caret-position="442">
+          <caret line="29" column="5" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data-consumer/pom.xml">
+    <entry file="file://$PROJECT_DIR$/docker-rabbitmq/docker-compose.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" />
+        <state relative-caret-position="272">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/DataIngestApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="12" column="65" selection-start-line="12" selection-start-column="65" selection-end-line="12" selection-end-column="65" />
+        <state relative-caret-position="136">
+          <caret line="14" selection-start-line="14" selection-end-line="14" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#363#364#0" expanded="true" />
-            <element signature="e#435#436#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/configuration/DataIngestConfiguration.java">
+    <entry file="file://$PROJECT_DIR$/data-consumer/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="15" column="41" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="41" />
+        <state relative-caret-position="136">
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data-ingest/src/main/resources/application.yml">
+    <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/controller/DataIngestController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="18" selection-end-line="18" />
+        <state relative-caret-position="425">
+          <caret line="39" column="70" selection-start-line="39" selection-start-column="29" selection-end-line="39" selection-end-column="70" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java">
+    <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/repository/AirDataRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="13" column="38" selection-start-line="13" selection-start-column="38" selection-end-line="13" selection-end-column="38" />
+        <state relative-caret-position="119">
+          <caret line="8" column="54" selection-start-line="8" selection-start-column="54" selection-end-line="8" selection-end-column="54" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#441#442#0" expanded="true" />
-            <element signature="e#513#514#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/controller/DataConsumerController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="485">
-          <caret line="71" column="41" selection-start-line="71" selection-start-column="41" selection-end-line="71" selection-end-column="41" />
+        <state relative-caret-position="527">
+          <caret line="38" column="30" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="30" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data-consumer/src/main/resources/application.yml">
+    <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/Constants.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
+        <state relative-caret-position="85">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/configuration/DataConsumerConfiguration.java">
+    <entry file="file://$PROJECT_DIR$/data-consumer/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="13" column="49" lean-forward="true" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#361#362#0" expanded="true" />
-            <element signature="e#405#406#0" expanded="true" />
-            <element signature="e#516#517#0" expanded="true" />
-            <element signature="e#569#570#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="204">
+          <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/AirData.java">
+    <entry file="file://$PROJECT_DIR$/docker-mongodb/docker-compose.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <state relative-caret-position="153">
+          <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data-simulator/src/main/java/com/artgeektech/iotmicroservices/DataSimulatorApplication.java">
+    <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="24" column="36" selection-start-line="24" selection-start-column="36" selection-end-line="24" selection-end-column="36" />
+        <state relative-caret-position="340">
+          <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data-ingest/src/main/java/com/artgeektech/iotmicroservices/controller/DataIngestController.java">
+    <entry file="file://$PROJECT_DIR$/setup.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="173">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1259#1260#0" expanded="true" />
-            <element signature="e#1281#1282#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="170">
+          <caret line="10" column="90" selection-start-line="10" selection-start-column="90" selection-end-line="10" selection-end-column="90" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data-consumer/src/main/java/com/artgeektech/iotmicroservices/controller/DataConsumerController.java">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="464">
-          <caret line="32" column="7" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#725#726#0" expanded="true" />
-            <element signature="e#786#787#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="438">
+          <caret line="78" column="21" lean-forward="true" selection-start-line="74" selection-start-column="8" selection-end-line="78" selection-end-column="21" />
         </state>
       </provider>
     </entry>
diff --git a/data-consumer/pom.xml b/data-consumer/pom.xml
index f186442..15002e8 100644
--- a/data-consumer/pom.xml
+++ b/data-consumer/pom.xml
@@ -20,5 +20,9 @@
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-rabbit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/data-consumer/src/main/java/com/artgeektech/iotmicroservices/Constants.java b/data-consumer/src/main/java/com/artgeektech/iotmicroservices/Constants.java
new file mode 100644
index 0000000..891aa70
--- /dev/null
+++ b/data-consumer/src/main/java/com/artgeektech/iotmicroservices/Constants.java
@@ -0,0 +1,13 @@
+package com.artgeektech.iotmicroservices;
+
+/**
+ * Created by guang on 5:49 AM 8/19/18.
+ */
+public class Constants {
+
+    public static final String EXCHANGE_NAME = "AirDataExchange";
+
+    public static final String QUEUE_NAME = "AirDataQueue";
+
+    public static final String ROUTING_KEY = "airdata.ingested";
+}
diff --git a/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java b/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java
index 49e2289..c34af5f 100644
--- a/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java
+++ b/data-consumer/src/main/java/com/artgeektech/iotmicroservices/DataConsumerApplication.java
@@ -1,9 +1,16 @@
 package com.artgeektech.iotmicroservices;
 
+import com.artgeektech.iotmicroservices.model.AirData;
+import com.artgeektech.iotmicroservices.repository.AirDataRepository;
+import org.springframework.amqp.core.*;
 import org.springframework.amqp.rabbit.annotation.EnableRabbit;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.Bean;
+
+import java.sql.Timestamp;
 
 /**
  * Created by guang on 11:42 AM 8/18/18.
@@ -12,7 +19,52 @@
 @EnableDiscoveryClient
 @EnableRabbit
 public class DataConsumerApplication {
+
+    @Autowired
+    private static AirDataRepository airDataRepository;
+
+
+    @Bean
+    public Exchange airDataExchange() {
+        return new TopicExchange(Constants.EXCHANGE_NAME);
+    }
+
+    @Bean
+    public Queue queue() {
+        return new Queue(Constants.QUEUE_NAME);
+    }
+
+    @Bean
+    public Binding binding(Queue queue, Exchange dataExchange) {
+        return BindingBuilder
+            .bind(queue)
+            .to(dataExchange)
+            .with(Constants.ROUTING_KEY).noargs();
+    }
+
     public static void main(String[] args) {
         SpringApplication.run(DataConsumerApplication.class, args);
+        System.out.println("Main in Mongo");
+
+        // save to DB
+        AirData data1 = new AirData(
+            1d, 1d, 1d, 1d,
+            new Timestamp(System.currentTimeMillis()));
+        AirData data2 = new AirData(
+            1d, 1d, 1d, 1d,
+            new Timestamp(System.currentTimeMillis()));
+        AirData data3 = new AirData(
+            2d, 1d, 1d, 1d,
+            new Timestamp(System.currentTimeMillis()));
+        airDataRepository.save(data1);
+        airDataRepository.save(data2);
+        airDataRepository.save(data3);
+        airDataRepository.save(data3);
+
+        for (AirData data: airDataRepository.findAll()) {
+            System.out.println("printing Mongo DB");
+            System.out.println(data);
+            System.out.println(data.toString());
+        }
     }
 }
diff --git a/data-consumer/src/main/java/com/artgeektech/iotmicroservices/configuration/DataConsumerConfiguration.java b/data-consumer/src/main/java/com/artgeektech/iotmicroservices/configuration/DataConsumerConfiguration.java
deleted file mode 100644
index c275a54..0000000
--- a/data-consumer/src/main/java/com/artgeektech/iotmicroservices/configuration/DataConsumerConfiguration.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.artgeektech.iotmicroservices.configuration;
-
-import org.springframework.amqp.core.*;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Created by guang on 12:00 PM 8/18/18.
- */
-@Configuration
-public class DataConsumerConfiguration {
-    @Bean
-    public Exchange dataExchange() {
-        return new TopicExchange("DataExchange");
-    }
-
-    @Bean
-    public Queue queue() {
-        return new Queue("DataQueue");
-    }
-
-    @Bean
-    public Binding binding(Queue queue, Exchange dataExchange) {
-        return BindingBuilder
-            .bind(queue)
-            .to(dataExchange)
-            .with("airdata.ingested").noargs();
-    }
-
-}
diff --git a/data-consumer/src/main/java/com/artgeektech/iotmicroservices/controller/DataConsumerController.java b/data-consumer/src/main/java/com/artgeektech/iotmicroservices/controller/DataConsumerController.java
index db3d553..0646e31 100644
--- a/data-consumer/src/main/java/com/artgeektech/iotmicroservices/controller/DataConsumerController.java
+++ b/data-consumer/src/main/java/com/artgeektech/iotmicroservices/controller/DataConsumerController.java
@@ -1,10 +1,11 @@
 package com.artgeektech.iotmicroservices.controller;
 
+import com.artgeektech.iotmicroservices.Constants;
+import com.artgeektech.iotmicroservices.model.AirData;
+import com.artgeektech.iotmicroservices.repository.AirDataRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.amqp.core.Exchange;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -14,21 +15,37 @@
 @Component
 public class DataConsumerController {
     private static final Logger logger = LoggerFactory.getLogger(DataConsumerController.class);
-    private static final String routingKey = "airdata.ingested";
 
     @Autowired
-    private RabbitTemplate rabbitTemplate;
+    private AirDataRepository airDataRepository;
 
-    @Autowired
-    private Exchange exchange;
+    @RabbitListener(queues = Constants.QUEUE_NAME)
+    public void process(AirData airData) {
+
+        logger.info("Received message from MQ '{}'", airData);
 
-    @RabbitListener(queues="DataQueue")
-    public void receive1(String message) {
-        logger.info("Received message '{}'", message);
+        // simple rule engine handling
+        if (airData.getTemperature() > 50) {
+            triggerActionAlert("Temperature too high!!");
+        }
+        if (airData.getCo2() > 50) {
+            triggerActionAlert("CO2 too high!!!");
+        }
+        if (airData.getPm2p5() > 50) {
+            triggerActionAlert("Too much Dust!!!");
+        }
+
+        // save to DB
+        airDataRepository.save(airData);
+        logger.info("Saved message to Mongo DB '{}'", airData);
+        for (AirData data: airDataRepository.findAll()) {
+            System.out.println("printing Mongo DB");
+            System.out.println(data);
+            System.out.println(data.toString());
+        }
     }
 
-//    @RabbitListener(queues="DataQueue")
-//    public void receive2(AirData message) {
-//        logger.info("Received message '{}'", message.toString());
-//    }
+    private void triggerActionAlert(String msg) {
+        System.out.println("Sending the Email Alert: " + msg);
+    }
 }
diff --git a/data-consumer/src/main/java/com/artgeektech/iotmicroservices/AirData.java b/data-consumer/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java
similarity index 53%
rename from data-consumer/src/main/java/com/artgeektech/iotmicroservices/AirData.java
rename to data-consumer/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java
index 43e31e5..c3c5f3c 100644
--- a/data-consumer/src/main/java/com/artgeektech/iotmicroservices/AirData.java
+++ b/data-consumer/src/main/java/com/artgeektech/iotmicroservices/model/AirData.java
@@ -1,12 +1,9 @@
-package com.artgeektech.iotmicroservices;
+package com.artgeektech.iotmicroservices.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
@@ -15,25 +12,9 @@
 @NoArgsConstructor
 public class AirData implements Serializable {
 
-    @NotNull
-    @Min(1)
-    @Max(100)
     private Double temperature;
-
-    @NotNull
-    @Min(1)
-    @Max(100)
     private Double humidity;
-
-    @NotNull
-    @Min(1)
-    @Max(100)
     private Double pm2p5;
-
-    @NotNull
-    @Min(1)
-    @Max(100)
     private Double co2;
-
     private Timestamp timestamp;
 }
diff --git a/data-consumer/src/main/java/com/artgeektech/iotmicroservices/repository/AirDataRepository.java b/data-consumer/src/main/java/com/artgeektech/iotmicroservices/repository/AirDataRepository.java
new file mode 100644
index 0000000..b70f99a
--- /dev/null
+++ b/data-consumer/src/main/java/com/artgeektech/iotmicroservices/repository/AirDataRepository.java
@@ -0,0 +1,10 @@
+package com.artgeektech.iotmicroservices.repository;
+
+import com.artgeektech.iotmicroservices.model.AirData;
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+/**
+ * Created by guang on 7:04 AM 8/19/18.
+ */
+public interface AirDataRepository extends MongoRepository<AirData, String> {
+}
diff --git a/data-consumer/src/main/resources/application.yml b/data-consumer/src/main/resources/application.yml
index 9b2887d..04dac75 100644
--- a/data-consumer/src/main/resources/application.yml
+++ b/data-consumer/src/main/resources/application.yml
@@ -6,6 +6,13 @@ spring:
     port: 5672
     username: guest
     password: guest
+  data:
+    mongodb:
+      host: localhost
+      port: 27072
+      database: airdata-db
+      username: root
+      password: password
 
 server:
   port: 9002                    # 指定该Eureka实例的端口
@@ -16,12 +23,3 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://service-registry:8761/eureka/
-
-app:
-  exchange:
-    name: DataExchange
-  queue:
-    name: DataQueue
-  routing:
-    key: airdata.ingested
-
diff --git a/data-consumer/target/classes/application.yml b/data-consumer/target/classes/application.yml
index 9b2887d..04dac75 100644
--- a/data-consumer/target/classes/application.yml
+++ b/data-consumer/target/classes/application.yml
@@ -6,6 +6,13 @@ spring:
     port: 5672
     username: guest
     password: guest
+  data:
+    mongodb:
+      host: localhost
+      port: 27072
+      database: airdata-db
+      username: root
+      password: password
 
 server:
   port: 9002                    # 指定该Eureka实例的端口
@@ -16,12 +23,3 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://service-registry:8761/eureka/
-
-app:
-  exchange:
-    name: DataExchange
-  queue:
-    name: DataQueue
-  routing:
-    key: airdata.ingested
-
diff --git a/data-ingest/src/main/java/com/artgeektech/iotmicroservices/Constants.java b/data-ingest/src/main/java/com/artgeektech/iotmicroservices/Constants.java
new file mode 100644
index 0000000..891aa70
--- /dev/null
+++ b/data-ingest/src/main/java/com/artgeektech/iotmicroservices/Constants.java
@@ -0,0 +1,13 @@
+package com.artgeektech.iotmicroservices;
+
+/**
+ * Created by guang on 5:49 AM 8/19/18.
+ */
+public class Constants {
+
+    public static final String EXCHANGE_NAME = "AirDataExchange";
+
+    public static final String QUEUE_NAME = "AirDataQueue";
+
+    public static final String ROUTING_KEY = "airdata.ingested";
+}
diff --git a/data-ingest/src/main/java/com/artgeektech/iotmicroservices/DataIngestApplication.java b/data-ingest/src/main/java/com/artgeektech/iotmicroservices/DataIngestApplication.java
index cffa4c1..2185ca9 100644
--- a/data-ingest/src/main/java/com/artgeektech/iotmicroservices/DataIngestApplication.java
+++ b/data-ingest/src/main/java/com/artgeektech/iotmicroservices/DataIngestApplication.java
@@ -1,14 +1,23 @@
 package com.artgeektech.iotmicroservices;
 
+import org.springframework.amqp.core.Exchange;
+import org.springframework.amqp.core.TopicExchange;
 import org.springframework.amqp.rabbit.annotation.EnableRabbit;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableRabbit
 public class DataIngestApplication {
+
+    @Bean
+    public Exchange airDataExchange() {
+        return new TopicExchange(Constants.EXCHANGE_NAME);
+    }
+
     public static void main(String[] args) {
         SpringApplication.run(DataIngestApplication.class, args);
     }
diff --git a/data-ingest/src/main/java/com/artgeektech/iotmicroservices/configuration/DataIngestConfiguration.java b/data-ingest/src/main/java/com/artgeektech/iotmicroservices/configuration/DataIngestConfiguration.java
deleted file mode 100644
index 046c75a..0000000
--- a/data-ingest/src/main/java/com/artgeektech/iotmicroservices/configuration/DataIngestConfiguration.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.artgeektech.iotmicroservices.configuration;
-
-import org.springframework.amqp.core.Exchange;
-import org.springframework.amqp.core.TopicExchange;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Created by guang on 3:43 AM 8/18/18.
- */
-
-@Configuration
-public class DataIngestConfiguration {
-    @Bean
-    public Exchange dataExchange() {
-        return new TopicExchange("DataExchange");
-    }
-}
diff --git a/data-ingest/src/main/java/com/artgeektech/iotmicroservices/controller/DataIngestController.java b/data-ingest/src/main/java/com/artgeektech/iotmicroservices/controller/DataIngestController.java
index fa24fd2..6f17632 100644
--- a/data-ingest/src/main/java/com/artgeektech/iotmicroservices/controller/DataIngestController.java
+++ b/data-ingest/src/main/java/com/artgeektech/iotmicroservices/controller/DataIngestController.java
@@ -1,5 +1,6 @@
 package com.artgeektech.iotmicroservices.controller;
 
+import com.artgeektech.iotmicroservices.Constants;
 import com.artgeektech.iotmicroservices.model.AirData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,7 +21,6 @@
 public class DataIngestController {
 
     private static final Logger logger = LoggerFactory.getLogger(DataIngestController.class);
-    private static final String routingKey = "airdata.ingested";
 
     @Autowired
     private RabbitTemplate rabbitTemplate;
@@ -31,8 +31,8 @@ public class DataIngestController {
     @PostMapping("/ingest")
     public AirData ingest(@Valid @RequestBody AirData airData) {
         preprocess(airData);
-        rabbitTemplate.convertAndSend(exchange.getName(), routingKey, airData.toString());
-        logger.info(airData.toString());
+        rabbitTemplate.convertAndSend(exchange.getName(), Constants.ROUTING_KEY, airData);
+        logger.info("ingested data: " + airData.toString());
         return airData;
     }
 
diff --git a/data-ingest/src/main/resources/application.yml b/data-ingest/src/main/resources/application.yml
index b3c2707..a3cd410 100644
--- a/data-ingest/src/main/resources/application.yml
+++ b/data-ingest/src/main/resources/application.yml
@@ -16,4 +16,3 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://service-registry:8761/eureka/
-
diff --git a/data-ingest/target/classes/application.yml b/data-ingest/target/classes/application.yml
index b3c2707..a3cd410 100644
--- a/data-ingest/target/classes/application.yml
+++ b/data-ingest/target/classes/application.yml
@@ -16,4 +16,3 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://service-registry:8761/eureka/
-
diff --git a/data-simulator/src/main/java/com/artgeektech/iotmicroservices/DataSimulatorApplication.java b/data-simulator/src/main/java/com/artgeektech/iotmicroservices/DataSimulatorApplication.java
index e0e8b46..eca825e 100644
--- a/data-simulator/src/main/java/com/artgeektech/iotmicroservices/DataSimulatorApplication.java
+++ b/data-simulator/src/main/java/com/artgeektech/iotmicroservices/DataSimulatorApplication.java
@@ -1,5 +1,6 @@
 package com.artgeektech.iotmicroservices;
 
+import com.artgeektech.iotmicroservices.model.AirRawData;
 import org.springframework.http.HttpEntity;
 import org.springframework.web.client.RestTemplate;
 
@@ -11,8 +12,9 @@ public class DataSimulatorApplication {
 
     private static final String resourceUrl = "http://data-ingest:9001/iot/airdata/ingest";
     private static final RestTemplate restTemplate = new RestTemplate();
+    private static final Random random = new Random();
     private static double minVal = 10;
-    private static double maxVal = 25;
+    private static double maxVal = 30;
     private static Timer timer = new Timer();
     private static int interval = 1000;
 
@@ -20,14 +22,19 @@ public static void main(String[] args) {
         timer.scheduleAtFixedRate(new TimerTask() {
             @Override
             public void run() {
-                AirData payload = new AirData(genRandomDouble(), genRandomDouble(), genRandomDouble(), genRandomDouble());
-                HttpEntity<AirData> request = new HttpEntity<>(payload);
-                restTemplate.postForObject(resourceUrl, request, AirData.class);
+                AirRawData payload = new AirRawData(genRandom(), genRandom(), genRandom(), genRandom());
+                HttpEntity<AirRawData> request = new HttpEntity<>(payload);
+                restTemplate.postForObject(resourceUrl, request, AirRawData.class);
             }
         }, 0, interval);
     }
 
-    private static double genRandomDouble() {
-        return minVal + new Random().nextDouble() * (maxVal - minVal);
+    private static double genRandom() {
+        int randInt = random.nextInt(5);
+        if (randInt == 0) {
+            return 100;
+        } else {
+            return minVal + random.nextDouble() * (maxVal - minVal);
+        }
     }
 }
diff --git a/data-simulator/src/main/java/com/artgeektech/iotmicroservices/AirData.java b/data-simulator/src/main/java/com/artgeektech/iotmicroservices/model/AirRawData.java
similarity index 65%
rename from data-simulator/src/main/java/com/artgeektech/iotmicroservices/AirData.java
rename to data-simulator/src/main/java/com/artgeektech/iotmicroservices/model/AirRawData.java
index 053f28d..71f36f3 100644
--- a/data-simulator/src/main/java/com/artgeektech/iotmicroservices/AirData.java
+++ b/data-simulator/src/main/java/com/artgeektech/iotmicroservices/model/AirRawData.java
@@ -1,13 +1,15 @@
-package com.artgeektech.iotmicroservices;
+package com.artgeektech.iotmicroservices.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class AirData {
+public class AirRawData implements Serializable {
     private double temperature;
     private double humidity;
     private double pm2p5;
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 9dbda24..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-rabbitmq:
-  image: rabbitmq:management
-  ports:
-    - "5672:5672"
-    - "15672:15672"
\ No newline at end of file
diff --git a/docker-mongodb/data/db/WiredTiger b/docker-mongodb/data/db/WiredTiger
new file mode 100644
index 0000000..d59e090
--- /dev/null
+++ b/docker-mongodb/data/db/WiredTiger
@@ -0,0 +1,2 @@
+WiredTiger
+WiredTiger 3.1.0: (April 23, 2018)
diff --git a/docker-mongodb/data/db/WiredTiger.lock b/docker-mongodb/data/db/WiredTiger.lock
new file mode 100644
index 0000000..3d84206
--- /dev/null
+++ b/docker-mongodb/data/db/WiredTiger.lock
@@ -0,0 +1 @@
+WiredTiger lock file
diff --git a/docker-mongodb/data/db/WiredTiger.turtle b/docker-mongodb/data/db/WiredTiger.turtle
new file mode 100644
index 0000000..2f21de6
--- /dev/null
+++ b/docker-mongodb/data/db/WiredTiger.turtle
@@ -0,0 +1,6 @@
+WiredTiger version string
+WiredTiger 3.1.0: (April 23, 2018)
+WiredTiger version
+major=3,minor=1,patch=0
+file:WiredTiger.wt
+access_pattern_hint=none,allocation_size=4KB,app_metadata=,assert=(commit_timestamp=none,read_timestamp=none),block_allocation=best,block_compressor=,cache_resident=false,checkpoint=(WiredTigerCheckpoint.26=(addr="018981e404155bf88a81e44460bf888b81e489110c40808080e3010fc0e23fc0",order=26,time=1534787834,size=28672,write_gen=46)),checkpoint_lsn=(4,66816),checksum=uncompressed,collator=,columns=,dictionary=0,encryption=(keyid=,name=),format=btree,huffman_key=,huffman_value=,id=0,ignore_in_memory_cache_size=false,internal_item_max=0,internal_key_max=0,internal_key_truncate=true,internal_page_max=4KB,key_format=S,key_gap=10,leaf_item_max=0,leaf_key_max=0,leaf_page_max=32KB,leaf_value_max=0,log=(enabled=true),memory_page_max=5MB,os_cache_dirty_max=0,os_cache_max=0,prefix_compression=false,prefix_compression_min=4,split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90,value_format=S,version=(major=1,minor=1)
diff --git a/docker-mongodb/data/db/WiredTiger.wt b/docker-mongodb/data/db/WiredTiger.wt
new file mode 100644
index 0000000..9e02179
Binary files /dev/null and b/docker-mongodb/data/db/WiredTiger.wt differ
diff --git a/docker-mongodb/data/db/WiredTigerLAS.wt b/docker-mongodb/data/db/WiredTigerLAS.wt
new file mode 100644
index 0000000..3f019cb
Binary files /dev/null and b/docker-mongodb/data/db/WiredTigerLAS.wt differ
diff --git a/docker-mongodb/data/db/_mdb_catalog.wt b/docker-mongodb/data/db/_mdb_catalog.wt
new file mode 100644
index 0000000..b2600c4
Binary files /dev/null and b/docker-mongodb/data/db/_mdb_catalog.wt differ
diff --git a/docker-mongodb/data/db/collection-0--8088163348535167796.wt b/docker-mongodb/data/db/collection-0--8088163348535167796.wt
new file mode 100644
index 0000000..3f019cb
Binary files /dev/null and b/docker-mongodb/data/db/collection-0--8088163348535167796.wt differ
diff --git a/docker-mongodb/data/db/collection-0--984580125546635896.wt b/docker-mongodb/data/db/collection-0--984580125546635896.wt
new file mode 100644
index 0000000..c6a36fe
Binary files /dev/null and b/docker-mongodb/data/db/collection-0--984580125546635896.wt differ
diff --git a/docker-mongodb/data/db/collection-2--8088163348535167796.wt b/docker-mongodb/data/db/collection-2--8088163348535167796.wt
new file mode 100644
index 0000000..3f019cb
Binary files /dev/null and b/docker-mongodb/data/db/collection-2--8088163348535167796.wt differ
diff --git a/docker-mongodb/data/db/collection-2--984580125546635896.wt b/docker-mongodb/data/db/collection-2--984580125546635896.wt
new file mode 100644
index 0000000..2c68426
Binary files /dev/null and b/docker-mongodb/data/db/collection-2--984580125546635896.wt differ
diff --git a/docker-mongodb/data/db/collection-4--8088163348535167796.wt b/docker-mongodb/data/db/collection-4--8088163348535167796.wt
new file mode 100644
index 0000000..9385079
Binary files /dev/null and b/docker-mongodb/data/db/collection-4--8088163348535167796.wt differ
diff --git a/docker-mongodb/data/db/collection-4--984580125546635896.wt b/docker-mongodb/data/db/collection-4--984580125546635896.wt
new file mode 100644
index 0000000..222a261
Binary files /dev/null and b/docker-mongodb/data/db/collection-4--984580125546635896.wt differ
diff --git a/docker-mongodb/data/db/diagnostic.data/metrics.2018-08-19T13-33-01Z-00000 b/docker-mongodb/data/db/diagnostic.data/metrics.2018-08-19T13-33-01Z-00000
new file mode 100644
index 0000000..b5f9232
Binary files /dev/null and b/docker-mongodb/data/db/diagnostic.data/metrics.2018-08-19T13-33-01Z-00000 differ
diff --git a/docker-mongodb/data/db/diagnostic.data/metrics.2018-08-19T14-25-15Z-00000 b/docker-mongodb/data/db/diagnostic.data/metrics.2018-08-19T14-25-15Z-00000
new file mode 100644
index 0000000..98db482
Binary files /dev/null and b/docker-mongodb/data/db/diagnostic.data/metrics.2018-08-19T14-25-15Z-00000 differ
diff --git a/docker-mongodb/data/db/diagnostic.data/metrics.2018-08-19T14-25-42Z-00000 b/docker-mongodb/data/db/diagnostic.data/metrics.2018-08-19T14-25-42Z-00000
new file mode 100644
index 0000000..019baf8
Binary files /dev/null and b/docker-mongodb/data/db/diagnostic.data/metrics.2018-08-19T14-25-42Z-00000 differ
diff --git a/docker-mongodb/data/db/diagnostic.data/metrics.2018-08-19T17-41-08Z-00000 b/docker-mongodb/data/db/diagnostic.data/metrics.2018-08-19T17-41-08Z-00000
new file mode 100644
index 0000000..4d66516
Binary files /dev/null and b/docker-mongodb/data/db/diagnostic.data/metrics.2018-08-19T17-41-08Z-00000 differ
diff --git a/docker-mongodb/data/db/diagnostic.data/metrics.interim b/docker-mongodb/data/db/diagnostic.data/metrics.interim
new file mode 100644
index 0000000..4b2b09b
Binary files /dev/null and b/docker-mongodb/data/db/diagnostic.data/metrics.interim differ
diff --git a/docker-mongodb/data/db/index-1--8088163348535167796.wt b/docker-mongodb/data/db/index-1--8088163348535167796.wt
new file mode 100644
index 0000000..3f019cb
Binary files /dev/null and b/docker-mongodb/data/db/index-1--8088163348535167796.wt differ
diff --git a/docker-mongodb/data/db/index-1--984580125546635896.wt b/docker-mongodb/data/db/index-1--984580125546635896.wt
new file mode 100644
index 0000000..e5f2abf
Binary files /dev/null and b/docker-mongodb/data/db/index-1--984580125546635896.wt differ
diff --git a/docker-mongodb/data/db/index-3--8088163348535167796.wt b/docker-mongodb/data/db/index-3--8088163348535167796.wt
new file mode 100644
index 0000000..3f019cb
Binary files /dev/null and b/docker-mongodb/data/db/index-3--8088163348535167796.wt differ
diff --git a/docker-mongodb/data/db/index-3--984580125546635896.wt b/docker-mongodb/data/db/index-3--984580125546635896.wt
new file mode 100644
index 0000000..83552a4
Binary files /dev/null and b/docker-mongodb/data/db/index-3--984580125546635896.wt differ
diff --git a/docker-mongodb/data/db/index-5--8088163348535167796.wt b/docker-mongodb/data/db/index-5--8088163348535167796.wt
new file mode 100644
index 0000000..6acb4a7
Binary files /dev/null and b/docker-mongodb/data/db/index-5--8088163348535167796.wt differ
diff --git a/docker-mongodb/data/db/index-5--984580125546635896.wt b/docker-mongodb/data/db/index-5--984580125546635896.wt
new file mode 100644
index 0000000..f87aeb7
Binary files /dev/null and b/docker-mongodb/data/db/index-5--984580125546635896.wt differ
diff --git a/docker-mongodb/data/db/index-6--8088163348535167796.wt b/docker-mongodb/data/db/index-6--8088163348535167796.wt
new file mode 100644
index 0000000..d4bf0db
Binary files /dev/null and b/docker-mongodb/data/db/index-6--8088163348535167796.wt differ
diff --git a/docker-mongodb/data/db/index-6--984580125546635896.wt b/docker-mongodb/data/db/index-6--984580125546635896.wt
new file mode 100644
index 0000000..3530689
Binary files /dev/null and b/docker-mongodb/data/db/index-6--984580125546635896.wt differ
diff --git a/docker-mongodb/data/db/journal/WiredTigerLog.0000000004 b/docker-mongodb/data/db/journal/WiredTigerLog.0000000004
new file mode 100644
index 0000000..4614b2e
Binary files /dev/null and b/docker-mongodb/data/db/journal/WiredTigerLog.0000000004 differ
diff --git a/docker-mongodb/data/db/journal/WiredTigerPreplog.0000000001 b/docker-mongodb/data/db/journal/WiredTigerPreplog.0000000001
new file mode 100644
index 0000000..af27d83
Binary files /dev/null and b/docker-mongodb/data/db/journal/WiredTigerPreplog.0000000001 differ
diff --git a/docker-mongodb/data/db/journal/WiredTigerPreplog.0000000002 b/docker-mongodb/data/db/journal/WiredTigerPreplog.0000000002
new file mode 100644
index 0000000..af27d83
Binary files /dev/null and b/docker-mongodb/data/db/journal/WiredTigerPreplog.0000000002 differ
diff --git a/docker-mongodb/data/db/mongod.lock b/docker-mongodb/data/db/mongod.lock
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/docker-mongodb/data/db/mongod.lock
@@ -0,0 +1 @@
+1
diff --git a/docker-mongodb/data/db/sizeStorer.wt b/docker-mongodb/data/db/sizeStorer.wt
new file mode 100644
index 0000000..5e8b70c
Binary files /dev/null and b/docker-mongodb/data/db/sizeStorer.wt differ
diff --git a/docker-mongodb/data/db/storage.bson b/docker-mongodb/data/db/storage.bson
new file mode 100644
index 0000000..276b694
Binary files /dev/null and b/docker-mongodb/data/db/storage.bson differ
diff --git a/docker-mongodb/docker-compose.yml b/docker-mongodb/docker-compose.yml
new file mode 100644
index 0000000..c2aa936
--- /dev/null
+++ b/docker-mongodb/docker-compose.yml
@@ -0,0 +1,15 @@
+mongodb:
+  image: mongo:latest
+  container_name: "mongodb"
+  environment:
+    - MONGO_DATA_DIR=/data/db
+    - MONGO_LOG_DIR=/dev/null
+    - AUTH=yes
+    - MONGODB_ADMIN_USER=root
+    - MONGODB_ADMIN_PASS=password
+    - MONGODB_APPLICATION_DATABASE=airdata-db
+  volumes:
+    - ./data/db:/data/db
+  ports:
+    - 27018:27017
+  command: mongod --smallfiles --logpath=/dev/null # --quiet
\ No newline at end of file
diff --git a/docker-rabbitmq/docker-compose.yml b/docker-rabbitmq/docker-compose.yml
new file mode 100644
index 0000000..7db4553
--- /dev/null
+++ b/docker-rabbitmq/docker-compose.yml
@@ -0,0 +1,6 @@
+rabbitmq:
+  image: rabbitmq:management
+  container_name: "rabbitmq"
+  ports:
+    - 5672:5672
+    - 15672:15672
\ No newline at end of file
diff --git a/etc-hosts-need-modify.txt b/etc-hosts-need-modify.txt
deleted file mode 100644
index 1a13293..0000000
--- a/etc-hosts-need-modify.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# IoT Microservices Local Hosts
-127.0.0.1 serviceregistry1 serviceregistry2 serviceregistry3 serviceregistry service-registry
\ No newline at end of file
diff --git a/cloudsetup.txt b/setup.txt
similarity index 82%
rename from cloudsetup.txt
rename to setup.txt
index 06e24fc..1d077ce 100644
--- a/cloudsetup.txt
+++ b/setup.txt
@@ -32,4 +32,8 @@ eureka:
     hostname: serviceregistry3
   client:
     serviceUrl:
-      defaultZone: http://serviceregistry1:8761/eureka/,http://serviceregistry2:8762/eureka/
\ No newline at end of file
+      defaultZone: http://serviceregistry1:8761/eureka/,http://serviceregistry2:8762/eureka/
+
+
+# IoT Microservices Local Hosts
+127.0.0.1 serviceregistry1 serviceregistry2 serviceregistry3 serviceregistry service-registry
\ No newline at end of file
diff --git a/src/main/java/com/artgeektech/iotmicroservices/Common.java b/src/main/java/com/artgeektech/iotmicroservices/Common.java
deleted file mode 100644
index 9d3525c..0000000
--- a/src/main/java/com/artgeektech/iotmicroservices/Common.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.artgeektech.iotmicroservices;
-
-/**
- * Created by guang on 2:52 AM 8/18/18.
- */
-public class Common {
-}