diff --git a/ruoyi-admin/src/main/resources/templates/style/js/canvas-nest.min.js b/ruoyi-admin/src/main/resources/static/ajax/libs/validate/canvas-nest.min.js
similarity index 100%
rename from ruoyi-admin/src/main/resources/templates/style/js/canvas-nest.min.js
rename to ruoyi-admin/src/main/resources/static/ajax/libs/validate/canvas-nest.min.js
diff --git a/ruoyi-admin/src/main/resources/static/img/login-background.jpg b/ruoyi-admin/src/main/resources/static/img/login-background.jpg
index adfa3f90c..15706512f 100644
Binary files a/ruoyi-admin/src/main/resources/static/img/login-background.jpg and b/ruoyi-admin/src/main/resources/static/img/login-background.jpg differ
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi.png b/ruoyi-admin/src/main/resources/static/ruoyi.png
index b0af01fef..0d577492a 100644
Binary files a/ruoyi-admin/src/main/resources/static/ruoyi.png and b/ruoyi-admin/src/main/resources/static/ruoyi.png differ
diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html
index 10a0bf846..89bd0ef79 100644
--- a/ruoyi-admin/src/main/resources/templates/login.html
+++ b/ruoyi-admin/src/main/resources/templates/login.html
@@ -1,65 +1,70 @@
-﻿<!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,user-scalable=no">
-        <!-- 360浏览器急速模式 -->
-        <meta name="renderer" content="webkit">
-        <!-- 避免IE使用兼容模式 -->
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <style type="text/css">label.error { position:inherit;  }</style>
-       <title>欣知CRM</title>
-        <link rel="apple-touch-icon" href="https://cdn.mom1.cn/1/favicon.ico">
-    </head>
-
-     <div class="signinpanel">
-         <div class="row">
-         <div style="text-align:center;border-width:1px;border-style:solid;border-color:rgb(2, 204, 245);background-color:#79918e6b;border-radius:20px;"class="col-sm-5">
-             <form id="signupForm" autocomplete="off">
-             <img src="style/images/4271617159537_.pic_hd.jpg">
-            <div class="font-45" style="font-size:3vh;color:#fff;">欣知CRM实现企业<span style="color:#E41D1D;">『销售+管理』</span>全流程    </div>
-<!--           <p style="font-size:3vh;color:#fff;">也许，只有真正动心了,才会为他所做的一件小事,在旁人看来无所谓,而在她看来却是心碎。</p>-->
-           <p style="line-height:3;">
-           <a style="border-radius:10px;padding: 2px 20px;color:#fff;border-style:solid;text-decoration:none;" >用户名</a>
-           <input style="border-radius:10px;font-size:20px;background-color:transparent;border:0;padding: 5px 30px;color:white;border-style:solid;text-decoration:none;"
-                  type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin"    /><br/>
-           <a style="border-radius:10px;padding: 2px 20px;color:#fff;border-style:solid;text-decoration:none;" >密码</a>
-           <input style="border-radius:10px;font-size:20px;background-color:transparent;border:0;padding: 5px 30px;color:white;border-style:solid;text-decoration:none;"
-                  type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
-            <div class="row m-t" th:if="${captchaEnabled==true}">
-                <div class="col-xs-6">
-                    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
-                </div>
-                <div class="col-xs-6">
-                    <a href="javascript:void(0);" title="点击更换验证码">
-                        <img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
-                    </a>
-                </div>
-            </div>
-            <div class="checkbox-custom" th:classappend="${captchaEnabled==false} ? 'm-t'">
-                <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
-            </div>
-            <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍后...">登录</button>
-           </p>
-             </form>
-            <p><script src="https://pv.sohu.com/cityjson?ie=utf-8"></script>
-
-         </p>
-                   <script type="text/javascript" color="255,255,255" opacity='0.7' zIndex="-2" count="200" src="style/js/canvas-nest.min.js"></script>
-         </div>
-         </div>
-        </div>
-        <script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
-        <!-- 全局js -->
-        <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
-        <script src="../static/js/bootstrap.min.js" th:src="@{/js/bootstrap.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/validate/messages_zh.min.js" th:src="@{/ajax/libs/validate/messages_zh.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.6.0}"></script>
-        <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
-
-</body>
-</html>
\ No newline at end of file
+<!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>登录欣知CRM</title>
+    <meta name="description" content="若依后台管理框架">
+    <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.css" th:href="@{/css/style.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.6.0}" rel="stylesheet"/>
+    <!-- 360浏览器急速模式 -->
+    <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}"/>
+    <style type="text/css">label.error { position:inherit;  }</style>
+    <script>
+        if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};
+    </script>
+</head>
+<body class="signin">
+    <div class="signinpanel">
+        <div class="row">
+            <div class="col-sm-7">
+                <div class="signin-info">
+                    <div class="logopanel m-b">
+                        <h1><img src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-5">
+                <form id="signupForm" autocomplete="off">
+                    <h4 class="no-margins">登录：</h4>
+                    <h4 class="no-margins" style="color:#fff;">实现企业<span style="color:#E41D1D;">『销售+管理』</span>全流程</h4>
+                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin"    />
+                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
+					<div class="row m-t" th:if="${captchaEnabled==true}">
+						<div class="col-xs-6">
+						    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
+						</div>
+						<div class="col-xs-6">
+							<a href="javascript:void(0);" title="点击更换验证码">
+								<img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
+							</a>
+						</div>
+					</div>
+                    <div class="checkbox-custom" th:classappend="${captchaEnabled==false} ? 'm-t'">
+				        <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
+				    </div>
+                    <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍后...">登录</button>
+                </form>
+            </div>
+        </div>
+    </div>
+<script type="text/javascript" color="255,255,255" opacity='0.7' zIndex="-2" count="200" src="../static/ajax/libs/validate/canvas-nest.min.js" th:src="@{/ajax/libs/validate/canvas-nest.min.js}"></script>
+<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
+<!-- 全局js -->
+<script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
+<script src="../static/js/bootstrap.min.js" th:src="@{/js/bootstrap.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/validate/messages_zh.min.js" th:src="@{/ajax/libs/validate/messages_zh.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.6.0}"></script>
+<script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/login3.html b/ruoyi-admin/src/main/resources/templates/login3.html
deleted file mode 100644
index 82d8e3f31..000000000
--- a/ruoyi-admin/src/main/resources/templates/login3.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!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="若依后台管理框架">
-    <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.css" th:href="@{/css/style.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.6.0}" rel="stylesheet"/>
-    <!-- 360浏览器急速模式 -->
-    <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}"/>
-    <style type="text/css">label.error { position:inherit;  }</style>
-    <script>
-        if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};
-    </script>
-</head>
-<body class="signin">
-    <div class="signinpanel">
-        <div class="row">
-            <div class="col-sm-7">
-                <div class="signin-info">
-                    <div class="logopanel m-b">
-                        <h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
-                    </div>
-                    <h4>欢迎使用 <strong>若依 后台管理系统</strong></h4>
-                    <strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
-                </div>
-            </div>
-            <div class="col-sm-5">
-                <form id="signupForm" autocomplete="off">
-                    <h4 class="no-margins">登录：</h4>
-                    <p class="m-t-md">你若不离不弃，我必生死相依</p>
-                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin"    />
-                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
-					<div class="row m-t" th:if="${captchaEnabled==true}">
-						<div class="col-xs-6">
-						    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
-						</div>
-						<div class="col-xs-6">
-							<a href="javascript:void(0);" title="点击更换验证码">
-								<img th:src="@{captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
-							</a>
-						</div>
-					</div>
-                    <div class="checkbox-custom" th:classappend="${captchaEnabled==false} ? 'm-t'">
-				        <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>
-				    </div>
-                    <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍后...">登录</button>
-                </form>
-            </div>
-        </div>
-    </div>
-<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
-<!-- 全局js -->
-<script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
-<script src="../static/js/bootstrap.min.js" th:src="@{/js/bootstrap.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/validate/messages_zh.min.js" th:src="@{/ajax/libs/validate/messages_zh.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.6.0}"></script>
-<script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
-</body>
-</html>
diff --git a/ruoyi-admin/src/main/resources/templates/style/images/4271617159537_.pic_hd.jpg b/ruoyi-admin/src/main/resources/templates/style/images/4271617159537_.pic_hd.jpg
deleted file mode 100644
index 0d577492a..000000000
Binary files a/ruoyi-admin/src/main/resources/templates/style/images/4271617159537_.pic_hd.jpg and /dev/null differ
diff --git a/ruoyi-admin/src/main/resources/templates/style/images/img/login-background.jpg b/ruoyi-admin/src/main/resources/templates/style/images/img/login-background.jpg
deleted file mode 100644
index 15706512f..000000000
Binary files a/ruoyi-admin/src/main/resources/templates/style/images/img/login-background.jpg and /dev/null differ
