From ab7b52a8884bb033e187331a437f3c9e31585a04 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 03 十二月 2024 14:19:55 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/controller/LicenseCreatorController.java | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
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..f746d9d 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;
/**
* 鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�
@@ -49,7 +51,7 @@
if (osName.startsWith("windows")) {
abstractServerInfos = new WindowsServerInfos();
} else if (osName.startsWith("linux")) {
-// abstractServerInfos = new LinuxServerInfos();
+ abstractServerInfos = new LinuxServerInfos();
}else{//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
abstractServerInfos = new WindowsServerInfos();
}
@@ -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")
--
Gitblit v1.9.1