From 16ccaf15d7ec5018f19c7fb6ec3930a9f8ea943e Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Mon, 20 Nov 2023 11:03:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3Token=E4=B8=AD=E9=9D=9Estatic?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=B8=8D=E8=83=BD=E6=B3=A8=E5=85=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/utils/onenet/Token.java  | 24 +++++++------------
 .../com/ruoyi/quartz/task/IotLogTask.java     | 17 +++++++++++++
 2 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 AutoSprout-quartz/src/main/java/com/ruoyi/quartz/task/IotLogTask.java

diff --git a/AutoSprout-common/src/main/java/com/ruoyi/common/utils/onenet/Token.java b/AutoSprout-common/src/main/java/com/ruoyi/common/utils/onenet/Token.java
index 253ba50..0c413f1 100644
--- a/AutoSprout-common/src/main/java/com/ruoyi/common/utils/onenet/Token.java
+++ b/AutoSprout-common/src/main/java/com/ruoyi/common/utils/onenet/Token.java
@@ -2,7 +2,7 @@ package com.ruoyi.common.utils.onenet;
 
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.http.HttpUtils;
-import org.springframework.beans.factory.annotation.Value;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import org.springframework.stereotype.Component;
 
 import javax.crypto.Mac;
@@ -17,27 +17,19 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class Token {
 
-    @Value(value = "${watering.version}")
-    private static String version;
-
-    @Value(value = "${watering.resourceName}")
-    private static String resourceName;
-
-    @Value(value = "${watering.accessKey}")
-    private static String accessKey;
-
-
-    @Value(value = "${watering.daysToExpire}")
-    private static Long daysToExpire;
-
+    /** 缓存token */
     private static String cachedToken;
-    private static long tokenExpirationTime;
 
+    /** token过期时间 */
+    private static long tokenExpirationTime;
 
     public static String getToken()throws UnsupportedEncodingException, NoSuchAlgorithmException, InvalidKeyException {
         /** 判断token是否过期，如果不过期直接返回全局缓存token,如果过期重新获取token保存到全局缓存token中并更新过期时间*/
         if (isTokenExpired()) {
-            long expirationTimeInSeconds = TimeUnit.DAYS.toSeconds(daysToExpire);
+            String resourceName = SpringUtils.getRequiredProperty("watering.resourceName");
+            String version = SpringUtils.getRequiredProperty("watering.version");
+            String accessKey = SpringUtils.getRequiredProperty("watering.accessKey");
+            long expirationTimeInSeconds = TimeUnit.DAYS.toSeconds(Long.parseLong(SpringUtils.getRequiredProperty("watering.daysToExpire")));
             String expirationTime = String.valueOf(System.currentTimeMillis() / 1000 + expirationTimeInSeconds);
             String signatureMethod = Token.SignatureMethod.SHA256.name().toLowerCase();//签名方式
             StringBuilder sb = new StringBuilder();
diff --git a/AutoSprout-quartz/src/main/java/com/ruoyi/quartz/task/IotLogTask.java b/AutoSprout-quartz/src/main/java/com/ruoyi/quartz/task/IotLogTask.java
new file mode 100644
index 0000000..7b1dcb7
--- /dev/null
+++ b/AutoSprout-quartz/src/main/java/com/ruoyi/quartz/task/IotLogTask.java
@@ -0,0 +1,17 @@
+package com.ruoyi.quartz.task;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 定时获取浇花器日志
+ *
+ * @author qiuzhenzhao
+ */
+@Component("logTask")
+public class IotLogTask {
+
+    public void getDeviceLog()
+    {
+        System.out.println("获取浇花器日志");
+    }
+}