Merge branch 'develop' of just-defi:just-defi/just-link into develop

just-defi · Feb 23, 2021 · cf61e1d · cf61e1d
2 parents 2c16b60 + a985394
commit cf61e1d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/node/src/main/java/com/tron/client/OracleClient.java b/node/src/main/java/com/tron/client/OracleClient.java
@@ -37,6 +37,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -68,7 +70,7 @@ public class OracleClient {
   private static Cache<String, String> requestIdsCache = CacheBuilder.newBuilder().maximumSize(10000)
           .expireAfterWrite(12, TimeUnit.HOURS).recordStats().build();
 
-  private static HashMap<String, Set<String>> listeningAddrs = Maps.newHashMap();
+  private static ConcurrentHashMap<String, Set<String>> listeningAddrs = new ConcurrentHashMap<>();
   private HashMap<String, Long> consumeIndexMap = Maps.newHashMap();
 
   private ScheduledExecutorService listenExecutor = Executors.newSingleThreadScheduledExecutor();

diff --git a/node/src/main/resources/mapper/demo/JobRunsMapper.xml b/node/src/main/resources/mapper/demo/JobRunsMapper.xml
@@ -74,7 +74,7 @@
 	<update id="updateResult">
 		UPDATE job_runs
 		SET `status` = #{status},
-				updated_at = DATE_FORMAT(NOW(),'%Y-%m-%d %H:%m:%s')
+				updated_at = DATE_FORMAT(NOW(),'%Y-%m-%d %H:%i:%s')
 		<if test="error!=null and error!=''">
 			,`error` = #{error}
 		</if>

diff --git a/node/src/main/resources/mapper/demo/TaskRunsMapper.xml b/node/src/main/resources/mapper/demo/TaskRunsMapper.xml
@@ -51,7 +51,7 @@
 	<update id="updateResult">
 		UPDATE task_runs
     SET `status` = #{status},
-				updated_at = DATE_FORMAT(NOW(),'%Y-%m-%d %H:%m:%s')
+				updated_at = DATE_FORMAT(NOW(),'%Y-%m-%d %H:%i:%s')
     <if test="error!=null and error!=''">
 			,`error` = #{error}
 		</if>