伊宁bug更新

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -226,9 +226,9 @@ public class SysIndexController extends BaseController
         mmap.put("rightOneList",rightOneList);
         mmap.put("rightTwoList",rightTwoList);
         mmap.put("rightThreeList",rightThreeList);
-        return "mainLhk";
+//        return "mainLhk";
 //        return "main";
-//        return "mainYining";
+        return "mainYining";
 //        return "mainDangyang";
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -75,8 +75,8 @@ public class SysLoginController extends BaseController
         mmap.put("codeUrl", yiningCodeUrl);
         // 是否开启用户注册
         mmap.put("isAllowRegister", Convert.toBool(configService.getKey("sys.account.registerUser"), false));
-        return "login";
-//        return "loginYining";
+//        return "login";
+        return "loginYining";
 //        return "loginDangyang";
     }
 

ruoyi-admin/src/main/resources/templates/index-topnav.html

@@ -7,7 +7,7 @@
     <title>智慧水务系统-认证系统首页</title>
     <!-- 避免IE使用兼容模式 -->
  	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link th:href="@{faviconOld.ico}" rel="shortcut icon"/>
+    <link th:href="@{favicon.ico}" rel="shortcut icon"/>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/jquery.contextMenu.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/index.html

@@ -7,7 +7,7 @@
     <title>智慧水务系统-认证系统首页</title>
     <!-- 避免IE使用兼容模式 -->
  	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link th:href="@{faviconOld.ico}" rel="shortcut icon"/>
+    <link th:href="@{favicon.ico}" rel="shortcut icon"/>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/jquery.contextMenu.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
@@ -52,7 +52,7 @@
         </div>
         <a th:href="@{/index}">
             <li class="logo hidden-xs" style="width: 100%!important;height: 60px!important;background-color: rgb(4,35,61)!important;padding-top: 3%">
-				<img th:src="@{faviconOld.ico}" style="height: 60%;display: inline-block"/>
+				<img th:src="@{favicon.ico}" style="height: 60%;display: inline-block"/>
                 <span class="" style="font-weight: bold">统一认证平台</span>
             </li>
          </a>

ruoyi-admin/src/main/resources/templates/login.html

@@ -14,7 +14,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

ruoyi-admin/src/main/resources/templates/loginDangyang.html

@@ -13,12 +13,12 @@
     <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
     <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.5}" rel="stylesheet"/>
-    <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+    <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
     <!-- 360浏览器急速模式 -->
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

ruoyi-admin/src/main/resources/templates/loginYining.html

@@ -13,12 +13,12 @@
     <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
     <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.5}" rel="stylesheet"/>
-    <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+    <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
     <!-- 360浏览器急速模式 -->
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
     <script>
         if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

ruoyi-admin/src/main/resources/templates/main.html

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/mainDangyang.html

@@ -2,17 +2,17 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<meta charset="utf-8">
-	<link rel="shortcut icon" href="../static/images/faviconOld.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/favicon.ico" type="image/icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>
 	<link href="../static/css/style.min862f.css" th:href="@{/css/style.min862f.css}" rel="stylesheet"/>
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
 	<th:block th:include="include :: header('首页')" />
 	<style type="text/css">
 		/* html,

ruoyi-admin/src/main/resources/templates/mainDangyangView.html

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/mainYining.css" th:href="@{/css/mainYining.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/mainLhk.html

@@ -2,17 +2,17 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<meta charset="utf-8">
-	<link rel="shortcut icon" href="../static/images/faviconOld.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/favicon.ico" type="image/icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>
 	<link href="../static/css/style.min862f.css" th:href="@{/css/style.min862f.css}" rel="stylesheet"/>
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
 	<th:block th:include="include :: header('首页')" />
 	<style type="text/css">
 		/* html,

ruoyi-admin/src/main/resources/templates/mainYining.html

@@ -2,17 +2,17 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<meta charset="utf-8">
-	<link rel="shortcut icon" href="../static/images/faviconOld.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/favicon.ico" type="image/icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 	<link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>
 	<link href="../static/css/style.min862f.css" th:href="@{/css/style.min862f.css}" rel="stylesheet"/>
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
 	<th:block th:include="include :: header('首页')" />
 	<style type="text/css">
 		/* html,

ruoyi-admin/src/main/resources/templates/mainYiningMaskView.html

@@ -5,7 +5,7 @@
     <title></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!--360浏览器优先以webkit内核解析-->
-    <link rel="shortcut icon" href="faviconOld.ico">
+    <link rel="shortcut icon" href="favicon.ico">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/mainYining.css" th:href="@{/css/mainYining.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/mainYiningView.html

@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<!--360浏览器优先以webkit内核解析-->
 	<title></title>
-	<link rel="shortcut icon" href="faviconOld.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 	<link href="../static/css/mainYining.css" th:href="@{/css/mainYining.css}" rel="stylesheet"/>
 	<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/main_v1.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>统计</title>
-    <link rel="shortcut icon" href="faviconOld.ico">
+    <link rel="shortcut icon" href="favicon.ico">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>

ruoyi-admin/src/main/resources/templates/register.html

@@ -14,7 +14,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <style type="text/css">label.error { position:inherit;  }</style>
 </head>
 <body class="signin">

ruoyi-admin/src/main/resources/templates/skin.html

@@ -8,7 +8,7 @@
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html"/>
     <![endif]-->
-    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.ico}"/>
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <style type="text/css">

ruoyi-admin/src/main/resources/templates/system/dept/add.html

@@ -3,7 +3,7 @@
 <head>
 	<th:block th:include="include :: header('新增部门')" />
 	<!--省市区-->
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
 
 </head>
 <body class="white-bg">

ruoyi-admin/src/main/resources/templates/system/dept/edit.html

@@ -3,7 +3,7 @@
 <head>
 	<th:block th:include="include :: header('修改机构')" />
 	<!--省市区-->
-	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
 	<script th:src="@{/ajax/libs/distpicker/distpicker.data.js}"></script>
 	<script th:src="@{/ajax/libs/distpicker/distpicker.js}"></script>
 </head>

ruoyi-admin/src/main/resources/templates/view.html

@@ -3,13 +3,13 @@
 
 <head>
     <meta charset="utf-8">
-    <link rel="shortcut icon" href="./static/images/faviconOld.ico" type="image/icon">
+    <link rel="shortcut icon" href="./static/images/favicon.ico" type="image/icon">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
-    <link rel="icon" href="./static/faviconOld.ico">
+    <link rel="icon" href="./static/favicon.ico">
     <title>老河口清源供水有限公司</title>
 
-    <link rel="shortcut icon" href="faviconOld.ico">
+    <link rel="shortcut icon" href="favicon.ico">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/animate.min.css" th:href="@{/css/animate.min.css}" rel="stylesheet"/>
@@ -29,7 +29,7 @@
 
     <link href="../css/customPage.css" rel="stylesheet">
 
-    <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+    <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
 </head>
 
 <body>

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java

@@ -283,7 +283,7 @@ public class ShiroConfig
         // Shiro连接约束配置，即过滤链的定义
         LinkedHashMap<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
         // 对静态资源设置匿名访问
-        filterChainDefinitionMap.put("/faviconOld.ico**", "anon");
+        filterChainDefinitionMap.put("/favicon.ico**", "anon");
         filterChainDefinitionMap.put("/ruoyi.png**", "anon");
         filterChainDefinitionMap.put("/html/**", "anon");
         filterChainDefinitionMap.put("/css/**", "anon");