From aa16ce1234c6ab54f1f5f7e5a06e40ccb7675d8c Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 1 Mar 2018 15:25:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Elogo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RuoYi.edf | Bin 2369238 -> 2370710 bytes new_intall_20180228.sql | 2 +- .../ruoyi/framework/config/ShiroConfig.java | 2 + .../mybatis/system/SystemOnlineMapper.xml | 5 + src/main/resources/static/css/login.min.css | 1 + src/main/resources/static/css/style.min.css | 1 + src/main/resources/static/favicon.ico | Bin 16958 -> 16958 bytes src/main/resources/static/ruoyi.png | Bin 0 -> 5645 bytes src/main/resources/templates/login.html | 103 +++++-------- src/main/resources/templates/login_v1.html | 144 ++++++++++++++++++ 10 files changed, 193 insertions(+), 65 deletions(-) create mode 100644 src/main/resources/static/css/login.min.css create mode 100644 src/main/resources/static/css/style.min.css create mode 100644 src/main/resources/static/ruoyi.png create mode 100644 src/main/resources/templates/login_v1.html diff --git a/RuoYi.edf b/RuoYi.edf index 71ed9d0966feb7b6092bcd8e7e429e9d83371d5e..f3dd6e2dc53fed4fbca64709bccd6dcac1ed7adb 100644 GIT binary patch delta 3677 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 delta 2207 zcmV;Q2w?Y?*^mL&&5!|rgaL#Cgad>Ggaw2Kga?EOgb9QSgbRcWgbjoagb#!egb{=i zgcF1mgcXDqv==N6f8@9~9t3Rk+OLbzL)b_vZ~SXdDbv+6Kw17-ZSc#v`v^7IFqzF? zL6x|2bwo?uw+8W|4gsZ8vg*K|6!u9Sp9;bs`JzLpThhQ zzqW3?z~0Bb#=UYajY#__nS=h@Ns8j@6ysd{nqUb6;_BMAe-AIijM}5*^H(d>FO5*D zYkF-qYMnY~PNhN10m9}I7G89d!A(X;mO|30UHxI*6h!|O0FYx9U1WazeH#yhF=>I0 z^hN5eQX5+$G9Cq7PxXXwfeeEpfdMdi-LrIbgSKSjpa=@yyyo;glhm@f;wbMGNwRHM zf#bax0{?dDe8&*D!4;vyFVnRu??Guw;jKrmb{p0B9*_< zM2Nb$!X1-{>o+VM} zAD8B?B|r^^op);PLbU%csDyZ!HEH$RhI%31Bqb7Zw#cU~hWiE<9EfRrRR6-(tjcKbnBX!f$eGOOxZTN6 z*FRuHe{t%Vsqv|1(nXy%%@oU9ZFrv=W5d|X?UaxrWGAY3+V32XLlV8R3#I*B{Iz4G zSfZ&Dcpfvt>V@ZVAgsCD&3TtE^ZYo!gmL6063R{wA^{wb0mC5 z^0$2y1T=!q?ebM10;Z=4Bh6{Rg13s0h(ODsHC7bA5;qzpuCVqZ+3|o5v?+#R!fo}%>?v7K%>WfW1#6-kf7Fxj zbq#f~O;ls1c8e*T#C{IMu1o|-pFht&WgIa{A)K&#s2_H1;Pkq4Ae1+Vh^?qG7QIHP^_ zC(K3O{$>}xtVyQfn*D{#O7_CXYV6~4R-DFeNeJD4nRq(uR_cnV4t?7*J1E@fHDbd6 zc8YmLoNA{v3@%=c0IBuFe@NF#0}feMbOoUOr8Wk8#mxI9xxKOF+&|m#8a_^-!HMxB zS9r8SV9yh{8Z`o(+<}J}V8L9IH~V&DUaO0B&CvE9_|t&q-3^*9hhLmby;lTI+$;#b z#<#WZTo#~YuGI-c7ncYf9&7AOzH|BglB)8 zvUk&O7?p%*i}^ii6jikZtL$>M&A1A)LB@a5#<#U<8MLR3J`9HhTbIZK@40YS9s@Mf zQY66{QgjB+@xn<^er0EvoB?|)&Y1#s42t+?^UF|p5AkCZEYDoS@J!k97Id%g)tBbv zZ1ubj2E06D>VW`me^3$zSX8Y_fGt}9JYrRBm58ueLhz-Nj+0Zyhq{nc4<}Pb8W;6@Ravv)c9Vi1E%9x9sodb7;P`bzbHtF;)~OtwTrR9 zwL=Rws~H;SOyyat0kUDG<;ueY*OtnN1L{&*+}&hvT}Q{JUM}%n0|0Mq`z1?LsJ7tB zP=7(2;SPL75~6_-R23Ds0**Z{GT0kE16`}PVY(Z=0hizo69|WN7Z-AjKpHlv4sA2dYms5*-I;z6sribb0{v+f99w6-~oEXZZW|iQRsp$*o@Z z_*Neg(}~aX^nqj54JIwbipC)*O}8q^8aV1ia#%0+g6;SEA(ZB(pRT7)a7Yfo4QeWG zrv~7qfS>+MJZadyWHs%(R7}7hhSfAV0f0nR8ziH!OA~05A>nj`W=DYBho-X|ho-X} hho-X~ho-Y0ho-Y1ho-Y2ho-Y3ho-Y4x2CfrFmpoHJ&FJT diff --git a/new_intall_20180228.sql b/new_intall_20180228.sql index 9b7fd759a..0ce498088 100644 --- a/new_intall_20180228.sql +++ b/new_intall_20180228.sql @@ -274,7 +274,7 @@ create table sys_user_online ( ) engine=innodb default charset=utf8; insert into sys_user_online(sessionId, login_name, dept_name, ipaddr, browser, os, status) -values('c3b252c3-2229-4be4-a5f7-7aba4b0c314c', 'admin', '开发部门', '127.0.0.1', 'Chrome 45', 'Windows 7', 'on_line'); +values('c3b252c3-2229-4be4-a5f7-7aba4b0c314c', 'admin', '研发部门', '127.0.0.1', 'Chrome 45', 'Windows 7', 'on_line'); -- 用户部门表 SELECT * FROM sys_dept; diff --git a/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/src/main/java/com/ruoyi/framework/config/ShiroConfig.java index ab43c06d2..c0b6356ff 100644 --- a/src/main/java/com/ruoyi/framework/config/ShiroConfig.java +++ b/src/main/java/com/ruoyi/framework/config/ShiroConfig.java @@ -192,6 +192,8 @@ public class ShiroConfig // Shiro连接约束配置，即过滤链的定义 LinkedHashMap filterChainDefinitionMap = new LinkedHashMap<>(); // 对静态资源设置匿名访问 + filterChainDefinitionMap.put("/favicon.ico**", "anon"); + filterChainDefinitionMap.put("/ruoyi.png**", "anon"); filterChainDefinitionMap.put("/css/**", "anon"); filterChainDefinitionMap.put("/docs/**", "anon"); filterChainDefinitionMap.put("/fonts/**", "anon"); diff --git a/src/main/resources/mybatis/system/SystemOnlineMapper.xml b/src/main/resources/mybatis/system/SystemOnlineMapper.xml index 8552a0a6d..3456dd93c 100644 --- a/src/main/resources/mybatis/system/SystemOnlineMapper.xml +++ b/src/main/resources/mybatis/system/SystemOnlineMapper.xml @@ -42,6 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + 忘记密码了？ + + -
-
-

用户登录

-

欢迎登录若依后台管理系统

- - - - - -
+
- - diff --git a/src/main/resources/templates/login_v1.html b/src/main/resources/templates/login_v1.html new file mode 100644 index 000000000..774187282 --- /dev/null +++ b/src/main/resources/templates/login_v1.html @@ -0,0 +1,144 @@ + + + + + + + + 若依管理系统 + + + + + + + + + + + + + +
+
+
+ +
+
+
+

用户登录

+

欢迎登录若依后台管理系统

+ + + + + +
+
+
+ +
+ + + + + + + + + + +