From 6dcb1dc5ec038b88cc9d575efe02f2c69300197c Mon Sep 17 00:00:00 2001 From: Witt Zhang Date: Mon, 24 Dec 2018 15:38:23 +0800 Subject: [PATCH] rouyi,second commit --- README.md | 2 +- pom.xml | 2 +- .../controller/monitor/SysJobController.java | 20 +++--- .../monitor/SysJobLogController.java | 2 +- .../monitor/SysLogininforController.java | 2 +- .../monitor/SysOperlogController.java | 2 +- .../monitor/SysUserOnlineController.java | 2 +- .../system/SysConfigController.java | 2 +- .../system/SysDictDataController.java | 2 +- .../system/SysDictTypeController.java | 2 +- .../system/SysNoticeController.java | 2 +- .../controller/system/SysPostController.java | 2 +- .../controller/system/SysRoleController.java | 2 +- .../controller/system/SysUserController.java | 2 +- .../web/controller/tool/GenController.java | 2 +- .../src/main/resources/application-druid.yml | 6 +- .../src/main/resources/application.yml | 2 +- .../main/resources/ehcache/ehcache-shiro.xml | 2 +- .../src/main/resources/static/css/login.css | 62 ++++++++++++++++ .../main/resources/static/css/login.min.css | 2 +- .../src/main/resources/static/ruoyi/login.js | 1 - .../src/main/resources/templates/login.html | 10 +-- .../src/main/resources/templates/main.html | 2 +- .../templates/system/dict/data/data.html | 2 +- .../common/exception/BusinessException.java | 24 +++++++ .../com/ruoyi/common/page/PageDomain.java | 72 +++++++++++++++++++ .../com/ruoyi/common/page/TableDataInfo.java | 69 ++++++++++++++++++ .../com/ruoyi/common/utils/ExcelUtil.java | 3 +- .../ruoyi/framework/config/CaptchaConfig.java | 33 +++++++-- .../filter/online/OnlineSessionFilter.java | 2 +- .../com/ruoyi/framework/util/ShiroUtils.java | 12 ++-- .../framework/web/base/BaseController.java | 15 +++- .../exception/DefaultExceptionHandler.java | 15 +++- .../framework/web/page/TableSupport.java | 1 + .../main/resources/vm/java/Controller.java.vm | 2 +- .../resources/mapper/quartz/SysJobMapper.xml | 2 +- .../ruoyi/system/mapper/SysDeptMapper.java | 7 ++ .../system/mapper/SysLogininforMapper.java | 4 +- .../service/impl/SysDeptServiceImpl.java | 29 +++++++- .../service/impl/SysDictTypeServiceImpl.java | 5 +- .../service/impl/SysPostServiceImpl.java | 5 +- .../service/impl/SysRoleServiceImpl.java | 5 +- .../service/impl/SysUserServiceImpl.java | 5 +- .../resources/mapper/system/SysDeptMapper.xml | 10 +++ sql/ry_20181203.sql | 2 +- 45 files changed, 390 insertions(+), 69 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/exception/BusinessException.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/page/PageDomain.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/page/TableDataInfo.java diff --git a/README.md b/README.md index 41f792c97..6cb51005e 100644 --- a/README.md +++ b/README.md @@ -70,4 +70,4 @@ ## 若依交流群 -QQ群： [![加入QQ群](https://img.shields.io/badge/已满-1389287-blue.svg)](https://jq.qq.com/?_wv=1027&k=5HBAaYN) [![加入QQ群](https://img.shields.io/badge/QQ群-1679294-blue.svg)](https://jq.qq.com/?_wv=1027&k=5cHeRVW) 点击按钮入群。 \ No newline at end of file +QQ群： [![加入QQ群](https://img.shields.io/badge/已满-1389287-blue.svg)](https://jq.qq.com/?_wv=1027&k=5HBAaYN) [![加入QQ群](https://img.shields.io/badge/已满-1679294-blue.svg)](https://jq.qq.com/?_wv=1027&k=5cHeRVW) [![加入QQ群](https://img.shields.io/badge/QQ群-1529866-blue.svg)](https://jq.qq.com/?_wv=1027&k=53R0L5Z) 点击按钮入群。 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 16895d66a..b84db1a82 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ org.springframework.boot spring-boot-dependencies - 2.0.5.RELEASE + 2.1.1.RELEASE pom import diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java index dcf7be405..c65890d65 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java @@ -5,13 +5,17 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.common.utils.ExcelUtil; import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.quartz.domain.SysJob; import com.ruoyi.quartz.service.ISysJobService; import com.ruoyi.framework.web.base.BaseController; @@ -21,19 +25,14 @@ import com.ruoyi.framework.web.base.BaseController; * * @author ruoyi */ -//@Controller -@RestController +@Controller @RequestMapping("/monitor/job") public class SysJobController extends BaseController { private String prefix = "monitor/job"; - - private final ISysJobService jobService; - - public SysJobController(ISysJobService jobService) { - this.jobService = jobService; - } + @Autowired + private ISysJobService jobService; @RequiresPermissions("monitor:job:view") @GetMapping() @@ -87,7 +86,6 @@ public class SysJobController extends BaseController { mmap.put("name", "job"); mmap.put("job", jobService.selectJobById(jobId)); - return prefix + "/detail"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java index 9d68afed4..9183fc1d6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.common.utils.ExcelUtil; import com.ruoyi.framework.web.base.BaseController; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.quartz.domain.SysJobLog; import com.ruoyi.quartz.service.ISysJobLogService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java index 93bb0f63f..fa33b583c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.common.utils.ExcelUtil; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.service.ISysLogininforService; import com.ruoyi.framework.web.base.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index 85bfaf714..36392b6f8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.common.utils.ExcelUtil; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.service.ISysOperLogService; import com.ruoyi.framework.web.base.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java index bcecedbd1..6e6e2d992 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java @@ -13,10 +13,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.OnlineStatus; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.framework.shiro.session.OnlineSession; import com.ruoyi.framework.shiro.session.OnlineSessionDAO; import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.system.domain.SysUserOnline; import com.ruoyi.system.service.impl.SysUserOnlineServiceImpl; import com.ruoyi.framework.web.base.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index 0e1eb756a..34a665a19 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.common.utils.ExcelUtil; import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.framework.web.base.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index b535278e6..b1fe194b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.common.utils.ExcelUtil; import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.system.domain.SysDictData; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.framework.web.base.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index 2a748d3fe..70db269bb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.common.utils.ExcelUtil; import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.system.domain.SysDictType; import com.ruoyi.system.service.ISysDictTypeService; import com.ruoyi.framework.web.base.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index 99726a530..220bb0afd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.service.ISysNoticeService; import com.ruoyi.framework.web.base.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java index 2c012acac..2a58275ba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.common.utils.ExcelUtil; import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.service.ISysPostService; import com.ruoyi.framework.web.base.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 505df288c..555bb107b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.common.utils.ExcelUtil; import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.system.domain.SysRole; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.framework.web.base.BaseController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 8933effd6..7b54f3a4f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.common.utils.ExcelUtil; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.shiro.service.SysPasswordService; import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysRoleService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/GenController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/GenController.java index b30a7969b..d8722dda7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/GenController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/GenController.java @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.page.TableDataInfo; import com.ruoyi.common.support.Convert; -import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.generator.domain.TableInfo; import com.ruoyi.generator.service.IGenService; import com.ruoyi.framework.web.base.BaseController; diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index f2c27c88f..36a961129 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -2,13 +2,13 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver + driverClassName: com.mysql.cj.jdbc.Driver druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true + url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: root + password: password # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 7a3ac4602..d34b61280 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -17,7 +17,7 @@ server: port: 80 servlet: # 项目contextPath - context-path: /ruoyi + context-path: / tomcat: # tomcat的URI编码 uri-encoding: UTF-8 diff --git a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml index 711b8b7ee..986d2bd16 100644 --- a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml +++ b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml @@ -1,5 +1,5 @@ - + diff --git a/ruoyi-admin/src/main/resources/static/css/login.css b/ruoyi-admin/src/main/resources/static/css/login.css index c2a4273a4..a957cfead 100644 --- a/ruoyi-admin/src/main/resources/static/css/login.css +++ b/ruoyi-admin/src/main/resources/static/css/login.css @@ -84,3 +84,65 @@ body.signin { width:auto } } +/* +¼checkʽ +*/ +.checkbox-custom { + position: relative; + padding: 0 15px 0 25px; + margin-bottom: 7px; + margin-top: 0; + display: inline-block; +} +/* +ʼcheckboxʽı +*/ +.checkbox-custom input[type="checkbox"] { + opacity: 0;/*ʼcheckbox*/ + position: absolute; + cursor: pointer; + z-index: 2; + margin: -6px 0 0 0; + top: 50%; + left: 3px; +} +/* +µcheckboxλ +*/ +.checkbox-custom label:before { + content: ''; + position: absolute; + top: 50%; + left: 0; + margin-top: -9px; + width: 18px; + height: 17px; + display: inline-block; + border-radius: 2px; + border: 1px solid #bbb; + background: #fff; +} +/* +ʼcheckboxµcheckbox +*/ +.checkbox-custom input[type="checkbox"]:checked +label:after { + position: absolute; + display: inline-block; + font-family: 'Glyphicons Halflings'; + content: "\e013"; + top: 42%; + left: 3px; + margin-top: -5px; + font-size: 11px; + line-height: 1; + width: 16px; + height: 16px; + color: #333; +} +.checkbox-custom label { + cursor: pointer; + line-height: 1.2; + font-weight: normal;/*ırememberme*/ + margin-bottom: 0; + text-align: left; +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/css/login.min.css b/ruoyi-admin/src/main/resources/static/css/login.min.css index eb67b2783..d17df77c3 100644 --- a/ruoyi-admin/src/main/resources/static/css/login.min.css +++ b/ruoyi-admin/src/main/resources/static/css/login.min.css @@ -1 +1 @@ -html{height:100%}body.signin{height:auto;background:url(../img/login-background.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover;color:rgba(255,255,255,.95)}.signinpanel{width:750px;margin:10% auto 0}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0 0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:420px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}} \ No newline at end of file +html{height:100%}body.signin{height:auto;background:url(../img/login-background.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover;color:rgba(255,255,255,.95)}.signinpanel{width:750px;margin:10% auto 0}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:420px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}.checkbox-custom{position:relative;padding:0 15px 0 25px;margin-bottom:7px;margin-top:0;display:inline-block}.checkbox-custom input[type="checkbox"]{opacity:0;position:absolute;cursor:pointer;z-index:2;margin:-6px 0 0 0;top:50%;left:3px}.checkbox-custom label:before{content:'';position:absolute;top:50%;left:0;margin-top:-9px;width:18px;height:17px;display:inline-block;border-radius:2px;border:1px solid #bbb;background:#fff}.checkbox-custom input[type="checkbox"]:checked+label:after{position:absolute;display:inline-block;font-family:'Glyphicons Halflings';content:"\e013";top:42%;left:3px;margin-top:-5px;font-size:11px;line-height:1;width:16px;height:16px;color:#333}.checkbox-custom label{cursor:pointer;line-height:1.2;font-weight:normal;margin-bottom:0;text-align:left} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/login.js b/ruoyi-admin/src/main/resources/static/ruoyi/login.js index 997da5ddf..8ee01c2c6 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/login.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/login.js @@ -1,7 +1,6 @@ $(function() { validateRule(); - $(".i-checks").iCheck({checkboxClass:"icheckbox_square-green-login"}); $('.imgcode').click(function() { var url = ctx + "captcha/captchaImage?type=" + captchaType + "&s=" + Math.random(); $(".imgcode").attr("src", url); diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index 16b54975a..a52e2ec0c 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -11,7 +11,6 @@ -