功能更新

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

@@ -228,7 +228,8 @@ public class SysIndexController extends BaseController
         mmap.put("rightThreeList",rightThreeList);
 //        return "mainLhk";
 //        return "main";
-        return "mainYining";
+//        return "mainYining";
+        return "mainDangyang";
     }
 
 
@@ -251,6 +252,73 @@ public class SysIndexController extends BaseController
         return AjaxResult.success();
     }
 
+    @GetMapping("/system/mainDangyangView")
+    public String mainDangyangView(ModelMap mmap){
+        mmap.put("version", RuoYiConfig.getVersion());
+
+        String sessionId = ShiroUtils.getSessionId();
+
+
+        UserRelate userRelate = new UserRelate();
+        userRelate.setUserId(getUserId());
+        List<UserRelate> userRelates = userRelateService.selectUserRelateList(userRelate);
+        //获取档案列表
+//        List<Dangan>  danganList = danganService.selectDanganList(new Dangan());
+
+        mmap.put("sessionId",sessionId);
+
+        //23年2月14日新增,加入档案信息
+        if(!CollectionUtils.isEmpty(userRelates)) {
+            for (UserRelate relate : userRelates) {
+                Dangan dangan = danganService.selectDanganById(relate.getDanganId());
+                if(!ObjectUtils.isEmpty(dangan)){
+                    if(!StringUtils.isEmpty(dangan.getIconInfo())){
+                        if(dangan.getIconInfo().contains("/upload")){
+                            //期望给用户展示用的可直接访问的URL
+                            String newStr = dangan.getIconInfo();
+                            String[] ipPorts = ipPort.split(",");
+                            //分ip+端口号 和 域名情况
+                            if(ipPorts.length>=2){
+                                //说明是由ip,端口组成的参数
+                                newStr = "http://"+ipPorts[0]+":"+ipPorts[1]+"/iconShow"+newStr;
+                            }else if(ipPorts.length==1){
+                                //说明ip配置的是域名
+                                newStr = "http://"+ipPorts[0]+"/iconShow"+newStr;
+                            }
+                            dangan.setIconInfo(newStr);
+                        }
+                    }else{
+                        //说明档案图标未上传,那么使用默认图标
+                        SysConfig configQuery = new SysConfig();
+                        configQuery.setConfigKey("sys.main.defaultIcon");
+                        SysConfig configEntity = configMapper.selectConfig(configQuery);
+                        if(!ObjectUtils.isEmpty(configEntity)) {
+                            String config = configEntity.getConfigValue();
+                            if (!StringUtils.isEmpty(config)) {
+                                //说明全局config表中已配置
+                                //期望给用户展示用的可直接访问的URL
+                                String newStr = config;
+//                                String[] ipPorts = ipPort.split(",");
+//                                //分ip+端口号 和 域名情况
+//                                if (ipPorts.length >= 2) {
+//                                    //说明是由ip,端口组成的参数
+//                                    newStr = "http://" + ipPorts[0] + ":" + ipPorts[1] + "/iconShow" + newStr;
+//                                } else if (ipPorts.length == 1) {
+//                                    //说明ip配置的是域名
+//                                    newStr = "http://" + ipPorts[0] + "/iconShow" + newStr;
+//                                }
+                                dangan.setIconInfo(newStr);
+                            }
+                        }
+                    }
+                    relate.setDangan(dangan);
+                }
+            }
+        }
+        //TODO 当阳专有逻辑
+        mmap.put("danganList",userRelates);
+        return "mainDangyangView";
+    }
 
     @GetMapping("/system/mainYiningView")
     public String mainYiningView(ModelMap mmap){

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

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

ruoyi-admin/src/main/resources/application-test.yml

@@ -52,11 +52,12 @@ spring:
             druid:
                 # 主库数据源 stringtype=unspecified 如果stringtype设置为 unspecified，参数将作为非类型值发送到服务器，并且服务器将尝试推断适当的类型。
                 master:
-#                     url: jdbc:postgresql://119.96.165.176:5432/test_lixing?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+#                     url: jdbc:postgresql://119.96.215.215:5432/union_mgr?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
 #                     url: jdbc:postgresql://119.96.165.176:5432/lhk_union_mgr_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
 #                     username: postgres
+#                     password: lhk.postgres.2347
 #                     password: kpr.23417.postgres
-                      url: jdbc:postgresql://140.246.183.164:5432/union_mgr?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+                      url: jdbc:postgresql://140.246.183.164:5432/union_mgr_140?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
                       username: postgres
                       password: kpr.23417.postgres
 #                      url: jdbc:postgresql://60.13.253.94:54321/union_mgr?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
@@ -114,4 +115,5 @@ spring:
           enabled: true
 yiningCodeUrl: https://60.13.253.94:9000/base/apply/apk
 kpr.base.appinfo: https://60.13.253.94:9000/base/apply/apk-pkg
-mBLicenseSwitch: false
+mBLicenseSwitch: false
+shiro.config.globalSessionTimeout: -1

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="@{favicon.ico}" rel="shortcut icon"/>
+    <link th:href="@{faviconOld.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="@{favicon.ico}" rel="shortcut icon"/>
+    <link th:href="@{faviconOld.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="@{favicon.ico}" style="height: 60%;display: inline-block"/>
+				<img th:src="@{faviconOld.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/favicon.ico" th:href="@{favicon.ico}"/>
+    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.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

@@ -0,0 +1,222 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <title>登录智慧水务系统-认证系统</title>
+    <meta name="description" content="智慧水务系统-认证系统">
+    <meta name="referrer" content="no-referrer" />
+    <meta name="referrer" content="never">
+    <meta name="referrer" content="same-origin" />
+    <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/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>
+    <!-- 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}"/>
+    <style type="text/css">label.error { position:inherit;  }</style>
+    <script>
+        if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};
+    </script>
+    <script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
+    <!--[if lte IE 8]><script>window.location.href=ctx+'html/ie.html';</script><![endif]-->
+    <!-- 全局js -->
+    <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
+    <script src="../static/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
+    <script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
+    <script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
+    <script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.5}"></script>
+    <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
+    <style type="text/css">
+        .hClass{
+            position:absolute;
+            left:3%;
+            top:4%;
+            font-size: 25px;
+        }
+        .gradient-text {
+            font-size: 40px;
+            font-weight: bold;
+            background: -webkit-linear-gradient( white, rgb(188,214,249),white); /* Chrome, Safari */
+            background: linear-gradient( white, rgb(188,214,249),white); /* 标准语法 */
+            -webkit-background-clip: text; /* Chrome, Safari */
+            background-clip: text;
+            -webkit-text-fill-color: transparent; /* Chrome, Safari */
+            color: transparent; /* 标准语法, 如果背景剪辑支持的好 */
+            -webkit-font-smoothing: antialiased; /* 针对WebKit浏览器 */
+            -moz-osx-font-smoothing: grayscale; /* 针对Firefox浏览器 */
+            text-rendering: optimizeLegibility; /* 更一般的CSS属性 */
+            font-family: 'Arial Italic', 'Arial', sans-serif!important;
+            font-style: italic;
+        }
+        .divHead{
+            font-size: 20px;
+            position: absolute!important;
+            top: 30px!important;
+            left: 15%;
+            color: #1a1a1a;
+        }
+        .divFoot{
+            position: absolute!important;
+            bottom: -20px!important;
+            padding-bottom: 20px;
+            left: 0;
+            width: 100%!important;
+            font-size: 10px!important;
+            text-align: center;
+            color: rgb(153,169,189);
+        }
+        .loginInput:focus{
+            border: 2px dashed #458BF5;
+            color: #458BF5;
+        }
+        body{
+            background-color: #00173A;
+        }
+        .video-bg{position:absolute;top: 0;left:0;/* bottom: 0; */min-width: 100%;min-height: 100%;z-index:-9999;}
+    </style>
+</head>
+<video class="video-bg" autoplay loop muted><source th:src="@{img/yining/loginVideo.mp4}" type="video/mp4">
+</video>
+<body class="signin">
+    <div class="signinpanel">
+        <h4 class="hClass">
+            <span class="gradient-text">当阳市农村供水智慧管理服务平台</span>
+        </h4>
+        <div class="row" style="height: 500px;">
+            <div class="col-sm-7">
+                <div class="signin-info">
+                    <div class="logopanel m-b">
+                        <h1></h1>
+                    </div>
+                    <div class="m-b"></div>
+
+                    <strong th:if="${isAllowRegister}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
+                </div>
+            </div>
+            <div class="col-sm-5" style="height: 500px;width:400px;position: absolute;right: 20%;">
+                <div class="divHead">
+                    <p>Hello～</p>
+                    <p style="font-weight: bold!important;font-size: 30px">欢迎您登录</p>
+                </div>
+                <form id="signupForm" autocomplete="off" style="height: 520px!important;width:380px;padding-top: 100px;border-radius:24px;background-color: rgb(197,214,232);">
+                        <p style="position: absolute;right: 40px;top: 10px;" onclick="qiehuan()">APP下载→</p>
+                        <img class="leftTwoIcon" alt="[ APP下载二维码 ]" th:src="${codeUrl}" src="https://140.246.183.164:9000/base/apply/apk"
+                             style="display: inline-block;vertical-align:middle;position: absolute;right: 20px;top: 10px;;margin-left: 1em;width: 20px;height: 20px" onclick="qiehuan()">
+                        <input style="border-radius: 12px!important;margin-top: 40px;margin-left:10px;margin-bottom: 20px;width: 300px;height: 56px!important;" type="text"     name="username" class="form-control uname"   placeholder="用户名"  />
+                        <!--<input style="border-radius: 12px!important; margin-bottom: 20px;margin-left:10px;width: 300px;height: 56px!important;" type="password" id="password" name="password" class="form-control pword"  hidden autocomplete="off"   placeholder="密码" />-->
+                        <input type="text" style="border-radius: 12px!important; margin-bottom: -15px;margin-left:10px;width: 300px;height: 56px!important;" id="passwordDisc" class="form-control pword" placeholder="密码"
+                                oncontextmenu="return false;" autocomplete="off" >
+                        <!--密码真实保存位置-->
+                        <input type="text" style="visibility: hidden;border: 0;height: 0;width: 1px;padding: 0;margin: 0" name="password"
+                               id="password" placeholder="密码">
+                    <div class="row m-t" th:if="${captchaEnabled==true}" style="margin-bottom: 10px">
+                            <div class="col-xs-6">
+                                <input style="border-radius: 12px!important;margin-left:10px;width: 130px;height: 56px!important;" type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
+                            </div>
+                            <div class="col-xs-6">
+                                <a style="" href="javascript:void(0);" title="点击更换验证码">
+                                    <img th:src="@{/captcha/captchaImage(type=${captchaType})}" class="imgcode" style="border-radius: 12px;width: 135px;height: 56px"/>
+                                </a>
+                            </div>
+                        </div>
+                        <!--<div class="checkbox-custom" style="width: 100%!important;margin-bottom: 15px;margin-left: 10px" th:if="${isRemembered}" th:classappend="${captchaEnabled==false} ? 'm-t'">-->
+                            <!--<input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住密码</label>-->
+                            <!--<a style="margin-left: 160px" href="javascript:void(0)"  onclick="forgetpassword()"  >忘记密码&raquo;</a></strong>-->
+                        <!--</div>-->
+                        <button class="btn btn-success btn-block" style="border-radius: 12px!important;width: 300px!important;height:50px!important;margin-left: 10px;margin-top: 0;
+                                color: #FFFFFF!important;" id="btnSubmit" data-loading="正在验证登录，请稍候...">登录</button>
+                </form>
+                <div class="divFoot">
+                    <div>
+                        <br>
+                    </div>
+                </div>
+
+                <form id="signupFormCode" autocomplete="off" style="display:none;height: 520px!important;width:380px;padding-top: 100px;border-radius:24px;background-color: rgb(197,214,232);">
+                    <p style="position: absolute;right: 40px;top: 10px;" onclick="qiehuan()">返回账密登录→</p>
+                    <img class="leftTwoIcon" alt="[ APP下载二维码 ]" th:src="${codeUrl}" src="https://140.246.183.164:9000/base/apply/apk"
+                         style="display: inline-block;vertical-align:middle;position: absolute;right: 45px;top: 100px;;margin-left: 1em;width: 300px;height: 320px" onclick="qiehuan()">
+                </form>
+            </div>
+        </div>
+    </div>.
+<script type="text/javascript">
+    var passwordDisc = document.getElementById("passwordDisc");
+    var password = document.getElementById("password");
+    // 键盘按下执行,主要用于删除操作
+    passwordDisc.addEventListener("keydown", function (event) {
+        // 后面事件会改变，所以先记录选择的文本坐标
+        this.selectStartIndex = this.selectionStart;
+        this.selectEndIndex = this.selectionEnd;
+        if (event.key === 'Backspace') { // 如果是退格键
+            if (this.selectionStart === this.selectionEnd) {// 未选择文本
+                var str1 = password.value.substring(0, this.selectionStart - 1);
+                var str2 = password.value.substring(this.selectionStart);
+                password.value = str1 + str2;
+            } else { // 选择了文本
+                var str1 = password.value.substring(0, this.selectionStart);
+                var str2 = password.value.substring(this.selectionEnd);
+                password.value = str1 + str2;
+            }
+        } else if (event.key === 'Delete') { // 如果是删除键
+            if (this.selectionStart === this.selectionEnd) {// 未选择文本
+                var str1 = password.value.substring(0, this.selectionStart);
+                var str2 = password.value.substring(this.selectionStart + 1);
+                password.value = str1 + str2;
+            } else { // 选择了文本
+                var str1 = password.value.substring(0, this.selectionStart);
+                var str2 = password.value.substring(this.selectionEnd);
+                password.value = str1 + str2;
+            }
+        }
+    });
+
+    // 输入事件，保存密码
+    passwordDisc.addEventListener("input", function (event) {
+        if ((event.data || event.data != null || event.inputType === 'insertFromPaste') && event.inputType !== 'insertCompositionText') {
+            // 输入有数据或者是粘贴操作，并且不是中文输入
+            var data = event.data || event.data != null ? event.data : this.pasteString;
+            // 除ascii里的都替换为空，避免粘贴有其他符号
+            data = data.replace(/[^\x00-\x7e]/g, '');
+            var str1 = password.value.substring(0, this.selectStartIndex);
+            var str2 = password.value.substring(this.selectEndIndex);
+            password.value = str1 + data + str2;
+        }
+        // 文本框密文显示
+        passwordDisc.value = password.value.replace(/./g, '*');
+        // console.log(password.value);
+    })
+    // 获取粘贴板的文本数据
+    passwordDisc.addEventListener("paste", function (event) {
+        this.pasteString = event.clipboardData.getData('text/plain');
+    })
+
+    var cordFlag = false;
+
+    $("#password").val("");
+    function qiehuan() {
+        if(!cordFlag) {
+            $(".divHead").hide(100);
+            $("#signupForm").hide(100);
+            $("#divFoot").hide(100);
+
+            $("#signupFormCode").show(300);
+            cordFlag = true;
+        }else{
+            $(".divHead").show(300);
+            $("#signupForm").show(300);
+            $("#divFoot").show(300);
+
+            $("#signupFormCode").hide(100);
+            cordFlag = false;
+        }
+    }
+</script>
+</body>
+</html>

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

@@ -18,7 +18,7 @@
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
+    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.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="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.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

@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<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">
+	<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 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>
+	<th:block th:include="include :: header('首页')" />
+	<style type="text/css">
+		/* html,
+        html body {
+            height: 100%;
+            width: 100%;
+        } */
+		body {
+			margin: 0;
+			overflow: hidden;
+			background-color: #00173A;
+            /*background: url("/img/yining/testBack.png") no-repeat center fixed;*/
+            background-size: cover;
+		}
+
+		.test1 {
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			left: 0;
+			top: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			overflow: hidden;
+			/*background: radial-gradient(#055fd1, #04345c, #001f34);*/
+			/*background: radial-gradient(rgb(0,84,72), rgb(3,41,71), rgb(3,27,64));*/
+			z-index: -9999;
+		}
+
+		.ifreamClass {
+			flex:0 0 1920px!important;
+			height: 1080px!important;
+			z-index: 1;
+		}
+	</style>
+</head>
+
+
+
+<body>
+	<div id="app" class="assembly-html-body" style="position:relative;height: 100%">
+		<div class="test1" style="position:absolute;z-index:2;">
+			<iframe id="iframeView" th:src="@{/system/mainDangyangView}" frameborder="0" allowfullscreen="allowfullscreen"></iframe>
+		</div>
+	</div>
+	<script type="text/javascript">
+        function initScale() {
+            let clientWidth = document.body.clientWidth;
+            let num = clientWidth / 1920;
+
+            let  clientHeight = document.body.clientHeight;
+            let numHeight = clientHeight/1080;
+
+
+
+            let scaleNum = Math.min(num,numHeight).toFixed(2);
+
+            console.log(scaleNum);
+            $("#iframeView").addClass("ifreamClass");
+            $("#iframeView").css("transform","scale("+scaleNum+")");
+        }
+
+        initScale();
+	</script>
+</body>
+</html>

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

@@ -0,0 +1,398 @@
+<!DOCTYPE html>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<!--360浏览器优先以webkit内核解析-->
+	<title></title>
+	<link rel="shortcut icon" href="faviconOld.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"/>
+	<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 th:src="@{/js/jquery.min.js}"></script>
+	<th:block th:include="include :: header('首页')" />
+	<style type="text/css">
+		body{
+			background-color: #00173A!important;
+		}
+		#mainTrueVideo{
+			position: fixed;
+			z-index: 9999;
+			/*-webkit-filter: grayscale(100%);*/
+		}
+		#mainYiningVideo{
+			position: fixed;
+			z-index: -9999;
+			/*-webkit-filter: grayscale(100%);*/
+		}
+		.aInput {
+			position: relative;
+			color: rgba(255,255,255,1);
+			text-decoration: none;
+			background-color: rgba(60,141,188,1);
+			font-family: 'Yanone Kaffeesatz';
+			/*font-weight: 700;*/
+			/*font-size: 2em;*/
+			display: block;
+			padding: 4px;
+			-webkit-border-radius: 20px;
+			-moz-border-radius: 20px;
+			border-radius: 20px;
+			-webkit-box-shadow: 0px 9px 0px rgba(60,141,188,1), 0px 9px 25px rgba(60,64,81,.7);
+			-moz-box-shadow: 0px 9px 0px rgba(60,141,188,1), 0px 9px 25px rgba(60,64,81,.7);
+			box-shadow: 0px 9px 0px rgba(60,141,188,1), 0px 9px 25px rgba(60,64,81,.7);
+			margin: 20px auto;
+			width: 60px;
+			height: 60px;
+			text-align: center;
+
+			-webkit-transition: all .1s ease;
+			-moz-transition: all .1s ease;
+			-ms-transition: all .1s ease;
+			-o-transition: all .1s ease;
+			transition: all .1s ease;
+		}
+
+		.aInput:active {
+			-webkit-box-shadow: 0px 3px 0px rgba(60,141,188,1), 0px 3px 6px rgba(60,64,81,.9);
+			-moz-box-shadow: 0px 3px 0px rgba(60,141,188,1), 0px 3px 6px rgba(60,64,81,.9);
+			box-shadow: 0px 3px 0px rgba(60,141,188,1), 0px 3px 6px rgba(60,64,81,.9);
+			position: relative;
+			top: 6px;
+		}
+		.hClass{
+			position:fixed;
+			left:35%;
+			transform: translateY(100px);
+			font-size: 25px;
+			animation: myanimation 2s;
+			animation-iteration-count: 1;
+		}
+		.gradient-text {
+			font-size: 40px;
+			font-weight: bold;
+			background: -webkit-linear-gradient( white, rgb(188,214,249),white); /* Chrome, Safari */
+			background: linear-gradient( white, rgb(188,214,249),white); /* 标准语法 */
+			-webkit-background-clip: text; /* Chrome, Safari */
+			background-clip: text;
+			-webkit-text-fill-color: transparent; /* Chrome, Safari */
+			color: transparent; /* 标准语法, 如果背景剪辑支持的好 */
+			-webkit-font-smoothing: antialiased; /* 针对WebKit浏览器 */
+			-moz-osx-font-smoothing: grayscale; /* 针对Firefox浏览器 */
+			text-rendering: optimizeLegibility; /* 更一般的CSS属性 */
+			font-family: 'Arial Italic', 'Arial', sans-serif!important;
+			font-style: italic;
+		}
+		@keyframes myanimation {
+			0%{
+				transform: translateY(-100px);
+			}
+			100%{
+				transform: translateY(100px);
+			}
+		}
+	</style>
+</head>
+
+
+
+<body class="gray-bg">
+<h4 class="hClass">
+	<span class="gradient-text">当阳市农村供水智慧管理服务平台</span>
+</h4>
+<video src="mainTrue.mp4" th:src="@{/mainTrue.mp4}" id="mainTrueVideo" width="100%" height="100%" autoplay="autoplay" loop="loop" muted="muted">
+</video>
+<video src="mainYining.mp4" th:src="@{/mainYining.mp4}" id="mainYiningVideo" width="100%" height="100%" autoplay="autoplay" loop="loop" muted="muted">
+</video>
+<div class="leftAllLine">
+	<div class="leftMenuMedLine"></div>
+	<div class="leftMenuLeftLine"></div>
+</div>
+<div class="rightAllLine">
+	<div class="rightMenuMedLine"></div>
+	<div class="rightMenuLeftLine"></div>
+</div>
+<div style="z-index: 9999!important;" class="leftMenu">
+</div>
+<div style="z-index: 9999!important;" class="rightMenu">
+</div>
+<div class="topDiv">
+    <a style="" id="showMenuEsc" onclick="showMenuEsc()" title="模式切换"><i class="fa fa-cog" style="color:#FFFFFF!important;font-size: 30px!important;"></i></a>
+</div>
+<div class="bottomDiv"></div>
+<div class="container-div" style="z-index: 99999">
+	<div id="contentDiv" style="position: absolute;top: 20%;width: 100%;height: 700px;">
+		<!--<div style="display: none" class="leftOneDiv">-->
+			<!--<div class="leftOneTopLine"></div>-->
+			<!--<div>-->
+				<!--<p style="line-height: 6em;padding-left: 1em;display: inline-block;">决策分析一张图</p>-->
+				<!--<img class="leftOneIcon" alt="[ 决策分析一张图 ]" src="../static/img/yining/icon/基础支撑系统,未选中.png" th:src="@{/img/yining/icon/基础支撑系统,未选中.png}"-->
+							 <!--style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em">-->
+			<!--</div>-->
+			<!--<div class="leftOneBottomLine"></div>-->
+		<!--</div>-->
+		<!--<div style="display: none" class="leftTwoDiv">-->
+			<!--<div class="leftTwoTopLine"></div>-->
+			<!--<div>-->
+				<!--<p style="line-height: 6em;display: inline-block;">生产调度监管</p>-->
+				<!--<img class="leftTwoIcon" alt="[ 生产调度监管 ]" src="../static/img/yining/icon/智慧生产系统,未选中.png" th:src="@{/img/yining/icon/智慧生产系统,未选中.png}"-->
+					 <!--style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em">-->
+			<!--</div>-->
+			<!--<div class="leftTwoBottomLine"></div>-->
+		<!--</div>-->
+		<!--<div style="display: none" class="leftThreeDiv">-->
+			<!--<div class="leftThreeTopLine"></div>-->
+			<!--<div>-->
+				<!--<p style="line-height: 6em;padding-left: 1em;display: inline-block;">生产视频监控</p>-->
+				<!--<img class="leftThreeIcon" alt="[ 生产视频监控 ]" src="../static/img/yining/icon/智慧管网系统,未选中.png" th:src="@{/img/yining/icon/智慧管网系统,未选中.png}"-->
+					 <!--style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em">-->
+			<!--</div>-->
+			<!--<div class="leftThreeBottomLine"></div>-->
+		<!--</div>-->
+		<!--<div style="display: none" class="rightOneDiv">-->
+			<!--<div class="rightOneTopLine"></div>-->
+			<!--<div>-->
+				<!--<img class="rightOneIcon" alt="[ 运维工单管理 ]" src="../static/img/yining/icon/智慧营业系统,未选中.png" th:src="@{/img/yining/icon/智慧营业系统,未选中.png}"-->
+					 <!--style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 4em;">-->
+				<!--<p style="line-height: 6em;position:absolute;left:8em;display: inline-block;">运维工单管理</p>-->
+			<!--</div>-->
+			<!--<div class="rightOneBottomLine"></div>-->
+		<!--</div>-->
+		<!--<div style="display: none" class="rightTwoDiv">-->
+			<!--<div class="rightTwoTopLine"></div>-->
+			<!--<div>-->
+				<!--<img class="rightTwoIcon" alt="[ 巡检任务管理 ]" src="../static/img/yining/icon/智慧客服系统,未选中.png" th:src="@{/img/yining/icon/智慧客服系统,未选中.png}"-->
+					 <!--style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 2em">-->
+				<!--<p style="line-height: 6em;position:absolute;left:6em;display: inline-block;">巡检任务管理</p>-->
+			<!--</div>-->
+			<!--<div class="rightTwoBottomLine"></div>-->
+		<!--</div>-->
+		<!--<div style="display: none" class="rightThreeDiv">-->
+			<!--<div class="rightThreeTopLine"></div>-->
+			<!--<div>-->
+				<!--<img class="rightThreeIcon" alt="[ 经营收费系统 ]" src="../static/img/yining/icon/智慧办公系统,未选中.png" th:src="@{/img/yining/icon/智慧办公系统,未选中.png}"-->
+					 <!--style="width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;left: 4em">-->
+				<!--<p style="line-height: 6em;position:absolute;left:8em;display: inline-block;">经营收费系统</p>-->
+			<!--</div>-->
+			<!--<div class="rightThreeBottomLine"></div>-->
+		<!--</div>-->
+		<div class="centerDiv"></div>
+	</div>
+</div>
+<script th:inline="javascript">
+	//TODO 逻辑解释:
+    //第一段视频放到第4秒的时候，就可以降低透明度了
+	//第一段视频放到第4秒时，降低透明度，再过1秒后透明度降到0。
+    $("#mainTrueVideo").css("z-index", "-10000");
+    $("#mainYiningVideo").css("z-index","-10001");
+    $(".leftOneDiv").show(500);
+    $(".leftTwoDiv").show(500);
+    $(".leftThreeDiv").show(500);
+    $(".rightOneDiv").show(500);
+    $(".rightTwoDiv").show(500);
+    $(".rightThreeDiv").show(500);
+
+    var danganList = [[${danganList}]];
+    function initDy(){
+        var $contentDiv = $("#contentDiv");
+        if(danganList!==null&&danganList!==undefined&&danganList.length>0){
+			for (let i = 1;i <= danganList.length;i++){
+			    let str = "";
+			    if(i===1){
+                    str += "<div style=\"\" class=\"leftOneDiv\">"+
+						"<div class=\"leftOneTopLine\"></div>" +
+                    "<div>" +
+                    "<p style=\"line-height: 6em;padding-left: 1em;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
+                    "<img class=\"leftOneIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/yining/icon/基础支撑系统,未选中.png\" " +
+                    " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em\">" +
+                    "</div>" +
+                    "<div class=\"leftOneBottomLine\"></div>"+
+                    "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
+				}
+                if(i===2){
+                    str +="<div style=\"\" class=\"leftTwoDiv\">"+
+						"<div class=\"leftTwoTopLine\"></div>" +
+                        "<div>" +
+                        "<p style=\"line-height: 6em;padding-left: 1em;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
+                        "<img class=\"leftTwoIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/yining/icon/智慧生产系统,未选中.png\" th:src=\"@{/img/yining/icon/智慧生产系统,未选中.png}\"" +
+                        " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em\">" +
+                        "</div>" +
+                        "<div class=\"leftTwoBottomLine\"></div>"+
+                        "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
+                }
+                if(i===3){
+                    str +=	"<div style=\"\" class=\"leftThreeDiv\">"+
+						"<div class=\"leftThreeDiv\"></div>" +
+                        "<div>" +
+                        "<p style=\"line-height: 6em;padding-left: 1em;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
+                        "<img class=\"leftThreeIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/yining/icon/智慧管网系统,未选中.png\" th:src=\"@{/img/yining/icon/智慧管网系统,未选中.png}\"" +
+                        " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em\">" +
+                        "</div>" +
+                        "<div class=\"leftThreeBottomLine\"></div>"+
+                        "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
+                }
+                if(i===4){
+                    str +=	"<div style=\"\" class=\"rightOneDiv\">"+
+						"<div class=\"rightOneTopLine\"></div>" +
+                        "<div>" +
+                        "<p style=\"line-height: 6em;padding-left: 3em;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
+                        "<img class=\"rightOneIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/yining/icon/智慧营业系统,未选中.png\" th:src=\"@{/img/yining/icon/智慧营业系统,未选中.png}\"" +
+                        " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em\">" +
+                        "</div>" +
+                        "<div class=\"rightOneBottomLine\"></div>"+
+                        "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
+                }
+                if(i===5){
+                    str +=	"<div style=\"\" class=\"rightTwoDiv\">"+
+						"<div class=\"rightTwoTopLine\"></div>" +
+                        "<div>" +
+                        "<p style=\"line-height: 6em;padding-left: 1em;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
+                        "<img class=\"rightTwoIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/yining/icon/智慧客服系统,未选中.png\" th:src=\"@{/img/yining/icon/智慧客服系统,未选中.png}\"" +
+                        " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em\">" +
+                        "</div>" +
+                        "<div class=\"leftOneBottomLine\"></div>"+
+                        "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
+                }
+                if(i===6){
+                    str += "<div style=\"\" class=\"rightThreeDiv\">"+
+						"<div class=\"rightThreeTopLine\"></div>" +
+                        "<div>" +
+                        "<p style=\"line-height: 6em;padding-left: 3em;display: inline-block;\">"+danganList[i-1].danganName+"</p>" +
+                        "<img class=\"rightThreeIcon\" alt=\"[ "+danganList[i-1].danganName+" ]\" src=\"../img/yining/icon/智慧办公系统,未选中.png\" th:src=\"@{/img/yining/icon/智慧办公系统,未选中.png}\"" +
+                        " style=\"width: 150px;height: 150px;vertical-align:middle;position: absolute;top: 75px;margin-left: 1em\">" +
+                        "</div>" +
+                        "<div class=\"rightThreeBottomLine\"></div>"+
+                        "<input style='display: none' value='"+danganList[i-1].danganUrl+"' class='.divUrl'>";
+                }
+				str += "</div>";
+                $contentDiv.append(str);
+			}
+		}
+	}
+
+    initDy();
+
+    setTimeout(function () {
+        console.log("4秒钟到了");
+        $("#mainTrueVideo").css("opacity", "0.5");
+        setTimeout(function () {
+            $("#mainTrueVideo").css("opacity", "0");
+            $("#mainYiningVideo").css("z-index","-9998");
+        },1000);
+    }, 4000);
+
+	var sessionId = [[${sessionId}]];
+	function opennewpage(url) {
+
+		// window.location.href=url;
+		if(url.indexOf("?")>0) {
+            url = url + "&" + "reqid=" + sessionId;
+        }else{
+		    url = url + "?"+"reqid=" + sessionId;
+		}
+
+
+		console.log(url)
+
+		window.open(url)
+		// console.log(danganLoginName)
+		//
+		// console.log(sessionId)
+
+
+
+	}
+
+		//TODO div与空白处点击事件
+		$(".leftOneDiv").click(function() {
+            opennewpage($(".leftOneDiv").find("input").val()+"");
+        });
+		$(".leftTwoDiv").click(function() {
+            opennewpage($(".leftTwoDiv").find("input").val()+"");
+		});
+		$(".leftThreeDiv").click(function() {
+            opennewpage($(".leftThreeDiv").find("input").val()+"");
+		});
+		$(".rightOneDiv").click(function() {
+            opennewpage($(".rightOneDiv").find("input").val()+"");
+    	});
+		$(".rightTwoDiv").click(function() {
+            opennewpage($(".rightTwoDiv").find("input").val()+"");
+		});
+		$(".rightThreeDiv").click(function() {
+            opennewpage($(".rightThreeDiv").find("input").val()+"");
+		});
+
+    	$(".leftMenu").mouseover(function () {
+            $(".leftMenu").show();
+        });
+    	$(".rightMenu").mouseover(function () {
+            $(".rightMenu").show();
+        });
+
+        $(".centerDiv").mouseover(function () {
+            $(".leftMenu").animate({width:'0px',opacity:'0.8'},300);
+            $(".leftMenu").empty();
+            $(".leftAllLine").animate({left:'180px'},300);
+            $(".leftAllLine").find(".leftMenuLeftLine").show();
+            $(".rightMenu").animate({width:'0px',opacity:'0.8'},300);
+            $(".rightMenu").empty();
+            $(".rightAllLine").animate({right:'180px'},300);
+            $(".rightAllLine").find(".rightMenuLeftLine").show();
+        });
+		$(".topDiv").mouseover(function () {
+            $(".leftMenu").animate({width:'0px',opacity:'0.8'},300);
+            $(".leftMenu").empty();
+            $(".leftAllLine").animate({left:'180px'},300);
+            $(".leftAllLine").find(".leftMenuLeftLine").show();
+            $(".rightMenu").animate({width:'0px',opacity:'0.8'},300);
+            $(".rightMenu").empty();
+            $(".rightAllLine").animate({right:'180px'},300);
+            $(".rightAllLine").find(".rightMenuLeftLine").show();
+		});
+		$(".bottomDiv").mouseover(function () {
+            $(".leftMenu").animate({width:'0px',opacity:'0.8'},300);
+            $(".leftMenu").empty();
+            $(".leftAllLine").animate({left:'180px'},300);
+            $(".leftAllLine").find(".leftMenuLeftLine").show();
+            $(".rightMenu").animate({width:'0px',opacity:'0.8'},300);
+            $(".rightMenu").empty();
+            $(".rightAllLine").animate({right:'180px'},300);
+            $(".rightAllLine").find(".rightMenuLeftLine").show();
+		});
+
+		function ulClass() {
+            $(".menuUlLi").hover(function () {
+                $(this).find("img").remove();
+                $(this).find("span").after("<img  src=\"/img/yining/选中右侧.png\" style='width: 30px;height: 30px;'>")
+                $(this).find("span").before("<img  src=\"/img/yining/选中左侧.png\" style='width: 30px;height: 30px;'>")
+            },function () {
+                $(this).find("img").remove();
+            });
+        }
+		
+        function ulRightClass() {
+            $(".menuUlLiRight").hover(function () {
+                $(this).find("img").remove();
+                $(this).find("span").after("<img  src=\"/img/yining/选中右侧.png\" style='width: 30px;height: 30px;'>")
+                $(this).find("span").before("<img  src=\"/img/yining/选中左侧.png\" style='width: 30px;height: 30px;'>")
+            },function () {
+                $(this).find("img").remove();
+            });
+        }
+
+		var menuFlag = top.window.tagMenu;
+        function showMenuEsc(){
+            //传入window顶级节点
+            top.window.tagObj();
+            if(!menuFlag){
+                // $("#showMenuEsc").show();
+            }else{
+                // $("#showMenuEsc").hide();
+            }
+		}
+</script>
+</body>
+</html>

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

@@ -2,12 +2,12 @@
 <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/favicon.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/faviconOld.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="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.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/mainYining.html

@@ -2,12 +2,12 @@
 <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/favicon.ico" type="image/icon">
+	<link rel="shortcut icon" href="../static/images/faviconOld.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="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.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/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="favicon.ico">
+    <link rel="shortcut icon" href="faviconOld.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="favicon.ico">
+	<link rel="shortcut icon" href="faviconOld.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="favicon.ico">
+    <link rel="shortcut icon" href="faviconOld.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/favicon.ico" th:href="@{favicon.ico}"/>
+    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.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/favicon.ico" th:href="@{favicon.ico}"/>
+    <link rel="shortcut icon" href="../static/faviconOld.ico" th:href="@{faviconOld.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/view.html

@@ -3,13 +3,13 @@
 
 <head>
     <meta charset="utf-8">
-    <link rel="shortcut icon" href="./static/images/favicon.ico" type="image/icon">
+    <link rel="shortcut icon" href="./static/images/faviconOld.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/favicon.ico">
+    <link rel="icon" href="./static/faviconOld.ico">
     <title>老河口清源供水有限公司</title>
 
-    <link rel="shortcut icon" href="favicon.ico">
+    <link rel="shortcut icon" href="faviconOld.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"/>
@@ -139,12 +139,13 @@
                                 <div th:if="${dangan!=null}" th:class = "NavLinkContent+${danganStat.count}" th:onclick="opennewpage([[${dangan.danganUrl}]] ,[[${dangan.danganNums} ]]);">
                                 <!--<div class = "'NavLinkConte1nt'">-->
                                     <div class="ShowContent custom-content">
-                                        <div class="LeftPart custom-img" th:style="'background:url(' +${dangan.dangan==null?'':dangan.dangan.iconInfo}+') no-repeat center center!important;background-size:100% 100%'"></div><!--暂时不用-->
+                                        <!--<div class="LeftPart custom-img" th:style="'background:url(' +${dangan.dangan==null?'':dangan.dangan.iconInfo}+') no-repeat center center!important;background-size:100% 100%'"></div>&lt;!&ndash;暂时不用&ndash;&gt;-->
+                                        <div class="LeftPart custom-img"></div><!--暂时不用-->
                                         <div class="RightPart">
                                             <div class="RightPart_TopPart" th:text="${dangan.danganName}"><!--{{dangan.danganName}}--></div>
-                                            <div class="RightPart_BottomPart" th:if="${@dict.getLabel('sys_dangan_status', dangan.danganStatus)!=null&&@dict.getLabel('sys_dangan_status', dangan.danganStatus)!=''}" th:text="${@dict.getLabel('sys_dangan_status', dangan.danganStatus)}">
-                                                <!--{{item.introName}}-->
-                                            </div>
+                                            <!--<div class="RightPart_BottomPart" th:if="${@dict.getLabel('sys_dangan_status', dangan.danganStatus)!=null&&@dict.getLabel('sys_dangan_status', dangan.danganStatus)!=''}" th:text="${@dict.getLabel('sys_dangan_status', dangan.danganStatus)}">-->
+                                                <!--&lt;!&ndash;{{item.introName}}&ndash;&gt;-->
+                                            <!--</div>-->
                                         </div>
                                     </div>
                                 </divth>

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("/favicon.ico**", "anon");
+        filterChainDefinitionMap.put("/faviconOld.ico**", "anon");
         filterChainDefinitionMap.put("/ruoyi.png**", "anon");
         filterChainDefinitionMap.put("/html/**", "anon");
         filterChainDefinitionMap.put("/css/**", "anon");