From 81ce6783643878eaf8ef8a3d0bb0108e4e7eb698 Mon Sep 17 00:00:00 2001 From: rdavidek Date: Thu, 27 May 2021 11:07:16 +0200 Subject: [PATCH] added last update of workers info --- src/main/java/cz/kamma/mining/Constants.java | 3 ++- src/main/java/cz/kamma/mining/bean/MiningBean.java | 11 +++++++---- src/main/webapp/ajaxview.jsp | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/cz/kamma/mining/Constants.java b/src/main/java/cz/kamma/mining/Constants.java index e38cbde..c0da8e8 100644 --- a/src/main/java/cz/kamma/mining/Constants.java +++ b/src/main/java/cz/kamma/mining/Constants.java @@ -2,7 +2,8 @@ package cz.kamma.mining; public interface Constants { - public static final String APP_VERSION = "v0.7"; + public static final String APP_VERSION = "v0.8"; public static final String COPYRIGHT = "2021"; public static final int DEFAULT_HTTP_TIMEOUT = 2000; + public static final int RELOAD_TIME = 20000; } diff --git a/src/main/java/cz/kamma/mining/bean/MiningBean.java b/src/main/java/cz/kamma/mining/bean/MiningBean.java index 12ad492..ee84b64 100644 --- a/src/main/java/cz/kamma/mining/bean/MiningBean.java +++ b/src/main/java/cz/kamma/mining/bean/MiningBean.java @@ -1,8 +1,6 @@ package cz.kamma.mining.bean; import java.text.SimpleDateFormat; -import java.time.Instant; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; @@ -21,6 +19,7 @@ import cz.kamma.mining.vo.KeyValue; public class MiningBean { public static String updateAll(HttpServletRequest request, HttpServletResponse response) throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); java.lang.System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2"); List prices = new ArrayList<>(); List workers = new ArrayList<>(); @@ -56,7 +55,7 @@ public class MiningBean { String resultStr; String restRequest; - + for (int i = 0; i < cryptoCur.length; i++) { String ccur = cryptoCur[i]; restRequest = HttpHelper @@ -314,7 +313,6 @@ public class MiningBean { long time = block.getLong("time"); String finder = block.getString("finder"); double amount = block.getDouble("amount"); - SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); wi.setValue("" + sdf.format(new Date(time*1000)) + " - "+finder + " - "+amount); } else wi.setValue("Unknown"); @@ -388,6 +386,11 @@ public class MiningBean { } } + + KeyValue wi = new KeyValue(); + wi.setKey("Last Update"); + wi.setValue("" + sdf.format(new Date(System.currentTimeMillis()))); + workers.add(0, wi); String res = "#PRICES##WORKERS##POOL##NETWORK#"; diff --git a/src/main/webapp/ajaxview.jsp b/src/main/webapp/ajaxview.jsp index abbff0f..353a5b6 100644 --- a/src/main/webapp/ajaxview.jsp +++ b/src/main/webapp/ajaxview.jsp @@ -25,7 +25,7 @@