From ae09d2b353825cda3af5ddea001c3c9a37e396f3 Mon Sep 17 00:00:00 2001
From: fumeiai <fumeiai@linzikg.com>
Date: Mon, 18 May 2020 10:45:00 +0800
Subject: [PATCH] add onAccessDenied

---
 .idea/workspace.xml                           |  13 +++++----
 .../lz/modules/sys/oauth2/OAuth2Filter.java   |  26 +++++++++---------
 .../app/controller/StaffController.class      | Bin 6303 -> 6279 bytes
 .../lz/modules/sys/oauth2/OAuth2Filter.class  | Bin 3717 -> 3898 bytes
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 181ed036..704f7419 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,12 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/Dto/StaffDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/controller/StaffController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffDao.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/Dto/StaffDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/Dto/StaffDto.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/StaffController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/controller/StaffController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -156,7 +152,7 @@
       <workItem from="1588159936850" duration="1226000" />
       <workItem from="1588161274115" duration="1691000" />
       <workItem from="1588163384182" duration="74761000" />
-      <workItem from="1588936950753" duration="54299000" />
+      <workItem from="1588936950753" duration="55368000" />
     </task>
     <servers />
   </component>
@@ -209,6 +205,11 @@
           <line>102</line>
           <option name="timeStamp" value="55" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/lz/modules/sys/controller/SysMenuController.java</url>
+          <line>43</line>
+          <option name="timeStamp" value="56" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java
index 9522ae20..c5297787 100644
--- a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java
+++ b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java
@@ -56,19 +56,19 @@ public class OAuth2Filter extends AuthenticatingFilter {
     protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
         //获取请求token，如果token不存在，直接返回401
         String token = getRequestToken((HttpServletRequest) request);
-//        if(StringUtils.isBlank(token)){
-//            HttpServletResponse httpResponse = (HttpServletResponse) response;
-//            httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
-//            httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
-//
-//            String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "invalid token"));
-//
-//            httpResponse.getWriter().print(json);
-//
-//            return false;
-//        }
-            return true;
-//        return executeLogin(request, response);
+        if(StringUtils.isBlank(token)){
+            HttpServletResponse httpResponse = (HttpServletResponse) response;
+            httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
+            httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
+
+            String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "invalid token"));
+
+            httpResponse.getWriter().print(json);
+
+            return false;
+        }
+//            return true;
+        return executeLogin(request, response);
     }
 
     @Override
diff --git a/target/classes/com/lz/modules/app/controller/StaffController.class b/target/classes/com/lz/modules/app/controller/StaffController.class
index 76b8698bd6fd887567914cbf1260ab869a6baa82..d752860b2dc338868b67d6bd19abdfe05bbe0f75 100644
GIT binary patch
delta 1836
zcmbW0dzejC7{-5V&z!Tieb&UBp>aG$bQ5OMR8o^EB+Q5+rIK=F7?RsDlOY|X=pxk?
zQkm}QJ{k?9=q4g6m6Go1Ch4Nv^Ylmh)}AqDjK6xGz1RNM`fl%f-*1=a&dp73{&&qf
z;8gzh$l(r`J3a2gcUc(WZWh^PvGpvm$M?AOap~()=+dtV*({B4FZbEyevf68YaZ}O
z=Rv!9Nb|5qb6azoE%S&Cd(>t<7U6N0TkDAd5uW5JYd#&}8J>;s92Fibc;22>Mp(%U
zc3b7L%4M}nwaZvrXpLQ7^mvK2)>@}|S@X(@?d?-NF<#ZYrg^<G92%gU%!FUATlm9t
zOMh^9pX%kW)j572C*5DE3)9wX-q38&Y}CA28FAxIK^|u+kaWW)HY-vm#zz-PO~YGk
zF>K{+!#lid*v5N?6X~pZ-|zw34IlE6W{2Tpb}F*`fho=XO<p9K$0vqQ`Am^MHeMR<
zTry?MxXyj!iQ@k8iPrJC;S0VroXjbjuMA(a%ZMahG~XD$<vYV^bk%%s_<`Mm)9@pE
z1hU~L_8Ly-49(AmU)XK<mAwjgL_AScFn-hoMOx8Fe`cgj%jp*TZ*0-*GyKjUhClgB
zk>hVu8GfsjR{pL?mCEsZnAUz#v-HZvrYw}q7U3a;V{eJ#B-w@Kn=4<(qHT00pc|bD
z_C{v{`H(YPSD2Tzn^d>mR2SR4<0{mOpkKbMHVWEumaHbQL!3=_*(rL^Q?PdP*GKoL
ze7_=NXwpVaBqHn1+9+$CLobPT*ulB<mT!pd^bsqCCL(EH3P>eQWG)mdL<Sq_$9d9u
zx!kxv17tF)X~+4J;j)g_T);rd+$uSPxDb!Q((g#AOEPG7ku<AGy;xF*h_el${lcu)
zT%x&DDa~cUGZbQ(nOR&eF(D;5VVJxQR|L!-A%(7#clc0Lf;c0@r-df25<@YPA^|Ss
zsrhmh*Pbo&y%t@Q8_4gtlB`bEv~kD_$HLVdrQ`?oVxd^LiniixC(fhAsbjjHQ&(|J
zcJ$bsYBEz8k{vxRmU_TEJ{GDmSJN!oKD&yH3Tc>%)u<=UWF0LKiitAD-_#;K*_-jg
z(*(KxB!N4bYe+DKQm*G(Ze}VADGM|mBw4*>+C~Y_VTnwaI+k$+Z;j5@DrSsa*kuu8
zMN5Y)W^py+<k}r5k=o-0Nf(KkAnJ##9?3wEn!=On3Qw-pqaDtEK~|$jLL|{l(UfRP
zwZP*a(YRKUVgX`*f`(E|4WuwuiZXeJCzvLm>0DQ%hYVNJvGYJvp*l^dKEYv#5N9cK
z0?NF=JzGX~PC!F2J~XYna#LmqRq6nY8MQE4N!r1QNHWuQ52j<*!ReSS!AZpp_24u_
z)8X)F<_nqy{~yhqdT4G;HiV<NiMh4p6v`beH_?Eb)pV?;)8PRv5!#p50~D>JC(1mT
mqB?r!HKM1x{bO#ahv?RZfE;d<9EbUVx>2!im;FI%7yJh^@-T1!

delta 1812
zcmbW0XLwXa6o%h>v%7QIofudQaq|#FEC{5C8c{$%!3dEOQ7Oi@AObOJBn2s95mXcv
zAr}jxfHepzgkVBI!5&4UVnyr?6%-Zg4<GQ%-H;H2e|&cD%$aj$&iUs1&dlq%yk~6d
zzKxrKlld!178MR|kj32Ta94=CxyKAkOypkUUg|K!A=hE3!>~4Fa$ku1S!RaiL00g9
z;=v&8c*rasRy-2qaFcVUN%N@LR%uSH4DlGNjJ0}Hh{t(C@nn!RDvWDQh_zIOSVy(-
ztv9}>Lex-emKz-E95y;^awsqfpEkoYK{m6+SkEe+Q#@bQ(A5_d;|0ZwikGVQ`G#BW
zjKE$yrPy86HrX8?IKmp_uJL8KOI3d2%Zhr%D}qAtYITAWwR8G%x&?Anvz6B@d_~cT
z6C|JJbs98p@TTT1wrSqx9nA^!RJ^NskM}hnuwC(?W(Oa+tAbqy^yOpCCwywrt{_?#
z%_=RKT$nXDT0Ci3w8#WL(|pbsS|rF;e5v`0uQjL8OYx0nC*QiWLLJ;Zm71<OmD3d8
zX})KdAl2;V2hES{(e$Q|;wR0|?9%+g9=A^@Gr8PA-AjYwSIuwyuK9yMCEd>I#d@kg
zmMOA=AKT!^;zU^mWIjn|+rVk%6I88yf~l2H(EQ71@(QOi_LJ;cGF#cEc=uYYDz9FD
z8O<)}%m5j+XZtyWGi7BlkU@gApSvZz+v@MGZl51ByNU?OxTA5GvCbk#cH3;{YzE8h
z7gdIcl|UP|k;^&wNTh+GV)<!LJ;N9-l~>CBN029)*Kri*$_YoBsv{#gPfj+-ne(}T
zAfu#S2gys!D>hn+#gC4Wqhlr53IBdFP>Kr``Ie=)$opRmk(87)E|EQcOK`%a^4VPG
zF@KmOipn=GAFG)0TrM#sG%-O8iz}EYz=b?(g<QokzDn1h+$&a(-bC8iS~~UicVEwu
zJ?iLe(>o9e$UQ8U5sdgFff~9<@MsAhBS95W2L)9P$EJsm%cvtIfzj#Vt`Xk>^Z1BA
zZf>A$xLbM+?bk|WA4aSkdFbG-OHPdq<Qn0wNUnda+@_d9N+_e0a;7qm>!@Iwyv^yJ
zt|LA0l}(COGKtA@L5JlONK#u~`FyUF90_z|7FTh#6wGFd)F=|gMleRI<cVU1(q&VO
zVzDMs;=$skU`eAUT}jw49Tf01DHT~1Ws0dvu<<t?71QG50dXeD&CGLXDav$D6m3MA
zA>X)SX3A7fY*t(v={Q?{kR)6u3fJ9jMhkO>Guz`V=!NG>)86Qj;WZLTO=KiVSIw53
zjXe@;gpn%8ntS7V=9ubUpUgFoV(~_~L3Ue`_`lHfI5e6Cf@b0WM{^T%Voh-7HMeaX
z&CT4>$W5-?!Eh7yxY<B@9T|rPv_xoMdJv#+6Fp(+j9Z)OncqlHZcBb{JBXj#TLQ9K
TAZKju@YD^9wNTd0)Gqo5IczS)

diff --git a/target/classes/com/lz/modules/sys/oauth2/OAuth2Filter.class b/target/classes/com/lz/modules/sys/oauth2/OAuth2Filter.class
index 5c5c781bbc9ce29db959822ce4076a6eadad6166..94e5604ea6f4eb7c83a3d0312aab60f471b9c2c4 100644
GIT binary patch
delta 1541
zcmaJ>TT@$A6#jP3WhaLdBvDEa5gN)RHUto?EyPx(h_y;fwH2*a5o5pvOpv6MYBjb}
z?^f|xwO(2sA9yI^*l~tSopJi&IOC(g!2h5RK6E;M`y>-)eDKVieLHJ?>s#Mi`<!dK
z);#e0&1=5^*op5fwBm@wQ48DgxP>u1A@QUI1IKFM!&3n~jpG)FXDmF6ak(^DKPoY0
zA*8%s^dn;-i)po=sX+~1vXDbwfzA5yvO1ZwP(abb3Cv5J^rKhdE~w#@#48f7UcE3U
zLZ=0+;e}LswwTH13KFlmTYZ1IS-oEh=-EO(=LWRDMZ#^?5^k@)J0S6##Onlfujp6I
zHna=0yFsHpXyYIbNtA57fiv!TBOYzTSsQO+QR1A9xA3-&chu&zjd$^$KnLBTW?`0L
z({7uY*zrC-5Qq$>Qt3jWYbc*9&gEyi24`mSC%Z=HGE<qH#D_M{W6}M=Y;ez*O+5m^
zOm2Q+Ci6nHn4eD5;3FF!W68!RaBX~w3lg8%_*@bB0(;$?M(eJNI4kj`jj!-E6S46P
z76oq2PRvjAWb!=+Myq1jxP;3#zQtw5b;*eS)F_vQ`-eZ{UJCr$Vy73<sT0NYNS@3D
zY76P2;+)PEkDi)M3v|2Nw03t^3%J?9PB&!@AKuQ2tH*=@h2z-4T@Po$*@&+}T;;-t
zSj7m4;tsCuvH^A=&Yg}<B%qPgKUSioY{NVQ0R!}`qeqw)$}jGnM=E|m1YPL%up$h5
zCnE)D+lxM;-9>vp#0`WcyYp`DbXxAhZmt48Ix42>upa|-RLti%yWiKedK_wr0b<q@
zuYm}g@ttaXryAd>#0MNCaZe?_2GQUJ3~JSYNiXOg>{S_a{U>LW^H{v|I(%!;4t15*
zp<l$l#C6mpbw>}|;ot^pHE?;$I_kXj&j=k`LpUUs!nduXeid7ihNEwwLBKIqu~l1%
zcP3WhtPooB3eZ7uKym@ntHT~_A%zy)OJet95c}Be4`3AgnP>?-Hfb=x`94ZCh*}!;
z@h+2RHT$t@_G4A`5B^tu-tqrcUq$xR7cufw3@4qEt}-_qBiy)wh>r<vN?>eC!1Qka
z4KlIJm&>F{F&uLhP1GYPD*`!EN#l2nvNV25vkW6?YAfu97{>8Dnkxcz^B)6@K)M6L
zSV`6UI0^OBYKYR97)B%C2O)8U9jx^5E4o!ZCYk$wuNx=v5DqXc^;LDK>ZD0eBc0yk
zo~nk|p&{ru&?oWmki;X?5+lOvmyli}7zl%E<M`D7sM4tg&I&Zr8Q!*mC_g2<p0T}s
zi`xIl&*j3GZ&Ql7OtSD(?9i;&&CxPMm4AfgKTQ7K9f~nM-{vK9R2kLPF$AqZt4BHd
G@Yui8&Ea4G

delta 1352
zcmaKs-E$LV6vls>&F0<gZVL%Q-PU5jLN$$zqLmuIt+k*)sjVVfEg>f92Q;-!v7k17
z;kP2LqD8&#g<Qxm(+`|+dgJK$H|Rg1H(oG~=iPRKS7s*XJ@4!}=XsuU&hFLiXIpE(
z{d4sv;BLNk*uj9}DTfq;4nsVxc*eovh)aZL;~eEVN6hmM!@Qt)(PqTO<(N(0=D2nX
zHZM68DLIrGRg5`|GvRQ8lZr`)CI+;r=-4TTmzmzCn6b%fgsL{Pic^YLE`K*|B<2j9
z-nl|?sybGgoKc((Qjx!cA@ff=IzCgGG{^+QMrSY^?FtfRE-s7|XQW<mCHlR&lUstk
zm3E)xfZ|n;*LXd+V5M7kGVf924aJ)tZ}GOrJNh!`ah7+3Kdg>mEw;makNF@L%b4%;
zLC_UT)jst2NQZsw@d=+AG*_m}+5A+#Fj~xxR;yFlePRZy`Rc6jJmYar2Y=>qp3e<#
zC{#{n%auy`L@`?y;@Lhi9syr?e8~mHR~}z8Z?I)Ne=46Ht7P~0*L8a=aMAYohKmNf
zg9R&fWv^N^HZ{%^t38#;YH_kUbb6{7{BBPK8K)5R#eWXYIlYHdGEM!9VIaK_+a|ZH
zoQ9lMdKu%gI1zSj1R-PJExxxNKs&d}Ey``AF=-3h+>Eg+7;u}8>8P|kftHOZ?RAg|
zGh4WwPN^FwDR6g4?wt~8V_YMt*u!06RYNweOT2hQ5|I=Qbq{+bu`T%3P1iK7MoC6W
zY?TsCl5ic^uLJvaV1EM`e7d=J1K7l93XvMjI#PFtmg7DxO#CB)s^z%pjx{37n1`aZ
zOLAXtjw2`JM9|~^Vc^yoxOE0@U3z3g`u~W%p9i#9FxrJiTp&t*bPYFW`Bu`at<n%d
zyvF3FRW_U2O{|a%{mc?uenDjx<u7h7mN3ryu_d;yuq~&4r0M7~H~MM`KWF>aD$NGI
zy+q3*RxV~<k}<V2!f|dAVBP0Vc^%;Zii2$CkPNdw_`9LCru#iC)Vd}9K^~G_>ZO^7
zc|;-yWl<iL+1Q$Ry%#0X-4m`siN_>bcdiunM^Ca8_9rUYBht%0`LyWOND#fo9>u;M
z#r_G!6Gk|%M6@QwkTTQ<7eQX<^{z1^r!Lykk!)RMdxV3T6`~7x;r(WP|3MzFD@=y-
yEr^zqC@jl{jEA#Kt(U0tZ;=ih68_=xwu`*T_3icb_UfIr42hDt(JwZ_;eP=XxxkSC