From 2fc0c174375c1d40ae5baeaa2a96f1ebfdd8c64e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 07 十月 2023 13:47:28 +0800
Subject: [PATCH] #新增许可证
---
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 5 ++++-
src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 34 +++++++++++++++++++---------------
/dev/null | 0
.gitignore | 1 +
src/main/java/com/zy/system/entity/license/LicenseVerify.java | 19 ++++++++-----------
5 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9224005..7b3962c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**
!**/src/test/**
+/src/main/resources/license.lic
### STS ###
.apt_generated
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index d7bb9cb..b8862a7 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -87,8 +87,11 @@
@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(licensePath);
+ File serverFile = new File(licensePathFile.getPath());
if (serverFile.exists()) {
try {
serverFile.delete();//瀛樺湪鏂囦欢锛屽垹闄�
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index 75cee89..1659df2 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -63,26 +63,30 @@
if(!Cools.isEmpty(licensePath)){
logger.info("++++++++ 寮�濮嬪姞杞借鍙瘉 ++++++++");
- String publicKeysStoreFileName = this.getClass().getClassLoader().getResource(publicKeysStorePath).getPath();
- File publicKeysStoreFile = new File(publicKeysStoreFileName);
+ try {
+ String publicKeysStoreFileName = this.getClass().getClassLoader().getResource(publicKeysStorePath).getPath();
+ File publicKeysStoreFile = new File(publicKeysStoreFileName);
- String licensePathFileName = this.getClass().getClassLoader().getResource(licensePath).getPath();
- File licensePathFile = new File(licensePathFileName);
+ String licensePathFileName = this.getClass().getClassLoader().getResource(licensePath).getPath();
+ File licensePathFile = new File(licensePathFileName);
- LicenseVerifyParam param = new LicenseVerifyParam();
- param.setSubject(subject);
- param.setPublicAlias(publicAlias);
- param.setStorePass(storePass);
- param.setLicensePath(licensePathFile.getPath());
- param.setPublicKeysStorePath(publicKeysStoreFile.getPath());
+ LicenseVerifyParam param = new LicenseVerifyParam();
+ param.setSubject(subject);
+ param.setPublicAlias(publicAlias);
+ param.setStorePass(storePass);
+ param.setLicensePath(licensePathFile.getPath());
+ param.setPublicKeysStorePath(publicKeysStoreFile.getPath());
- LicenseVerify licenseVerify = new LicenseVerify();
- //瀹夎璇佷功
- LicenseContent install = licenseVerify.install(param);
+ LicenseVerify licenseVerify = new LicenseVerify();
+ //瀹夎璇佷功
+ LicenseContent install = licenseVerify.install(param);
- logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
+ logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
- return install != null;
+ return install != null;
+ } catch (Exception e) {
+ return false;
+ }
}
return false;
diff --git a/src/main/java/com/zy/system/entity/license/LicenseVerify.java b/src/main/java/com/zy/system/entity/license/LicenseVerify.java
index 9f91d36..2175930 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseVerify.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseVerify.java
@@ -41,19 +41,16 @@
* 鏍￠獙License璇佷功
*/
public boolean verify(){
- LicenseManager licenseManager = LicenseManagerHolder.getInstance(null);
- DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
- if (!updateSystemTime()) {
- //鏃堕棿鏇存柊澶辫触锛岀郴缁熸椂闂磋鏇存敼
- return false;
- }
-
- //2. 鏍￠獙璇佷功
try {
- LicenseContent licenseContent = licenseManager.verify();
-// System.out.println(licenseContent.getSubject());
+ LicenseManager licenseManager = LicenseManagerHolder.getInstance(null);
+ DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if (!updateSystemTime()) {
+ //鏃堕棿鏇存柊澶辫触锛岀郴缁熸椂闂磋鏇存敼
+ return false;
+ }
+
+ LicenseContent licenseContent = licenseManager.verify();
logger.info(MessageFormat.format("璁稿彲璇佹牎楠岄�氳繃锛岃鍙瘉鏈夋晥鏈燂細{0} - {1}",format.format(licenseContent.getNotBefore()),format.format(licenseContent.getNotAfter())));
return true;
}catch (Exception e){
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
deleted file mode 100644
index 248bb4b..0000000
--- a/src/main/resources/license.lic
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1