Merge remote-tracking branch 'origin/kingbase' into kingbase

ruoyi-admin/src/main/resources/application.yml

@@ -172,5 +172,5 @@ license:
   publicAlias: publicCert                             #密钥别称
   storePass: public_password1234                         #访问秘钥库的密码，建议用统一平台的client_security
   licensePath: license.lic                         #证书存储路径
-  publicKeysStorePath: D:/license/publicCerts.keystore                 #密钥库存储路径
+  publicKeysStorePath: publicCerts.keystore                 #密钥库存储路径
   node_env: dev

ruoyi-framework/src/main/java/com/ruoyi/framework/config/InterceptorConfig.java

@@ -27,9 +27,9 @@ public class InterceptorConfig implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry) {
 
         //添加要拦截的url
-        //registry.addInterceptor(licenseCheckInterceptor)
+        // registry.addInterceptor(licenseCheckInterceptor)
                 // 拦截的路径
-               // .addPathPatterns("/login");
+        //   .addPathPatterns("/login");
         // 放行的路径
 //                .excludePathPatterns("/admin/login");
     }

ruoyi-framework/src/main/java/com/ruoyi/license/domain/CustomKeyStoreParam.java

@@ -1,5 +1,6 @@
 package com.ruoyi.license.domain;
 
+import cn.hutool.core.io.resource.ClassPathResource;
 import de.schlichtherle.license.AbstractKeyStoreParam;
 
 import java.io.*;
@@ -48,9 +49,9 @@ public class CustomKeyStoreParam extends AbstractKeyStoreParam {
     @Override
     public InputStream getStream() throws IOException {
         // 本地开发环境，License生成
-       final InputStream in = new FileInputStream(new File(storePath));
+        final InputStream in = new FileInputStream(new File(storePath));
         // 线上环境，直接用这个
-       // InputStream in = new ClassPathResource(storePath).getStream();
+        //InputStream in = new ClassPathResource(storePath).getStream();
         if (null == in){
             throw new FileNotFoundException(storePath);
         }