From 1dce44a9f64357625aa17b4a50df9ec214e0f3a4 Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Wed, 13 Jan 2021 21:06:58 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E3=80=90func.js=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=BC=B9=E6=A1=86=E6=96=B9=E6=B3=95=EF=BC=8Cifream?= =?UTF-8?q?=E5=86=85=E5=BC=B9=E5=87=BA=E9=81=AE=E7=BD=A9=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/assets/expand/module/func/func.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/assets/expand/module/func/func.js b/src/main/webapp/assets/expand/module/func/func.js index 57c1a911..58bf2442 100644 --- a/src/main/webapp/assets/expand/module/func/func.js +++ b/src/main/webapp/assets/expand/module/func/func.js @@ -83,7 +83,10 @@ layui.define(['jquery', 'layer', 'admin', 'table'], function (exports) { param.shade = .1; } - var thisIndex = top.layui.layer.open(param); + //ifream 内遮罩层 + //var thisIndex = top.layui.layer.open(param); + //ifream 内遮罩层 + var thisIndex = admin.open(param); //按键监听esc关闭对话框 $(window).keydown(function (event) { From 39e5d3ca2ffae688431dd5cf76a80014ca6bfc8d Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Wed, 13 Jan 2021 21:07:28 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E3=80=90resource=5Fdetail.html=E3=80=91?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/resource/resource_detail.html | 198 ++++++++---------- 1 file changed, 85 insertions(+), 113 deletions(-) diff --git a/src/main/webapp/pages/modular/auth/resource/resource_detail.html b/src/main/webapp/pages/modular/auth/resource/resource_detail.html index 6c782ec6..2df32714 100644 --- a/src/main/webapp/pages/modular/auth/resource/resource_detail.html +++ b/src/main/webapp/pages/modular/auth/resource/resource_detail.html @@ -1,136 +1,108 @@ -@layout("/layout/_container.html",{js:["/assets/modular/auth/resource/resource_detail.js"]}){ +@layout("/layout/_form.html",{js:["/assets/modular/auth/resource/resource_detail.js"]}){ -
- 资源管理 -
-
-
-
-
-
-
+
+
+
+
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
+
+ +
+ +
+
+
+ +
+
+
+ +
-
- -
+ @} From 402a4d58a788905d5128bf550e2d7e60196cfb62 Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Wed, 13 Jan 2021 21:08:03 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E3=80=90log=5Fdetail.html=E3=80=91form?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/pages/modular/system/log/log_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/pages/modular/system/log/log_detail.html b/src/main/webapp/pages/modular/system/log/log_detail.html index 4011dcf3..7f329430 100644 --- a/src/main/webapp/pages/modular/system/log/log_detail.html +++ b/src/main/webapp/pages/modular/system/log/log_detail.html @@ -1,6 +1,6 @@ @layout("/layout/_form.html",{js:["/assets/modular/system/log/log_detail.js"]}){ -
+
From cee819554f13705ac0b307b54215b8520c1fad1c Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 14 Jan 2021 21:45:37 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=91=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=8F=92=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/pages/layout/_tree_container.html | 4 ++-- src/main/webapp/pages/modular/system/dept/dept.html | 4 ++-- .../pages/modular/system/organization/organization.html | 4 ++-- src/main/webapp/pages/modular/system/user/user.html | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/pages/layout/_tree_container.html b/src/main/webapp/pages/layout/_tree_container.html index a665e304..61b4dab2 100644 --- a/src/main/webapp/pages/layout/_tree_container.html +++ b/src/main/webapp/pages/layout/_tree_container.html @@ -62,7 +62,7 @@ ${layoutContent} @if(isNotEmpty(plugins)){ - @if(array.contain(plugins,"ztree")){ + @if(array.contain(plugins,"jquery-layout")){ @} @@ -77,4 +77,4 @@ ${layoutContent} @} @} - \ No newline at end of file + diff --git a/src/main/webapp/pages/modular/system/dept/dept.html b/src/main/webapp/pages/modular/system/dept/dept.html index a3687fc6..6b4b18b6 100644 --- a/src/main/webapp/pages/modular/system/dept/dept.html +++ b/src/main/webapp/pages/modular/system/dept/dept.html @@ -1,4 +1,4 @@ -@layout("/layout/_tree_container.html",{plugins:["ztree"],js:["/assets/modular/system/dept/dept.js"]}){ +@layout("/layout/_tree_container.html",{plugins:["jquery-layout"],js:["/assets/modular/system/dept/dept.js"]}){
部门管理 @@ -50,4 +50,4 @@ 删除 @} -@} \ No newline at end of file +@} diff --git a/src/main/webapp/pages/modular/system/organization/organization.html b/src/main/webapp/pages/modular/system/organization/organization.html index 5fe34848..97916dd6 100644 --- a/src/main/webapp/pages/modular/system/organization/organization.html +++ b/src/main/webapp/pages/modular/system/organization/organization.html @@ -1,4 +1,4 @@ -@layout("/layout/_tree_container.html",{plugins:["ztree"],js:["/assets/modular/system/organization/organization.js"]}){ +@layout("/layout/_tree_container.html",{plugins:["jquery-layout"],js:["/assets/modular/system/organization/organization.js"]}){
机构管理 @@ -52,4 +52,4 @@ -@} \ No newline at end of file +@} diff --git a/src/main/webapp/pages/modular/system/user/user.html b/src/main/webapp/pages/modular/system/user/user.html index e653fc53..ba455193 100644 --- a/src/main/webapp/pages/modular/system/user/user.html +++ b/src/main/webapp/pages/modular/system/user/user.html @@ -1,4 +1,4 @@ -@layout("/layout/_tree_container.html",{plugins:["ztree"],js:["/assets/modular/system/user/user.js"]}){ +@layout("/layout/_tree_container.html",{plugins:["jquery-layout"],js:["/assets/modular/system/user/user.js"]}){
用户管理 @@ -54,4 +54,4 @@ -@} \ No newline at end of file +@} From b58268aa1298888aad2a01f16887fd2e067e4a10 Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Thu, 14 Jan 2021 22:05:41 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E3=80=90Kaptcha=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=99=BB=E5=BD=95=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/kaptcha/KaptchaController.java | 56 +++++++++++++++++++ src/main/webapp/pages/login.html | 26 +++++++-- 2 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 src/main/java/cn/stylefeng/guns/modular/kaptcha/KaptchaController.java diff --git a/src/main/java/cn/stylefeng/guns/modular/kaptcha/KaptchaController.java b/src/main/java/cn/stylefeng/guns/modular/kaptcha/KaptchaController.java new file mode 100644 index 00000000..ed50f118 --- /dev/null +++ b/src/main/java/cn/stylefeng/guns/modular/kaptcha/KaptchaController.java @@ -0,0 +1,56 @@ +package cn.stylefeng.guns.modular.kaptcha; + +import cn.hutool.captcha.CaptchaUtil; +import cn.hutool.captcha.CircleCaptcha; +import cn.hutool.captcha.LineCaptcha; +import cn.hutool.captcha.ShearCaptcha; +import cn.stylefeng.guns.core.consts.ProjectConstants; +import cn.stylefeng.roses.kernel.auth.api.constants.AuthConstants; +import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource; +import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; +import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; + +/** + * 生成验证码控制器 + * + * @author chenjinlong + * @date 2021/1/14 19:58 + */ +@Controller +@Slf4j +@ApiResource(name = "生成验证码") +public class KaptchaController { + + /** + * 获取验证码 + * + * @author chenjinlong + * @date 2021/1/14 20:10 + */ + @GetResource(name = "获取验证码", path = "/kaptcha", requiredPermission = false, requiredLogin = false) + public void getCode(HttpServletResponse response, HttpSession session) { + //定义图形验证码的长、宽、验证码字符数、干扰元素个数 + CircleCaptcha captcha = CaptchaUtil.createCircleCaptcha(200, 100, 4, 20); + //将验证码放入session + session.setAttribute(AuthConstants.KAPTCHA_SESSION_KEY, captcha.getCode()); + try { + ServletOutputStream outputStream = response.getOutputStream(); + captcha.write(outputStream); + outputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + +} diff --git a/src/main/webapp/pages/login.html b/src/main/webapp/pages/login.html index 5ebbad93..6d601a99 100644 --- a/src/main/webapp/pages/login.html +++ b/src/main/webapp/pages/login.html @@ -165,14 +165,21 @@

用户登录

- +
- +
+ @if(constants.getCaptchaOpen()){ + + @}
- +
@} +
+ + 注册账号 +
From 109a1150761460c65aedfc4de0d9e531bfd27c26 Mon Sep 17 00:00:00 2001 From: chenjinlong <$chenjinlong> Date: Fri, 15 Jan 2021 01:09:23 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E3=80=90pom=E3=80=91=E6=95=B4=E5=90=88Ea?= =?UTF-8?q?syCaptcha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index bc10a469..cace924b 100644 --- a/pom.xml +++ b/pom.xml @@ -147,6 +147,13 @@ ${oshi.version} + + + com.github.whvcse + easy-captcha + 1.6.2 + + From 58ecbedd05e3d6f34ce9c6be183f5be6a258c3ee Mon Sep 17 00:00:00 2001 From: chenjinlong <$chenjinlong> Date: Fri, 15 Jan 2021 01:10:07 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E3=80=90postion=E3=80=91=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=97=A5=E5=BF=97=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stylefeng/guns/modular/position/PositionViewController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java b/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java index 6a29d278..2c8a1899 100644 --- a/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java @@ -12,7 +12,6 @@ import org.springframework.stereotype.Controller; * @date 2020/12/28 9:28 */ @Controller -@Slf4j @ApiResource(name = "职位管理相关的界面渲染") public class PositionViewController { From 7cd5f47afd29793a09e3d68b445a814faae3f8bd Mon Sep 17 00:00:00 2001 From: chenjinlong <$chenjinlong> Date: Fri, 15 Jan 2021 01:10:51 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E3=80=90register.html=E3=80=91=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=B3=A8=E5=86=8C=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/pages/register.html | 244 ++++++++++++++++++++++++++++ 1 file changed, 244 insertions(+) create mode 100644 src/main/webapp/pages/register.html diff --git a/src/main/webapp/pages/register.html b/src/main/webapp/pages/register.html new file mode 100644 index 00000000..b8955a68 --- /dev/null +++ b/src/main/webapp/pages/register.html @@ -0,0 +1,244 @@ + + + + + + + + ${constants.getSystemName()}-用户注册 + + + + + + + + + +@/* 加入contextPath属性和session超时的配置 */ + + + + + + + + \ No newline at end of file From 65b77ef65d3d84d3799108c21c2074201f14f79b Mon Sep 17 00:00:00 2001 From: chenjinlong <$chenjinlong> Date: Fri, 15 Jan 2021 01:11:31 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E3=80=90userViewController=E3=80=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C=20?= =?UTF-8?q?=E6=89=BE=E5=9B=9E=E5=AF=86=E7=A0=81=20=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guns/modular/user/UserViewController.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/main/java/cn/stylefeng/guns/modular/user/UserViewController.java b/src/main/java/cn/stylefeng/guns/modular/user/UserViewController.java index 07140b38..78bc4f67 100644 --- a/src/main/java/cn/stylefeng/guns/modular/user/UserViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/user/UserViewController.java @@ -60,4 +60,26 @@ public class UserViewController { return "/modular/system/user/user_role.html"; } + /** + * 用户管理-注册-视图 + * + * @author chenjinlong + * @date 2021/1/7 19:09 + */ + @GetResource(name = "用户管理-注册-视图", path = "/register", requiredPermission = false, requiredLogin = false) + public String registerView() { + return "register.html"; + } + + /** + * 用户管理-找回密码-视图 + * + * @author chenjinlong + * @date 2021/1/7 19:09 + */ + @GetResource(name = "用户管理-找回密码-视图", path = "/forget", requiredPermission = false, requiredLogin = false) + public String forgetView() { + return "forget.html"; + } + } From 8c8f3504089659fe58d4f5ea2caad88ab8b9a0b1 Mon Sep 17 00:00:00 2001 From: chenjinlong <$chenjinlong> Date: Fri, 15 Jan 2021 01:35:42 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E3=80=90login=E3=80=91=20=E7=99=BB?= =?UTF-8?q?=E5=BD=95js=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/pages/login.html | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/pages/login.html b/src/main/webapp/pages/login.html index cb453985..b599e9e5 100644 --- a/src/main/webapp/pages/login.html +++ b/src/main/webapp/pages/login.html @@ -161,11 +161,11 @@ @@ -207,14 +208,14 @@ From 155cd8dc4dd10f767a53b37a94552936b8cfc8ee Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Fri, 15 Jan 2021 13:51:11 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E3=80=90login.html=E3=80=91=E5=9B=BE?= =?UTF-8?q?=E5=BD=A2=E9=AA=8C=E8=AF=81=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 --- .../modular/kaptcha/KaptchaController.java | 56 ------------------- src/main/webapp/pages/login.html | 31 +++++++--- 3 files changed, 24 insertions(+), 70 deletions(-) delete mode 100644 src/main/java/cn/stylefeng/guns/modular/kaptcha/KaptchaController.java diff --git a/pom.xml b/pom.xml index cace924b..bc10a469 100644 --- a/pom.xml +++ b/pom.xml @@ -147,13 +147,6 @@ ${oshi.version} - - - com.github.whvcse - easy-captcha - 1.6.2 - - diff --git a/src/main/java/cn/stylefeng/guns/modular/kaptcha/KaptchaController.java b/src/main/java/cn/stylefeng/guns/modular/kaptcha/KaptchaController.java deleted file mode 100644 index ed50f118..00000000 --- a/src/main/java/cn/stylefeng/guns/modular/kaptcha/KaptchaController.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.stylefeng.guns.modular.kaptcha; - -import cn.hutool.captcha.CaptchaUtil; -import cn.hutool.captcha.CircleCaptcha; -import cn.hutool.captcha.LineCaptcha; -import cn.hutool.captcha.ShearCaptcha; -import cn.stylefeng.guns.core.consts.ProjectConstants; -import cn.stylefeng.roses.kernel.auth.api.constants.AuthConstants; -import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource; -import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; -import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.io.IOException; - -/** - * 生成验证码控制器 - * - * @author chenjinlong - * @date 2021/1/14 19:58 - */ -@Controller -@Slf4j -@ApiResource(name = "生成验证码") -public class KaptchaController { - - /** - * 获取验证码 - * - * @author chenjinlong - * @date 2021/1/14 20:10 - */ - @GetResource(name = "获取验证码", path = "/kaptcha", requiredPermission = false, requiredLogin = false) - public void getCode(HttpServletResponse response, HttpSession session) { - //定义图形验证码的长、宽、验证码字符数、干扰元素个数 - CircleCaptcha captcha = CaptchaUtil.createCircleCaptcha(200, 100, 4, 20); - //将验证码放入session - session.setAttribute(AuthConstants.KAPTCHA_SESSION_KEY, captcha.getCode()); - try { - ServletOutputStream outputStream = response.getOutputStream(); - captcha.write(outputStream); - outputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/src/main/webapp/pages/login.html b/src/main/webapp/pages/login.html index b599e9e5..c18e85f4 100644 --- a/src/main/webapp/pages/login.html +++ b/src/main/webapp/pages/login.html @@ -174,9 +174,11 @@ @if(constants.getCaptchaOpen()){ + @}
@@ -217,10 +219,7 @@ var admin = layui.admin; var notice = layui.notice; - // 点击刷新验证码 - $('img.login-captcha').click(function () { - this.src = this.src + '?t=' + (new Date).getTime(); - }); + $('.login-wrapper').removeClass('layui-hide'); @@ -229,8 +228,23 @@ layer.msg(errorMsg, {icon: 5, anim: 6}); } + // 获取验证码 + function getKaptcha(){ + var request = new HttpRequest(Feng.ctxPath + '/kaptcha'+ '?t=' + (new Date).getTime(), 'get'); + var result = request.start(); + $("#verKey").val(result.data.verKey) + $('img.login-captcha').attr('src', result.data.verImage); + } + // 点击刷新验证码 + $('img.login-captcha').click(function () { + getKaptcha(); + }); + // 开启验证码 + @if(constants.getCaptchaOpen()){ + getKaptcha(); + @} // 登录操作 form.on('submit(loginSubmit)', function (data){ admin.btnLoading('#loginSubmit',"登录中"); @@ -241,8 +255,10 @@ window.location.href = Feng.ctxPath + "/"; }, function (data) { @if(constants.getCaptchaOpen()){ + //清空输入框 + $("#verCode").val(''); //刷新验证码 - $('img.login-captcha').attr("src", Feng.ctxPath+'/kaptcha?t=' + (new Date).getTime()); + getKaptcha(); @} //停止loading admin.btnLoading('#loginSubmit', false); @@ -251,6 +267,7 @@ data.field.rememberMe=$("#rememberMe").prop("checked"); request.set(data.field); request.start(true); + return false; }); }); From bbd9f1855b7d59a74d6cadc61f14d9c917ae4ddb Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Fri, 15 Jan 2021 18:57:08 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E3=80=90register=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 +- src/main/webapp/pages/register.html | 198 +++++++++++++++++++++++----- 2 files changed, 174 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index bc10a469..ecd3414e 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,7 @@ office-spring-boot-starter 1.0.0 + cn.stylefeng.roses log-spring-boot-starter @@ -108,6 +109,12 @@ 1.0.0 + + cn.stylefeng.roses + sms-spring-boot-starter + 1.0.0 + + cn.stylefeng.roses message-spring-boot-starter @@ -146,7 +153,6 @@ oshi-core ${oshi.version} - diff --git a/src/main/webapp/pages/register.html b/src/main/webapp/pages/register.html index b8955a68..062b6832 100644 --- a/src/main/webapp/pages/register.html +++ b/src/main/webapp/pages/register.html @@ -131,21 +131,21 @@ } \@media screen and (min-height: 550px) { - .login-wrapper { - margin: -250px auto 0; - position: absolute; - top: 50%; - left: 0; - right: 0; - width: 100%; - } + .login-wrapper { + margin: -250px auto 0; + position: absolute; + top: 50%; + left: 0; + right: 0; + width: 100%; + } - .login-copyright { - position: absolute; - bottom: 0; - right: 0; - left: 0; - } + .login-copyright { + position: absolute; + bottom: 0; + right: 0; + left: 0; + } } .layui-btn { @@ -156,6 +156,61 @@ .layui-link { color: #5FB878 !important; } + + .login-captcha-btn { + line-height: 44px; + text-align: center; + background-color: transparent; + outline: none; + color: #666; + padding: 0 !important; + } + + /** 获取图形验证码弹窗 */ + .layer-get-code { + padding: 25px 25px; + } + + .layer-get-code > p { + color: #666; + font-size: 16px; + } + + .layer-get-code > .lay-code-group { + position: relative; + padding-right: 135px; + margin: 15px 0; + } + + .layer-get-code > .lay-code-group > .layui-input { + border-radius: 0; + height: 46px; + line-height: 46px; + background-color: transparent; + border-color: rgba(111, 121, 122, 0.3); + } + + .layer-get-code > .lay-code-group > img { + position: absolute; + right: 0; + top: 0; + height: 46px; + width: 120px; + box-sizing: border-box; + cursor: pointer; + } + + .layer-get-code .layui-btn-fluid { + line-height: 50px; + height: 50px; + } + + /** //获取图形验证码弹窗 */ + + .layui-btn-disabled { + cursor: not-allowed !important; + color: #999 !important; + } @@ -163,28 +218,28 @@

用户注册

- - + + +
+
+ +
- +
- +
- 返回登录 + 返回登录 忘记密码
@@ -206,10 +261,13 @@