From fe93f7d5554dc623ec5fbcc2b4d6d7a15ce79298 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Mon, 24 Jun 2024 15:26:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B5=84=E4=BA=A7=E7=99=BB=E8=AE=B0bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application.yml  |   2 +-
 ruoyi-admin/src/main/resources/license.lic      | Bin 832 -> 808 bytes
 .../src/main/resources/publicCerts.keystore     | Bin 0 -> 878 bytes
 .../framework/config/InterceptorConfig.java     |   4 ++--
 .../license/domain/CustomKeyStoreParam.java     |   5 +++--
 5 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/publicCerts.keystore

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index bda0206..c643fb3 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/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
diff --git a/ruoyi-admin/src/main/resources/license.lic b/ruoyi-admin/src/main/resources/license.lic
index d87309b5a41d87d9bb78c5aab3e7667e535d913b..2d6d327b4729025e089fcb3b8ea8027835dc906f 100644
GIT binary patch
literal 808
zcmV+@1K0e18U$+7SLdFvUdp4Di@bpd_tv(*`zHnv0%h}gIY+p$QGED@8<+jVnU^%3
z*lwNeb^Z&_d{`=HAY8#bsTS9ZV$9;C+68S%ISyF{@4Q)}zL#WgYEplYo;lt$_?=aN
zGz6oeV4PA{?ktvl9nU0Ri2Vl}%(2|bPd3Zj1uf!s%4oO@|MIA#e##8gSSKpp+E6D%
zl}B_j34&-GP}1;;J#<!Jr<0jYPTsvBz%Gdd3g6RFK(yb0W8;(qd$`NIKZgUgp3Nb&
zkD=CilCl$)F57PT+<s!l=?0iq)tiEm&~1j=Yz>XZ0pp;KW25kcoppwDeXa;rKLWGa
z<U7%B=^4#QT<aN*hrGI>jBF8Z(?(%_51Yq!-<#hrR<~1h3#=rB*E7(?RKpll^5S{@
zf+mRE?-NV~<q-(?Pb&ZW-R8vhBMUDNEGwppA7Hw~usU|dlY9#@SO<1!DyS3RvHVRQ
zL_geL@uBWv8J1;)2-GDX;*@!}VK)HbnqxfPW*wQ|gOAgyD|RfG6WLS7g~T%tNSfP;
zt8(f1Z9O9SRdVrZgTAdOI?Cvc$w=jvJ9H50YOfmugQog0;Pv9d#j2YVs4@zp$~4-~
zwD)A?>Z+=%qAYf^lue%sK0vI1XF}7MZY1UO|M{tm;sbX%r^rYm;`-C=<7^hNk5!*^
zT%uKwPg@EtKex}5f@i_m47I1YB_QCm8!O3vT}cjJTR&)YxAKKTE?`Rr@RZeA^zkV*
z2z2a~H4XQ{{^i4LO+~ndpkWHAtdTTFr6?eal%9iwDzI)4jY}aUh4c@}0NdX}V1#Mr
z0%-}T?|B6~ju9?E3AQ1uQ4woi|K%OGaPw<7N9b_$)WLeWMR1=u?RQCQZ9KgzYckFY
zhDoqKj8+{O7bIrhLPV_r=&$XH5QeqGYpqzFdixa)V{8>eDTWu_p^#;NVz#8*=vK;V
zBN5S}D2MI?rMb@!JY$UjqkvaH61{h{8ldNhB6pg_oz%WhSyGPm(=z2!qy{2uyyxGD
m?>Xr}zskue5e#dho3s^AiBr?4N7?6>2q=rww1yg3Zu~cI6_W`7

literal 832
zcmV-G1Hb%!8U$+7SLdFE9)O+coa9LtQ!8AbJ02Oolb{jXco9zWYR_KE9rLNM8T2A2
z&uE(~Z<+9~&?I?iLc<g)Z7LE}LBQ-<*G6SF*u=cw3s#29%^|>>?&nbN*S)>mWYx@g
z%mRqZ$Ymz#OW<`m45&hPyWHUQ7gW^Pa`*V<qGZbFK(k1qb1GeHa0dokYtI&L9qrKi
zD`>r4^jgkc)c$fEP0z}j$zjgYOo;ULquh<aXcyrSrB9Sd#A_|QN|u+;?O(($oZ45z
zSl1;#I>^iEOO8-0eP(*3!V){Etr-%e?2R{7eBsl!n3oRAcJSP;+}0E`eY5g0z4_`f
zzNHj+vAWMTul1;04;N9=vrkdS+-;>biRD`T%+iNCPmB?+P|RJ>(jeGXE}rMYG|9TA
z+E$sll+xoik>!Z6pxq!mjW{8RLD138S#ZetRnO`JOEs(iQLJKu&fbZ6nGqzRfWNSt
z)xgEy852-QF>(aHad;r(SDGU1bn<;Uh^RRTDX0LLi9?DPe2f&R4fYN}j;<6m$o%8L
zG%Jvuy!k>#mF-N@J2Hr`sJURYTBjvV&@?;_R|h{xmvGR0*rKB$Rk7AF?H|ywg*(5|
zNvsOk`0Dz&E6Lk`kWT`<KL+wIZ)HYVjaC@%cCoUVN{YC(h}%P6m<5{Z$bUw^-e{bZ
zew-S8gK8G>=5~dmTuvC*lqO3=*8<B-3vm5YZ(hQ~{LVMKQ%%|K5t>N`5Wk@7NmcHE
zfxtw##Y3<zV_k>i_A~m$)g|dQ`O6_-yL;#;mCU1<BZqEfQGd@WgEJh!ApJH(p&ZD=
zC0Bb88uD_ry3rS-@vN23a;iKbnIE57lufw;Af^0SF&+L5!YoxTN=Z*AdKNUHsL($5
zuI@mTCiPKGm9zmn88i&9Or%GQpW$gHoq9ToOEIvpJz87CdTbUeu$W&LW!{2t_S8?#
zNP!9DE^(eMEZwu|)waK`&*9qbuBP>nBchM{&nelLs47)l^X<~XTIjbY8b~C1FS!%V
zSXob8m)GWW9R?ist2k#B=?2WFqyYmJ;DMTy?P9Xkq9wYvZ*8oD4BZ1r(P}&9`9m!w
Kq-LV^6hwIe2&+5*

diff --git a/ruoyi-admin/src/main/resources/publicCerts.keystore b/ruoyi-admin/src/main/resources/publicCerts.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..9227f432ef662e86bb386e97e8f2c3c9700577b2
GIT binary patch
literal 878
zcmezO_TO6u1_mY|W(3n*1*J(jnaRniMI}I?{tv2CJs4Oc^h^yb85o$g4VswM4Vsu9
zFJNY3WMX15xgG!4fR~Lkq0NIam6?T^iIu@1*^t|SlZ`o)g-w{r*$>9y5M~PYfN|Kt
z93cY%kTNb|&Yb+@#GH)$;u1rs7&jI%W+X8KIdNVi69Y2?a{~htLnE^&ab9B(*A&X7
zk0Y8GcNjD=>aekEwRxPgU||Gu<e3^98UEG>H_Da@X$IZ*nxpsT$@6c5+k<T0yD%J<
zvv1fIsFvv(>!1|)JJPl{;@AG8Uw0XNJ3Tuz=X#@cgRDvZr?iCa*)s!{E}1|71xvMn
z(joudE3g0CeoXp@b@=mRE0&4!v;1!UcKN8>VJ6cM;V7|*M&C+5uhUMvuJ!(t60_vo
ziyn-}nM4_;Cj|71Ds!LNG-+qkqSr0lA0lMFf}HmK;eys{vu*F4-m^N!Y)AOc$|>u2
z|FU}3^fTOt+m^j4Juou7Z`YMb|7V5l0*wt@JjDu?U-)Q<32#5oY1DIK*+Uz#s_u}Q
zUX2Hf*U4#bURF9WZ*e{MFGbU&kH3?u7*(v#Ecv)^Mc{<a70ve_Mm?R+HmN%;uAw?q
zHHFc~`rmm^E#}5n29P@@GiR-~vv=(B+k5z^c&<>tL!M}i)-|2|htB8(9dXRM`e;?>
zjhZK0j2`G`d*!<}ObFflBPUSLvd`k<!9v&jM@3@#3XblJe7yg*kI8|ez$;$YJa4!!
zTCh9t4d2_0r>E8g|I2DNWjQ-%kH>DC{?~3Ti|-d3IJJ0s-k)oF{mY}X!3v8N4de}E
zfyqynk420{Bp_wglD02Tw=S>D@oHfbE8M?lxe{8sX4Ypg&|wnM>yvnEDAw#@ZM8pU
z-;=@_3*xN&m_(Rn?~0%O#@*{>Ge@D@sg+$~yE;!TZhEj$)p5OXVq<siv#KTijnC|E
F008m<K%M{q

literal 0
HcmV?d00001

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/InterceptorConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/InterceptorConfig.java
index e270cbf..a4eb7a2 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/InterceptorConfig.java
+++ b/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");
     }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/license/domain/CustomKeyStoreParam.java b/ruoyi-framework/src/main/java/com/ruoyi/license/domain/CustomKeyStoreParam.java
index 8d11368..a20a358 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/license/domain/CustomKeyStoreParam.java
+++ b/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);
         }