diff --git a/pom.xml b/pom.xml index db106a0a..2f06277d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <druid.version>1.1.14</druid.version> <bitwalker.version>1.19</bitwalker.version> <kaptcha.version>2.3.2</kaptcha.version> - <swagger.version>2.7.0</swagger.version> + <swagger.version>2.9.2</swagger.version> <pagehelper.boot.version>1.2.5</pagehelper.boot.version> <oshi.version>3.9.1</oshi.version> <commons.io.version>2.5</commons.io.version> diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 21c367d6..776f60ea 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -18,9 +18,6 @@ <link th:href="@{/css/style.css}" rel="stylesheet"/> <link th:href="@{/css/skins.css}" rel="stylesheet"/> <link th:href="@{/ruoyi/css/ry-ui.css?v=3.3.0}" rel="stylesheet"/> - <style type="text/css"> - #content-main.max { height: calc(100% - 110px); overflow: hidden; width: 100%; height: 100%; left: 0px; position: absolute; top: 0px; z-index: 9998; margin: 0; } - </style> </head> <body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden" th:classappend="${@config.getKey('sys.index.skinName')}"> <div id="wrapper"> @@ -91,7 +88,7 @@ <li><a title="开发文档" href="http://doc.ruoyi.vip" target="_blank"><i class="fa fa-question-circle"></i> 开发文档</a></li> <li><a title="全屏显示" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏显示</a></li> <li class="dropdown user-menu"> - <a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown"> + <a href="javascript:void(0)" class="dropdown-toggle" data-hover="dropdown"> <img th:src="(${user.avatar} == '') ? @{/img/profile.jpg} : @{/profile/avatar/} + ${user.avatar}" class="user-image"> <span class="hidden-xs">[[${user.userName}]]</span> </a>