From 8392915e707edc9b6d79a94848eedc5142fef2a8 Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Mon, 23 Apr 2018 15:20:37 +0800
Subject: [PATCH] merge

---
 .../src/main/java/com/xwbing/util/CommonDataUtil.java         | 4 ++--
 .../main/java/com/xwbing/configuration/SchedulingConfig.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/util/CommonDataUtil.java b/boot-service/src/main/java/com/xwbing/util/CommonDataUtil.java
index c075210..4616d8c 100644
--- a/boot-service/src/main/java/com/xwbing/util/CommonDataUtil.java
+++ b/boot-service/src/main/java/com/xwbing/util/CommonDataUtil.java
@@ -39,8 +39,8 @@ public class CommonDataUtil {
      * @param minute 分钟
      */
     public static void setData(String key, Object value, int minute) {
-        JSONObject object = new JSONObject();
         long currentTimeMillis = System.currentTimeMillis();
+        JSONObject object = new JSONObject();
         object.put("value", value);
         object.put("expiry", currentTimeMillis + minute * MINUTE);
         token.put(key, object);
@@ -53,6 +53,7 @@ public class CommonDataUtil {
      * @return
      */
     public static Object getData(String key) {
+        long currentTimeMillis = System.currentTimeMillis();
         JSONObject object = (JSONObject) token.get(key);
         if (object != null) {
             Object value = object.get("value");
@@ -60,7 +61,6 @@ public class CommonDataUtil {
             if (-1 == expiry) {
                 return value;
             } else {
-                long currentTimeMillis = System.currentTimeMillis();
                 if (expiry >= currentTimeMillis) {
                     return value;
                 } else {
diff --git a/boot-web/src/main/java/com/xwbing/configuration/SchedulingConfig.java b/boot-web/src/main/java/com/xwbing/configuration/SchedulingConfig.java
index 1acddf4..1869588 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/SchedulingConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/SchedulingConfig.java
@@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 @Configuration
 @EnableScheduling // 启用定时任务
 public class SchedulingConfig {
-    private static final Logger logger = LoggerFactory.getLogger(SchedulingConfig.class);
+    private final Logger logger = LoggerFactory.getLogger(SchedulingConfig.class);
 
     @Scheduled(cron = "0 0 6 * * ? ")//每天6点开启定时任务
     public void scheduler() {