diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..d18f7ed
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 90fb8e3..119ef33 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
}
group 'com.wasteinformationserver'
-version '1.0-SNAPSHOT'
+version '0.1-Beta'
sourceCompatibility = 1.8
@@ -32,4 +32,18 @@ task run (type: JavaExec){
description = "Secure algorythm testing"
main = 'com.wasteinformationserver.main'
classpath = sourceSets.main.runtimeClasspath
+}
+
+task createProperties(dependsOn: processResources) {
+ doLast {
+ new File("$projectDir/src/resources/version.properties").withWriter { w ->
+ Properties p = new Properties()
+ p['version'] = project.version.toString()
+ p.store w, null
+ }
+ }
+}
+
+classes {
+ dependsOn createProperties
}
\ No newline at end of file
diff --git a/src/java/com/wasteinformationserver/basicutils/Info.java b/src/java/com/wasteinformationserver/basicutils/Info.java
new file mode 100644
index 0000000..03b3834
--- /dev/null
+++ b/src/java/com/wasteinformationserver/basicutils/Info.java
@@ -0,0 +1,35 @@
+package com.wasteinformationserver.basicutils;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Properties;
+
+public class Info {
+ public static String version="0.0";
+ public static String builddate;
+
+
+ public static void init(){
+ Properties prop = new Properties();
+ try {
+ SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
+
+ URL url = Info.class.getResource("/version.properties");
+
+ String builddatee = format.format(new Date(new File(url.toURI()).lastModified()));
+ builddate=builddatee;
+
+ prop.load(url.openStream());
+ version=(String)prop.get("version");
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ }
+
+ }
+}
diff --git a/src/java/com/wasteinformationserver/main.java b/src/java/com/wasteinformationserver/main.java
index 9ca1c15..584dd44 100644
--- a/src/java/com/wasteinformationserver/main.java
+++ b/src/java/com/wasteinformationserver/main.java
@@ -1,16 +1,17 @@
package com.wasteinformationserver;
+import com.wasteinformationserver.basicutils.Info;
import com.wasteinformationserver.basicutils.Log;
import com.wasteinformationserver.db.JDCB;
import com.wasteinformationserver.mqtt.mqtt;
import com.wasteinformationserver.website.Webserver;
-
import java.io.IOException;
public class main {
public static void main(String[] args) {
Log.setLevel(Log.DEBUG);
+ Log.info("startup of WasteInformationServer");
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
@@ -24,6 +25,10 @@ public class main {
}
}));
+ Info.init();
+ Log.info("Server version: "+Info.version);
+ Log.debug("Build date: "+Info.builddate);
+
//initial connect to db
Log.message("initial login to db");
new Thread(() -> {
diff --git a/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java b/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java
index 216b4b5..8a2b0fc 100644
--- a/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java
+++ b/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java
@@ -1,5 +1,6 @@
package com.wasteinformationserver.website.datarequests;
+import com.wasteinformationserver.basicutils.Info;
import com.wasteinformationserver.basicutils.Log;
import com.wasteinformationserver.db.JDCB;
import com.wasteinformationserver.website.basicrequest.PostRequest;
@@ -168,6 +169,16 @@ public class DataRequest extends PostRequest {
sb.append("\"status\" : \"error\"");
}
+ sb.append(",\"query\":\"ok\"");
+ sb.append("}");
+ break;
+ case "getversionandbuildtime":
+ sb.append("{");
+
+ sb.append("\"version\" : \""+ Info.version+"\"");
+ sb.append(",\"buildtime\" : \""+ Info.builddate+"\"");
+
+
sb.append(",\"query\":\"ok\"");
sb.append("}");
break;
diff --git a/src/resources/wwwroot/dashboard.html b/src/resources/wwwroot/dashboard.html
index 61f673c..067129d 100644
--- a/src/resources/wwwroot/dashboard.html
+++ b/src/resources/wwwroot/dashboard.html
@@ -379,7 +379,7 @@