refactor

LizzyLi312 · Apr 26, 2019 · ca1f805 · ca1f805
1 parent 8d0a6b1
commit ca1f805
Show file tree

Hide file tree

Showing 25 changed files with 520 additions and 227 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/iot-microservices.iml b/.idea/iot-microservices.iml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/data-consumer/src/main/java/com/artgeektech/iotmicroservices/service/RuleEngineService.java b/data-consumer/src/main/java/com/artgeektech/iotmicroservices/service/RuleEngineService.java
@@ -24,5 +24,7 @@ public void applyRules(HealthMonitorData data) {
 
     private void triggerActionAlert(String msg) {
         System.out.println("\n\nAction Triggered! \n!!!!!Sending the Email Alert: " + msg + "\n\n");
+//        sendEmail
+//        sendText;
     }
 }
diff --git a/data-consumer/src/main/resources/application.yml b/data-consumer/src/main/resources/application.yml
@@ -10,7 +10,7 @@ spring:
     mongodb:
       host: localhost
       port: 27017
-      database: airdata_db
+      database: healthdata_db
 
 server:
   port: 9003                    # 指定该Eureka实例的端口

diff --git a/data-consumer/target/classes/META-INF/data-consumer.kotlin_module b/data-consumer/target/classes/META-INF/data-consumer.kotlin_module
diff --git a/data-consumer/target/classes/application.yml b/data-consumer/target/classes/application.yml
@@ -10,7 +10,7 @@ spring:
     mongodb:
       host: localhost
       port: 27017
-      database: airdata_db
+      database: healthdata_db
 
 server:
   port: 9003                    # 指定该Eureka实例的端口

diff --git a/data-dashboard/target/classes/META-INF/data-dashboard.kotlin_module b/data-dashboard/target/classes/META-INF/data-dashboard.kotlin_module
diff --git a/data-ingest/src/main/resources/application.yml b/data-ingest/src/main/resources/application.yml
@@ -16,3 +16,4 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://service-registry:8761/eureka/
+
diff --git a/data-ingest/target/classes/META-INF/data-ingest.kotlin_module b/data-ingest/target/classes/META-INF/data-ingest.kotlin_module
diff --git a/data-ingest/target/classes/application.yml b/data-ingest/target/classes/application.yml
@@ -16,3 +16,4 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://service-registry:8761/eureka/
+
diff --git a/data-simulator/target/classes/META-INF/data-simulator.kotlin_module b/data-simulator/target/classes/META-INF/data-simulator.kotlin_module
diff --git a/docker-mongodb/data/db/WiredTiger.turtle b/docker-mongodb/data/db/WiredTiger.turtle
@@ -3,4 +3,4 @@ WiredTiger 3.1.1: (July 12, 2018)
 WiredTiger version
 major=3,minor=1,patch=1
 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.261=(addr="018081e42a48fc348181e4bbb242178281e4c6518509808080e2efc0e22fc0",order=261,time=1553792889,size=24576,write_gen=518)),checkpoint_lsn=(6,146304),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_image_max=0,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)
+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.328=(addr="018381e495aac7858481e44a6ddf158581e4c919081e808080e2cfc0e21fc0",order=328,time=1554940607,size=20480,write_gen=649)),checkpoint_lsn=(3,840448),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_image_max=0,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
diff --git a/docker-mongodb/data/db/_mdb_catalog.wt b/docker-mongodb/data/db/_mdb_catalog.wt
diff --git a/docker-mongodb/data/db/collection-2--398853363317552182.wt b/docker-mongodb/data/db/collection-2--398853363317552182.wt
diff --git a/docker-mongodb/data/db/collection-4--398853363317552182.wt b/docker-mongodb/data/db/collection-4--398853363317552182.wt
diff --git a/docker-mongodb/data/db/collection-7--398853363317552182.wt b/docker-mongodb/data/db/collection-7--398853363317552182.wt
diff --git a/docker-mongodb/data/db/diagnostic.data/metrics.interim b/docker-mongodb/data/db/diagnostic.data/metrics.interim
diff --git a/docker-mongodb/data/db/index-3--398853363317552182.wt b/docker-mongodb/data/db/index-3--398853363317552182.wt
diff --git a/docker-mongodb/data/db/index-5--398853363317552182.wt b/docker-mongodb/data/db/index-5--398853363317552182.wt
diff --git a/docker-mongodb/data/db/index-6--398853363317552182.wt b/docker-mongodb/data/db/index-6--398853363317552182.wt
diff --git a/docker-mongodb/data/db/index-8--398853363317552182.wt b/docker-mongodb/data/db/index-8--398853363317552182.wt
diff --git a/docker-mongodb/data/db/mongod.lock b/docker-mongodb/data/db/mongod.lock
@@ -1 +0,0 @@
-1

diff --git a/docker-mongodb/data/db/sizeStorer.wt b/docker-mongodb/data/db/sizeStorer.wt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@ eureka:
		client:
		serviceUrl:
		defaultZone: http://service-registry:8761/eureka/