Merge pull request #56 from ychung-mot/0.12

Weahter API from azurewebsite: not via API Gateway
bcgov · Aug 23, 2022 · 0db3044 · 0db3044
2 parents 154d1b3 + 5cc3abf
commit 0db3044
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CameraWebApp/Pages/Index.cshtml b/CameraWebApp/Pages/Index.cshtml
@@ -12,7 +12,7 @@
 <div class="container">
 
     <div class="container my-3">
-        Last fetched at @Model.UpdatedTime UTC
+        Last updated at @Model.UpdatedTime UTC
     </div>
 
     <div class="my-1 mx-1">

diff --git a/integrations/open511-ghostcms/src/main/java/org/moti/ecp/GhostCMSRouter.java b/integrations/open511-ghostcms/src/main/java/org/moti/ecp/GhostCMSRouter.java
@@ -51,6 +51,7 @@ public void configure() {
 
         // Call IoT Central API
         .setHeader(Exchange.HTTP_METHOD, simple("GET"))
+        .setHeader("Authorization", simple("{{iotcentral.auth}}"))   
         .log("API Call to : https://{{iotcentral.weather.api}}")
         .toD("https://{{iotcentral.weather.api}}")
 

diff --git a/integrations/open511-ghostcms/src/main/resources/application.properties b/integrations/open511-ghostcms/src/main/resources/application.properties
@@ -30,7 +30,9 @@ ghostcms.jwtAudience=/v4/admin/
 ghostcms.daysToLive=5
 
 #IoT Central
-iotcentral.weather.api=moti-weather-dev.api.gov.bc.ca/weather
+iotcentral.auth=${IOT_CENTRAL_AUTH}
+iotcentral.weather.api=moti-iot-test.azurewebsites.net/api/weather/devices/iotcentral/35094/telemetries/latest
+
 
 #Open 511
 #events URL

diff --git a/integrations/open511-ghostcms/target/classes/application.properties b/integrations/open511-ghostcms/target/classes/application.properties
@@ -30,7 +30,9 @@ ghostcms.jwtAudience=/v4/admin/
 ghostcms.daysToLive=5
 
 #IoT Central
-iotcentral.weather.api=moti-weather-dev.api.gov.bc.ca/weather
+iotcentral.auth=${IOT_CENTRAL_AUTH}
+iotcentral.weather.api=moti-iot-test.azurewebsites.net/api/weather/devices/iotcentral/35094/telemetries/latest
+
 
 #Open 511
 #events URL