From 40254eb1fc7ad9bef6e820c0ffc0cc5a63e9e53e Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 09:53:54 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index 0aafb3b..e047700 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -2,8 +2,9 @@
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.system.entity.license.LinuxServerInfos;
import com.zy.system.entity.license.*;
-import de.schlichtherle.license.LicenseContent;
+import com.zy.system.timer.LicenseTimer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
@@ -14,7 +15,6 @@
import java.io.File;
import java.io.IOException;
-import java.util.Date;
/**
*
@@ -26,10 +26,10 @@
@Value("${license.licensePath}")
private String licensePath;
-
@Autowired
private LicenseCheckListener licenseCheckListener;
-
+ @Autowired
+ private LicenseTimer licenseTimer;
/**
* 鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�
* @param osName 鎿嶄綔绯荤粺绫诲瀷锛屽鏋滀负绌哄垯鑷姩鍒ゆ柇
@@ -48,7 +48,7 @@
if (osName.startsWith("windows")) {
abstractServerInfos = new WindowsServerInfos();
} else if (osName.startsWith("linux")) {
-// abstractServerInfos = new LinuxServerInfos();
+ abstractServerInfos = new LinuxServerInfos();
}else{//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
abstractServerInfos = new WindowsServerInfos();
}
@@ -61,19 +61,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(licenseTimer.getLicenseDays());
}
@RequestMapping(value = "/updateLicense")
@@ -109,4 +97,10 @@
return R.error("璁稿彲璇佹洿鏂板け璐�");
}
+ @RequestMapping(value = "/activate")
+ public R activate() {
+ licenseTimer.timer();
+ return R.ok();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1