From 865ace6db03d9bdb209f21d32c635c05231c1040 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Tue, 25 Feb 2020 14:52:29 +0800 Subject: [PATCH] =?UTF-8?q?Jeecg-Boot=202.1.4=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=91=E5=B8=83=20(=E6=96=B0=E7=89=88=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/src/assets/checkcode.png | Bin 0 -> 2241 bytes ant-design-vue-jeecg/src/views/user/Login.vue | 16 ++++++++++----- ant-design-vue-jeecg/vue.config.js | 8 ++++++++ jeecg-boot/db/2jeecgboot_mysql5.7.sql | 1 - .../system/mapper/xml/SysPermissionMapper.xml | 19 ++++++++++-------- .../modules/system/util/RandImageUtil.java | 9 +++++---- 6 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 ant-design-vue-jeecg/src/assets/checkcode.png diff --git a/ant-design-vue-jeecg/src/assets/checkcode.png b/ant-design-vue-jeecg/src/assets/checkcode.png new file mode 100644 index 0000000000000000000000000000000000000000..ed86ad16d9581a2ee7643d2294b4a4cb4b84c205 GIT binary patch literal 2241 zcmbW!c{tST0tfKlm>IJeGPX0r7|YO*CB|4&NJf*0kWo0cX-J$bV=RYc3t2LjRJO9K zI4Wi89tTs*qzEY{GPWT~CKa8|`+452u`MAWdx%1% z03Znf0BsLo>os5xz$GPNl2AAd216j=NR)y!N=gcam6PA0psK8fS5?O0)U^zW>YDll z98SkvSKr8(OeU)lE%#cGtPM@br0<7-5C{ZH3WbrD#*j2{8l?X@TU`Je4iJD)Fh~=S zK!d<&(AFbBZTp>2(4PVR8IS}R0+ocp5lE@+Lc1&=0Rn?1AYdpI0@-dSZSMmRG*nK* z*iKU3EdZt&sX#hccnwb2-`1^obZAw}Brqx!fmHedgH_hvNz~EZMK(1vx3ILbKj1)d zJV-s{?%{dNi{^biD42ed5fXYTI))j`ii=N3OV7wWpOu}%E-Ef5y;OGj%JrJsy84F3 zrsmss?zZ2%-@$p%!+rF)w~xnvGCcBP^yRCual!P=?A*L)Ve##f_~Y8A&tKLzzW)B* z1p>f-v9{O0VE^GlZ@VNQ5HJMx-35|hZBH;70@W~u_7`4j>qZbv zj;<;OMhzjAw8+!i;_tLSW&a&4_5YIn3-)i906>93+n)zU12(|=xLSYqRG8Uwmr*Qn zEb&E{h+H=u6B1?T%TdpVL)6?R@LNFIb*e1C(_NjR9aSBUFJ~^8&OKPU(fU~2%ex9$e?Ba+MyeI5frYT-kHRF$5Rd`Su(kK zQakNnUwujGpiwBHVuYS$dyfW#Qe&Teo|$_c`qN zyUx>xSSwm30u|Lgg?-7Nxa3R$<548f7VroDlUY1Q9JZ4QCZaezIbj`{G@j>mGMGMF)ng-x}07(T;l0(`nfzcbj>VBN<4m zwt>h};4`L$UMe>;KAL`YKd0A=AX@l)Q8{zK!E!3*nS>98{Z6JSg%-^xST_k{KMXd2 znXFmq9ev5z5yO?4(U=STh~Gx!o;yUB(#^6ayPSlm=JUc7M5nK%qF*dBS4W>rTP~14{3uN;@9dUnpa{wOYmm2d(##x zJG9DK6UO|-1YFKsvT|J7F|iF-PugW>Nw30N;K`;2!E3W=sB|FdX^h&-hn6f8O|2U$ zY)mT2+YSp}1Mm9;STEku-&1^OqPeYidJ11FGj({@)WDr4dRF9o#vCxe(aT{8qI2=v z7cm-e409a`6C=5-FH}Aub|fXTYJRE#GZ5FRD0XhIulYueqibCW&YV3Q_zX1|AO&3QFtjejQVK=8iBrmcz0v9JI;!^a@OE2ZVI$C?m)9F$m z9W9I)SZTw}dxd-%JCLfeAnU_+u|ic=ZoIABXo>Cb>Qo(J)--q5TR%u|Ao=+Wtdsl+ zJEfjH?NSWf=huN1A_b{LPc+F{#s9Z5B1vbjap|0R0Nyuii}$S2>;C4lkso@k(n2)+ z{L#BQ`+`p~6DE269f~|2?+fpfG%I>}Qz=XKV|@+zU9%-EE_8!{rq{Z{2u4r{! z9<^7!PL(opmAY6xTMEzzY_T&Bv8{jD+#J8zqy6hhUAtq6Sni;((V&}f370D_&zFol zo5~vT``J8PLFdjW`2=5`jrI8e;arT*?sj#u^4|i^tYh$3hR@davZ2&|;|md@Cn$zB ziiyLU8|e%7qMSPbM^;RnjIrzToFQ?Onr)_0qe0JF>R*4 zN?0Zu%DYz=vFn!L`#s1^$X z0gy#>@6Bo{K2J(e?}p%MYZob2F(0;oS3RpM*^KFBh4!Ias04q(FAkzoLHeCiD947J z$HlEij)#TQeb#o#4tN?R=GU|m)4nFUcKH|lTo~vtl0QFDUH*Q#Z}PMnzW|qe#8r4} ziZ7QpYxphsi&fN~0{i7|Va}Blq|WseWRQajk4+94xIFeKxFtdO<$4Z4y*15oF5=>v z%HK0lCL1q`-E84*PUm--1GcB5Kub1uUtM`EMo%!oICP~Q&!$4bRRS|q;alibAKQk@ h{ruP}M+c}yHq)9@X!BXBF2;jG=yqkuK>@Ti{txMO;MD*C literal 0 HcmV?d00001 diff --git a/ant-design-vue-jeecg/src/views/user/Login.vue b/ant-design-vue-jeecg/src/views/user/Login.vue index 2f70744..d6ece74 100644 --- a/ant-design-vue-jeecg/src/views/user/Login.vue +++ b/ant-design-vue-jeecg/src/views/user/Login.vue @@ -9,16 +9,16 @@ + placeholder="请输入帐户名 / admin"> - + + @@ -217,7 +218,8 @@ currentUsername:"", validate_status:"", currdatetime:'', - randCodeImage:'' + randCodeImage:'', + requestCodeSuccess:false } }, created () { @@ -346,9 +348,13 @@ getAction(`/sys/randomImage/${this.currdatetime}`).then(res=>{ if(res.success){ this.randCodeImage = res.result + this.requestCodeSuccess=true }else{ this.$message.error(res.message) + this.requestCodeSuccess=false } + }).catch(()=>{ + this.requestCodeSuccess=false }) }, loginSuccess () { diff --git a/ant-design-vue-jeecg/vue.config.js b/ant-design-vue-jeecg/vue.config.js index 9782dcf..fcabbe2 100644 --- a/ant-design-vue-jeecg/vue.config.js +++ b/ant-design-vue-jeecg/vue.config.js @@ -30,6 +30,14 @@ module.exports = { .set('@comp', resolve('src/components')) .set('@views', resolve('src/views')) .set('@layout', resolve('src/layout')) + + // 配置 webpack 识别 markdown 为普通的文件 + config.module + .rule('markdown') + .test(/\.md$/) + .use() + .loader('file-loader') + .end() }, css: { diff --git a/jeecg-boot/db/2jeecgboot_mysql5.7.sql b/jeecg-boot/db/2jeecgboot_mysql5.7.sql index 00733e8..09e725f 100644 --- a/jeecg-boot/db/2jeecgboot_mysql5.7.sql +++ b/jeecg-boot/db/2jeecgboot_mysql5.7.sql @@ -1,4 +1,3 @@ -USE jeecg-boot; /* Navicat Premium Data Transfer diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml index 5cb79e3..5cf617b 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml @@ -44,15 +44,18 @@ SELECT * FROM ( SELECT p.* FROM sys_permission p - WHERE exists( - select a.id from sys_role_permission a - join sys_role b on a.role_id = b.id - join sys_user_role c on c.role_id = b.id - join sys_user d on d.id = c.user_id - where p.id = a.permission_id AND d.username = #{username,jdbcType=VARCHAR} - ) + WHERE (exists( + select a.id from sys_role_permission a + join sys_role b on a.role_id = b.id + join sys_user_role c on c.role_id = b.id + join sys_user d on d.id = c.user_id + where p.id = a.permission_id AND d.username = #{username,jdbcType=VARCHAR} + ) + + or (p.url like '%:code' and p.url like '/online%' and p.hidden = 1) ) + and p.del_flag = 0 - + UNION SELECT p.* FROM sys_permission p diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/RandImageUtil.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/RandImageUtil.java index e110362..4697821 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/RandImageUtil.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/RandImageUtil.java @@ -1,15 +1,17 @@ package org.jeecg.modules.system.util; -import sun.misc.BASE64Encoder; - import javax.imageio.ImageIO; import javax.servlet.http.HttpServletResponse; import java.awt.*; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Base64; import java.util.Random; +/** + * 登录验证码工具类 + */ public class RandImageUtil { public static final String key = "JEECG_LOGIN_KEY"; @@ -69,9 +71,8 @@ public class RandImageUtil { ImageIO.write(image, IMG_FORMAT, byteStream); //转换成字节 byte[] bytes = byteStream.toByteArray(); - BASE64Encoder encoder = new BASE64Encoder(); //转换成base64串 - String base64 = encoder.encodeBuffer(bytes).trim(); + String base64 = Base64.getEncoder().encodeToString(bytes).trim(); base64 = base64.replaceAll("\n", "").replaceAll("\r", "");//删除 \r\n //写到指定位置 -- GitLab