License(证书认证)

ClientDemo/src/main/java/cn/ClientDemoApplication.java

@@ -1,4 +1,4 @@
-package cn.zifangsky;
+package cn;
 
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;

ClientDemo/src/main/java/cn/common/SpringContextUtils.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.common;
+package cn.common;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

ClientDemo/src/main/java/cn/config/RestTemplateConfig.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.config;
+package cn.config;
 
 import org.apache.http.Header;
 import org.apache.http.client.HttpClient;

ClientDemo/src/main/java/cn/config/WebMvcConfig.java

@@ -1,6 +1,6 @@
-package cn.zifangsky.config;
+package cn.config;
 
-import cn.zifangsky.license.LicenseCheckInterceptor;
+import cn.license.LicenseCheckInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;

ClientDemo/src/main/java/cn/controller/LoginController.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.controller;
+package cn.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;

ClientDemo/src/main/java/cn/license/AbstractServerInfos.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.license;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

ClientDemo/src/main/java/cn/license/CustomKeyStoreParam.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.license;
 
 import de.schlichtherle.license.AbstractKeyStoreParam;
 

ClientDemo/src/main/java/cn/license/CustomLicenseManager.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.license;
 
 import de.schlichtherle.license.LicenseContent;
 import de.schlichtherle.license.LicenseContentException;
@@ -159,10 +159,11 @@ public class CustomLicenseManager extends LicenseManager{
         LicenseCheckModel serverCheckModel = getServerInfos();
 
         if(expectedCheckModel != null && serverCheckModel != null){
-            //校验IP地址
-            if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
-                throw new LicenseContentException("当前服务器的IP没在授权范围内");
-            }
+            //项目中不需要校验ip所以注释掉
+//            //校验IP地址
+//            if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
+//                throw new LicenseContentException("当前服务器的IP没在授权范围内");
+//            }
 
             //校验Mac地址
             if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){

ClientDemo/src/main/java/cn/license/LicenseCheckInterceptor.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.license;
 
 import com.alibaba.fastjson.JSON;
 import org.apache.logging.log4j.LogManager;

ClientDemo/src/main/java/cn/license/LicenseCheckListener.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.license;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;

ClientDemo/src/main/java/cn/license/LicenseCheckModel.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.license;
 
 import java.io.Serializable;
 import java.util.List;

ClientDemo/src/main/java/cn/license/LicenseManagerHolder.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.license;
 
 import de.schlichtherle.license.LicenseManager;
 import de.schlichtherle.license.LicenseParam;

ClientDemo/src/main/java/cn/license/LicenseVerify.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.license;
 
 import de.schlichtherle.license.*;
 import org.apache.logging.log4j.LogManager;

ClientDemo/src/main/java/cn/license/LicenseVerifyParam.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.license;
 
 /**
  * License校验类需要的参数

ClientDemo/src/main/java/cn/license/LinuxServerInfos.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.license;
 
 import org.apache.commons.lang3.StringUtils;
 

ClientDemo/src/main/java/cn/license/WindowsServerInfos.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.license;
 
 import java.net.InetAddress;
 import java.util.List;

ClientDemo/src/main/resources/license-config.properties

@@ -2,5 +2,5 @@
 license.subject=license_demo
 license.publicAlias=publicCert
 license.storePass=public_password1234
-license.licensePath=C:/Users/zifangsky/Desktop/license_demo/license.lic
-license.publicKeysStorePath=C:/Users/zifangsky/Desktop/license_demo/publicCerts.keystore
+license.licensePath=D:/license.lic
+license.publicKeysStorePath=D:/publicCerts.keystore

ClientDemo/src/test/java/cn/ClientDemoApplicationTests.java

@@ -1,4 +1,4 @@
-package cn.zifangsky;
+package cn;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

ServerDemo/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.3.RELEASE</version>
+		<version>2.0.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

ServerDemo/src/main/java/cn/iocoder/yudao/server/ServerDemoApplication.java

@@ -1,4 +1,4 @@
-package cn.zifangsky;
+package cn.iocoder.yudao.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

ServerDemo/src/main/java/cn/iocoder/yudao/server/common/SpringContextUtils.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.common;
+package cn.iocoder.yudao.server.common;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

ServerDemo/src/main/java/cn/iocoder/yudao/server/config/RestTemplateConfig.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.config;
+package cn.iocoder.yudao.server.config;
 
 import org.apache.http.Header;
 import org.apache.http.client.HttpClient;

ServerDemo/src/main/java/cn/iocoder/yudao/server/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.config;
+package cn.iocoder.yudao.server.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;

ServerDemo/src/main/java/cn/iocoder/yudao/server/controller/LicenseCreatorController.java

@@ -1,11 +1,6 @@
-package cn.zifangsky.controller;
+package cn.iocoder.yudao.server.controller;
 
-import cn.zifangsky.license.LicenseCreator;
-import cn.zifangsky.license.LinuxServerInfos;
-import cn.zifangsky.license.AbstractServerInfos;
-import cn.zifangsky.license.LicenseCheckModel;
-import cn.zifangsky.license.LicenseCreatorParam;
-import cn.zifangsky.license.WindowsServerInfos;
+import cn.iocoder.yudao.server.license.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;

ServerDemo/src/main/java/cn/iocoder/yudao/server/license/AbstractServerInfos.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.iocoder.yudao.server.license;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

ServerDemo/src/main/java/cn/iocoder/yudao/server/license/CustomKeyStoreParam.java

@@ -1,12 +1,8 @@
-package cn.zifangsky.license;
+package cn.iocoder.yudao.server.license;
 
 import de.schlichtherle.license.AbstractKeyStoreParam;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 
 /**
  * 自定义KeyStoreParam，用于将公私钥存储文件存放到其他磁盘位置而不是项目中

ServerDemo/src/main/java/cn/iocoder/yudao/server/license/CustomLicenseManager.java

@@ -1,11 +1,6 @@
-package cn.zifangsky.license;
-
-import de.schlichtherle.license.LicenseContent;
-import de.schlichtherle.license.LicenseContentException;
-import de.schlichtherle.license.LicenseManager;
-import de.schlichtherle.license.LicenseNotary;
-import de.schlichtherle.license.LicenseParam;
-import de.schlichtherle.license.NoLicenseInstalledException;
+package cn.iocoder.yudao.server.license;
+
+import de.schlichtherle.license.*;
 import de.schlichtherle.xml.GenericCertificate;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;

ServerDemo/src/main/java/cn/iocoder/yudao/server/license/LicenseCheckModel.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.iocoder.yudao.server.license;
 
 import java.io.Serializable;
 import java.util.List;

ServerDemo/src/main/java/cn/iocoder/yudao/server/license/LicenseCreator.java

@@ -1,12 +1,6 @@
-package cn.zifangsky.license;
-
-import de.schlichtherle.license.CipherParam;
-import de.schlichtherle.license.DefaultCipherParam;
-import de.schlichtherle.license.DefaultLicenseParam;
-import de.schlichtherle.license.KeyStoreParam;
-import de.schlichtherle.license.LicenseContent;
-import de.schlichtherle.license.LicenseManager;
-import de.schlichtherle.license.LicenseParam;
+package cn.iocoder.yudao.server.license;
+
+import de.schlichtherle.license.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

ServerDemo/src/main/java/cn/iocoder/yudao/server/license/LicenseCreatorParam.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.iocoder.yudao.server.license;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 

ServerDemo/src/main/java/cn/iocoder/yudao/server/license/LinuxServerInfos.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.iocoder.yudao.server.license;
 
 import org.apache.commons.lang3.StringUtils;
 

ServerDemo/src/main/java/cn/iocoder/yudao/server/license/WindowsServerInfos.java

@@ -1,4 +1,4 @@
-package cn.zifangsky.license;
+package cn.iocoder.yudao.server.license;
 
 import java.net.InetAddress;
 import java.util.List;

ServerDemo/src/main/resources/license-config.properties

@@ -1,2 +1,2 @@
 #License相关配置
-license.licensePath=C:/Users/zifangsky/Desktop/license_demo/license.lic
+license.licensePath=D:/license.lic

ServerDemo/src/test/java/cn/ServerDemoApplicationTests.java

@@ -1,4 +1,4 @@
-package cn.zifangsky;
+package cn;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;