diff --git a/pom.xml b/pom.xml index 1215ce5d3..288014163 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ ${shiro.version} - + org.apache.shiro shiro-spring diff --git a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml index 72469e13a..20ac1121b 100644 --- a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml +++ b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml @@ -4,14 +4,15 @@ - - - - - - + + + + + + - + + .row>div { margin-bottom: 15px; diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index ed1376ca2..b80d84d32 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -215,9 +215,15 @@ var table = { $(optionsIds).off("click").on("click", '.img-circle', function() { var src = $(this).attr('src'); var target = $(this).data('target'); - var height = $(this).data('height'); - var width = $(this).data('width'); if($.common.equals("self", target)) { + var height = $(this).data('height'); + var width = $(this).data('width'); + //如果是移动端，就使用自适应大小弹窗 + if ($.common.isMobile()) { + width = 'auto'; + height = 'auto'; + } + layer.open({ title: false, type: 1, diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/login.js b/ruoyi-admin/src/main/resources/static/ruoyi/login.js index f633f51de..4acf33810 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/login.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/login.js @@ -26,7 +26,7 @@ function login() { data: { "username": username, "password": password, - "validateCode" : validateCode, + "validateCode": validateCode, "rememberMe": rememberMe }, success: function(r) { diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html index c67f0b7f5..733acd174 100644 --- a/ruoyi-admin/src/main/resources/templates/include.html +++ b/ruoyi-admin/src/main/resources/templates/include.html @@ -2,6 +2,7 @@ + diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 64b70b6f8..e61f0726c 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -5,9 +5,8 @@ 若依系统首页 - + + @@ -34,7 +33,7 @@