From 5a8d3f9952ec4ff545ef0f5878d861692b0a39a3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 30 九月 2025 15:35:31 +0800
Subject: [PATCH] 13

---
 src/main/java/com/zy/system/controller/LicenseCreatorController.java |   93 +++++++++++++++++++++-------------------------
 1 files changed, 43 insertions(+), 50 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..5650623 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -3,7 +3,7 @@
 import com.core.common.Cools;
 import com.core.common.R;
 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 +14,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Date;
 
 /**
  *
@@ -24,12 +23,12 @@
 @RequestMapping("/license")
 public class LicenseCreatorController {
 
-    @Value("${license.licensePath}")
-    private String licensePath;
-
+//    @Value("${license.licensePath}")
+//    private String licensePath;
     @Autowired
     private LicenseCheckListener licenseCheckListener;
-
+    @Autowired
+    private LicenseTimer licenseTimer;
     /**
      * 鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�
      * @param osName 鎿嶄綔绯荤粺绫诲瀷锛屽鏋滀负绌哄垯鑷姩鍒ゆ柇
@@ -48,7 +47,7 @@
         if (osName.startsWith("windows")) {
             abstractServerInfos = new WindowsServerInfos();
         } else if (osName.startsWith("linux")) {
-//            abstractServerInfos = new LinuxServerInfos();
+            abstractServerInfos = new LinuxServerInfos();
         }else{//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
             abstractServerInfos = new WindowsServerInfos();
         }
@@ -61,52 +60,46 @@
      */
     @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")
-    public R updateLicense(@RequestParam("file") MultipartFile[] files){
-        MultipartFile file = files[0];
+//    @RequestMapping(value = "/updateLicense")
+//    public R updateLicense(@RequestParam("file") MultipartFile[] files){
+//        MultipartFile file = files[0];
+//
+//        String licensePathFileName = this.getClass().getClassLoader().getResource(licensePath).getPath();
+//        File licensePathFile = new File(licensePathFileName);
+//        //鏈嶅姟鍣ㄧ淇濆瓨鐨勬枃浠跺璞�
+//        File serverFile = new File(licensePathFile.getPath());
+//        if (serverFile.exists()) {
+//            try {
+//                serverFile.delete();//瀛樺湪鏂囦欢锛屽垹闄�
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+//
+//        try {
+//            //鍒涘缓鏂囦欢
+//            serverFile.createNewFile();
+//            //灏嗕笂浼犵殑鏂囦欢鍐欏叆鍒版湇鍔″櫒绔枃浠跺唴
+//            file.transferTo(serverFile);
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//
+//        //閲嶆柊鍔犺浇璁稿彲璇�
+//        boolean loadedLicense = licenseCheckListener.loadLicense();
+//        if (loadedLicense) {
+//            return R.ok();
+//        }
+//        return R.error("璁稿彲璇佹洿鏂板け璐�");
+//    }
 
-        String licensePathFileName = this.getClass().getClassLoader().getResource(licensePath).getPath();
-        File licensePathFile = new File(licensePathFileName);
-        //鏈嶅姟鍣ㄧ淇濆瓨鐨勬枃浠跺璞�
-        File serverFile = new File(licensePathFile.getPath());
-        if (serverFile.exists()) {
-            try {
-                serverFile.delete();//瀛樺湪鏂囦欢锛屽垹闄�
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        try {
-            //鍒涘缓鏂囦欢
-            serverFile.createNewFile();
-            //灏嗕笂浼犵殑鏂囦欢鍐欏叆鍒版湇鍔″櫒绔枃浠跺唴
-            file.transferTo(serverFile);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        //閲嶆柊鍔犺浇璁稿彲璇�
-        boolean loadedLicense = licenseCheckListener.loadLicense();
-        if (loadedLicense) {
-            return R.ok();
-        }
-        return R.error("璁稿彲璇佹洿鏂板け璐�");
+    @RequestMapping(value = "/activate")
+    public R activate() {
+        licenseTimer.timer();
+        return R.ok();
     }
 
 }
\ No newline at end of file

--
Gitblit v1.9.1