From 59b0c86e2af6b86796e2becf627e07e675e71980 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 18 七月 2024 10:57:22 +0800
Subject: [PATCH] #许可证优化
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/timer/LicenseTimer.java | 9 +++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/controller/LicenseCreatorController.java | 18 ++++--------------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/LicenseCheckListener.java | 10 ++++++++++
3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/LicenseCheckListener.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/LicenseCheckListener.java
index 3df8fe9..8ea128f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/LicenseCheckListener.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/LicenseCheckListener.java
@@ -15,6 +15,7 @@
import org.springframework.stereotype.Component;
import java.io.File;
+import java.util.Date;
/**
* 鍦ㄩ」鐩惎鍔ㄦ椂瀹夎璇佷功
@@ -91,6 +92,15 @@
logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
licenseTimer.setSystemSupport(install != null);
+ if (install != null) {
+ Date start = new Date();
+ Date end = install.getNotAfter();
+ Long starTime = start.getTime();
+ Long endTime = end.getTime();
+ Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
+ int day = (int) (num / 24 / 60 / 60 / 1000);
+ licenseTimer.setLicenseDays(day);
+ }
return install != null;
} catch (Exception e) {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/controller/LicenseCreatorController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/controller/LicenseCreatorController.java
index bc1be94..6efc1d0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/controller/LicenseCreatorController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/controller/LicenseCreatorController.java
@@ -4,6 +4,7 @@
import com.zy.asrs.wms.system.license.entity.license.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.system.license.timer.LicenseTimer;
import de.schlichtherle.license.LicenseContent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -27,9 +28,10 @@
@Value("${license.licensePath}")
private String licensePath;
-
@Autowired
private LicenseCheckListener licenseCheckListener;
+ @Autowired
+ private LicenseTimer licenseTimer;
/**
* 鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�
@@ -62,19 +64,7 @@
*/
@RequestMapping(value = "/getLicenseDays")
public R getLicenseDays() {
- LicenseVerify licenseVerify = new LicenseVerify();
- LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
- if (verifyInfo == null) {
- return R.error();
- }
-
- Date start = new Date();
- Date end = verifyInfo.getNotAfter();
- Long starTime = start.getTime();
- Long endTime = end.getTime();
- Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
- int day = (int) (num / 24 / 60 / 60 / 1000);
- return R.ok().add(day);
+ return R.ok().add(licenseTimer.getLicenseDays());
}
@RequestMapping(value = "/updateLicense")
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/timer/LicenseTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/timer/LicenseTimer.java
index b0bd448..f88c2cd 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/timer/LicenseTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/timer/LicenseTimer.java
@@ -9,6 +9,8 @@
private static boolean SYSTEM_SUPPORT = false;//绯荤粺婵�娲荤姸鎬侊紝榛樿鍏抽棴
+ private static int LICENSE_DAYS = 0;//璁稿彲璇佸ぉ鏁�
+
//姣忓ぉ鏅氫笂11鐐规洿鏂扮郴缁熸縺娲荤姸鎬�
@Scheduled(cron = "0 0 23 * * ? ")
public void timer() {
@@ -27,4 +29,11 @@
SYSTEM_SUPPORT = systemSupport;
}
+ public int getLicenseDays() {
+ return LICENSE_DAYS;
+ }
+
+ public void setLicenseDays(int licenseDays) {
+ LICENSE_DAYS = licenseDays;
+ }
}
--
Gitblit v1.9.1