diff --git a/public/login2/favicon.ico b/public/login/favicon.ico
similarity index 100%
rename from public/login2/favicon.ico
rename to public/login/favicon.ico
diff --git a/public/login/index.html b/public/login/index.html
index d29dcd88..0f7ac2da 100644
--- a/public/login/index.html
+++ b/public/login/index.html
@@ -1,93 +1,73 @@
-﻿<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 
 <head>
-	<meta charset="utf-8" />
-	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta http-equiv="Content-Language" content="zh-CN" />
-	<meta name="renderer" content="webkit" />
-	<meta name="viewport" content="initial-scale=1, maximum-scale=3, minimum-scale=1, user-scalable=no" />
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Login</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="../common/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="./static/main.css" rel="stylesheet">
+    <link href="./favicon.ico" rel="shortcut icon">
 
-	<title>Mcserver 验证</title>
-
-	<link href="./static/template/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<link href="./static/login/css/style.css" rel="stylesheet">
-	<link href="./static/common/image/icon.ico" rel="shortcut icon">
-	<!--[if lt IE 9]>
-        <div id='Not_' class="show-ui" style="height: 40px;background-color: rgb(221,79,67);text-align:center;line-height: 40px;color: white;">
-            <b>无法访问! 您的浏览器版本过低或是兼容模式,请使用最新/更高版本的浏览器: IE10+ chrome FireFox 等，如果是国内浏览器请打开极速浏览模式（webkit内核）。</b>
-        </div>
-    <![endif]-->
 </head>
 
 <body>
+    <!-- 背景图片 -->
+    <div id='view-bg'>
+        <img src="./static/bg.jpg" height="100%" width="100%" />
+    </div>
+    <!-- 登录框 -->
+    <div id="mlogin_center">
+        <div id="mlogin_left">
+            <!-- 内容 -->
+            <div id="mlogin_left_context">
+                <h3>欢迎使用</h3>
+                <p>欢迎你的来到,我作为程序将用尽一切力量来帮助你。</p>
+                <p>如有问题,请及时反馈！</p>
+
+            </div>
+            <p id="mlogin_context_footer">
+                <span>©2013-2018 Suwings. All rights reserved.</span>
+            </p>
+            <!-- 登录 -->
+            <div id="mlogin_right">
+                <div id="mlogin_view">
+                    <h4>验证</h4>
+                    <p>使用您的 MCSM 账户 </p>
+                    <div id="mlogin_form">
+                        <p>用户名</p>
+                        <input id="login-userid" type="text" class="minput" placeholder="普通账号 | 管理用户" />
+                        <p>密码</p>
+                        <input id="login-passwd" type="password" class="minput" placeholder="账号密码" />
+                        <button id="login-button" class="mbutton" onclick="MCSERVER.btnLogin()">验证</button>
+                        <a href="/" id="mlogin_forge" class="text-right help-text" onclick="alert('请联系管理员更改密码，如果您是管理员，请删除user/文件夹下的所有#开头的管理用户')">
+                            忘记密码?
+                        </a>
+                    </div>
+                    <p id="mlogin_context_footer" class="phone ">
+                        <span>©2013-2018 Suwings. All rights reserved.</span>
+                    </p>
+                </div>
+            </div>
+        </div>
+
+    </div>
 
-	<div id='view-bg'>
-		<img src="./static/login/img/background.jpg" height="100%" width="100%" />
-	</div>
-	<div id='login-view' class="show-ui">
-		<div id='login-sub'>
-			<div class="container-fluid">
-				<div class="row">
-					<img id='logo' src="static/common/logo.png">
-					<br>
-					<!-- <span class="ft-size-12 ft-color-black ft-text-index">登录到 Mcserver。</span> -->
-				</div>
-				<div id='login-form' class="row">
-					<!-- 表单开始 -->
-					<form class="form-horizontal" role="form">
-						<div class="form-group has-feedback">
-							<div class="col-sm-12">
-								<input type="text" class="form-control border-1 minput" id="login-userid" placeholder="普通用户 | 管理用户">
-								<span class="glyphicon glyphicon-user form-control-feedback" aria-hidden="true"></span>
 
-							</div>
-						</div>
-						<div class="form-group has-feedback">
-							<div class="col-sm-12">
-								<input type="password" class="form-control border-1 minput" id="login-passwd" placeholder="密码" onkeypress="enKeyPress()">
-								<span class="glyphicon glyphicon-th form-control-feedback" aria-hidden="true"></span>
-							</div>
-						</div>
-						<div class="form-group">
-							<div class="col-xs-4 col-sm-6"></div>
-							<div class="col-xs-8 col-sm-6">
-								<a href="/" id="form-help" class="text-right help-text" onclick="alert('请联系管理员更改密码，如果您是管理员，请删除user/文件夹下的所有#开头的管理用户')">忘记密码?</a>
-							</div>
-						</div>
-						<div class="form-group">
-							<div class="col-sm-12">
-								<div id='login-button' class="btn btn-default btn-info border-1" onclick="MCSERVER.btnLogin()">
-									<b>验证</b>
-								</div>
-							</div>
-						</div>
-					</form>
-					<!-- 表单结束 -->
-				</div>
-				<div id="copyright" class="row text-justify">
-					<!-- 你可以删除这里的版权，添加你自己的版权 -->
-					<span>©2013-2018 Suwings. All rights reserved.</span>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div id='view-info' class="alert alert-info show-ui tools-info">默认信息框</div>
 </body>
-<script type="text/javascript" src="./static/template/jq/jq.min.js"></script>
+<script type="text/javascript" src="../common/jquery-3.2.1.min.js"></script>
 <script type="text/javascript" src="../common/URL.js"></script>
 <script type="text/javascript" src="../common/md5.js"></script>
 <script type="text/javascript" src="../common/js/login.js"></script>
-<script type="text/javascript">
-	function enKeyPress() {
-		console.log("按下:" + event.keyCode);
-		if (event.keyCode == 13) {
-			//登录
-			MCSERVER.btnLogin();
-		}
-	}
+<script>
+    function enKeyPress() {
+        console.log("按下:" + event.keyCode);
+        if (event.keyCode == 13) {
+            //登录
+            MCSERVER.btnLogin();
+        }
+    }
 </script>
 
-
 </html>
\ No newline at end of file
diff --git a/public/login2/static/bg.jpg b/public/login/static/bg.jpg
similarity index 100%
rename from public/login2/static/bg.jpg
rename to public/login/static/bg.jpg
diff --git a/public/login2/static/bg1.jpg b/public/login/static/bg1.jpg
similarity index 100%
rename from public/login2/static/bg1.jpg
rename to public/login/static/bg1.jpg
diff --git a/public/login2/static/main.css b/public/login/static/main.css
similarity index 100%
rename from public/login2/static/main.css
rename to public/login/static/main.css
diff --git a/public/login2/index.html b/public/login2/index.html
index 0f7ac2da..d29dcd88 100644
--- a/public/login2/index.html
+++ b/public/login2/index.html
@@ -1,73 +1,93 @@
-<!DOCTYPE html>
+﻿<!DOCTYPE html>
 <html>
 
 <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>Login</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="../common/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="./static/main.css" rel="stylesheet">
-    <link href="./favicon.ico" rel="shortcut icon">
+	<meta charset="utf-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta http-equiv="Content-Language" content="zh-CN" />
+	<meta name="renderer" content="webkit" />
+	<meta name="viewport" content="initial-scale=1, maximum-scale=3, minimum-scale=1, user-scalable=no" />
 
+	<title>Mcserver 验证</title>
+
+	<link href="./static/template/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+	<link href="./static/login/css/style.css" rel="stylesheet">
+	<link href="./static/common/image/icon.ico" rel="shortcut icon">
+	<!--[if lt IE 9]>
+        <div id='Not_' class="show-ui" style="height: 40px;background-color: rgb(221,79,67);text-align:center;line-height: 40px;color: white;">
+            <b>无法访问! 您的浏览器版本过低或是兼容模式,请使用最新/更高版本的浏览器: IE10+ chrome FireFox 等，如果是国内浏览器请打开极速浏览模式（webkit内核）。</b>
+        </div>
+    <![endif]-->
 </head>
 
 <body>
-    <!-- 背景图片 -->
-    <div id='view-bg'>
-        <img src="./static/bg.jpg" height="100%" width="100%" />
-    </div>
-    <!-- 登录框 -->
-    <div id="mlogin_center">
-        <div id="mlogin_left">
-            <!-- 内容 -->
-            <div id="mlogin_left_context">
-                <h3>欢迎使用</h3>
-                <p>欢迎你的来到,我作为程序将用尽一切力量来帮助你。</p>
-                <p>如有问题,请及时反馈！</p>
-
-            </div>
-            <p id="mlogin_context_footer">
-                <span>©2013-2018 Suwings. All rights reserved.</span>
-            </p>
-            <!-- 登录 -->
-            <div id="mlogin_right">
-                <div id="mlogin_view">
-                    <h4>验证</h4>
-                    <p>使用您的 MCSM 账户 </p>
-                    <div id="mlogin_form">
-                        <p>用户名</p>
-                        <input id="login-userid" type="text" class="minput" placeholder="普通账号 | 管理用户" />
-                        <p>密码</p>
-                        <input id="login-passwd" type="password" class="minput" placeholder="账号密码" />
-                        <button id="login-button" class="mbutton" onclick="MCSERVER.btnLogin()">验证</button>
-                        <a href="/" id="mlogin_forge" class="text-right help-text" onclick="alert('请联系管理员更改密码，如果您是管理员，请删除user/文件夹下的所有#开头的管理用户')">
-                            忘记密码?
-                        </a>
-                    </div>
-                    <p id="mlogin_context_footer" class="phone ">
-                        <span>©2013-2018 Suwings. All rights reserved.</span>
-                    </p>
-                </div>
-            </div>
-        </div>
-
-    </div>
 
+	<div id='view-bg'>
+		<img src="./static/login/img/background.jpg" height="100%" width="100%" />
+	</div>
+	<div id='login-view' class="show-ui">
+		<div id='login-sub'>
+			<div class="container-fluid">
+				<div class="row">
+					<img id='logo' src="static/common/logo.png">
+					<br>
+					<!-- <span class="ft-size-12 ft-color-black ft-text-index">登录到 Mcserver。</span> -->
+				</div>
+				<div id='login-form' class="row">
+					<!-- 表单开始 -->
+					<form class="form-horizontal" role="form">
+						<div class="form-group has-feedback">
+							<div class="col-sm-12">
+								<input type="text" class="form-control border-1 minput" id="login-userid" placeholder="普通用户 | 管理用户">
+								<span class="glyphicon glyphicon-user form-control-feedback" aria-hidden="true"></span>
 
+							</div>
+						</div>
+						<div class="form-group has-feedback">
+							<div class="col-sm-12">
+								<input type="password" class="form-control border-1 minput" id="login-passwd" placeholder="密码" onkeypress="enKeyPress()">
+								<span class="glyphicon glyphicon-th form-control-feedback" aria-hidden="true"></span>
+							</div>
+						</div>
+						<div class="form-group">
+							<div class="col-xs-4 col-sm-6"></div>
+							<div class="col-xs-8 col-sm-6">
+								<a href="/" id="form-help" class="text-right help-text" onclick="alert('请联系管理员更改密码，如果您是管理员，请删除user/文件夹下的所有#开头的管理用户')">忘记密码?</a>
+							</div>
+						</div>
+						<div class="form-group">
+							<div class="col-sm-12">
+								<div id='login-button' class="btn btn-default btn-info border-1" onclick="MCSERVER.btnLogin()">
+									<b>验证</b>
+								</div>
+							</div>
+						</div>
+					</form>
+					<!-- 表单结束 -->
+				</div>
+				<div id="copyright" class="row text-justify">
+					<!-- 你可以删除这里的版权，添加你自己的版权 -->
+					<span>©2013-2018 Suwings. All rights reserved.</span>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div id='view-info' class="alert alert-info show-ui tools-info">默认信息框</div>
 </body>
-<script type="text/javascript" src="../common/jquery-3.2.1.min.js"></script>
+<script type="text/javascript" src="./static/template/jq/jq.min.js"></script>
 <script type="text/javascript" src="../common/URL.js"></script>
 <script type="text/javascript" src="../common/md5.js"></script>
 <script type="text/javascript" src="../common/js/login.js"></script>
-<script>
-    function enKeyPress() {
-        console.log("按下:" + event.keyCode);
-        if (event.keyCode == 13) {
-            //登录
-            MCSERVER.btnLogin();
-        }
-    }
+<script type="text/javascript">
+	function enKeyPress() {
+		console.log("按下:" + event.keyCode);
+		if (event.keyCode == 13) {
+			//登录
+			MCSERVER.btnLogin();
+		}
+	}
 </script>
 
+
 </html>
\ No newline at end of file
diff --git a/public/login/static/common/image/icon.ico b/public/login2/static/common/image/icon.ico
similarity index 100%
rename from public/login/static/common/image/icon.ico
rename to public/login2/static/common/image/icon.ico
diff --git a/public/login/static/common/logo.png b/public/login2/static/common/logo.png
similarity index 100%
rename from public/login/static/common/logo.png
rename to public/login2/static/common/logo.png
diff --git a/public/login/static/login/css/style.css b/public/login2/static/login/css/style.css
similarity index 100%
rename from public/login/static/login/css/style.css
rename to public/login2/static/login/css/style.css
diff --git a/public/login/static/login/img/background-1.jpg b/public/login2/static/login/img/background-1.jpg
similarity index 100%
rename from public/login/static/login/img/background-1.jpg
rename to public/login2/static/login/img/background-1.jpg
diff --git a/public/login/static/login/img/background.jpg b/public/login2/static/login/img/background.jpg
similarity index 100%
rename from public/login/static/login/img/background.jpg
rename to public/login2/static/login/img/background.jpg
diff --git a/public/login/static/template/bootstrap/css/bootstrap-theme.css b/public/login2/static/template/bootstrap/css/bootstrap-theme.css
similarity index 100%
rename from public/login/static/template/bootstrap/css/bootstrap-theme.css
rename to public/login2/static/template/bootstrap/css/bootstrap-theme.css
diff --git a/public/login/static/template/bootstrap/css/bootstrap-theme.css.map b/public/login2/static/template/bootstrap/css/bootstrap-theme.css.map
similarity index 100%
rename from public/login/static/template/bootstrap/css/bootstrap-theme.css.map
rename to public/login2/static/template/bootstrap/css/bootstrap-theme.css.map
diff --git a/public/login/static/template/bootstrap/css/bootstrap-theme.min.css b/public/login2/static/template/bootstrap/css/bootstrap-theme.min.css
similarity index 100%
rename from public/login/static/template/bootstrap/css/bootstrap-theme.min.css
rename to public/login2/static/template/bootstrap/css/bootstrap-theme.min.css
diff --git a/public/login/static/template/bootstrap/css/bootstrap-theme.min.css.map b/public/login2/static/template/bootstrap/css/bootstrap-theme.min.css.map
similarity index 100%
rename from public/login/static/template/bootstrap/css/bootstrap-theme.min.css.map
rename to public/login2/static/template/bootstrap/css/bootstrap-theme.min.css.map
diff --git a/public/login/static/template/bootstrap/css/bootstrap.css b/public/login2/static/template/bootstrap/css/bootstrap.css
similarity index 100%
rename from public/login/static/template/bootstrap/css/bootstrap.css
rename to public/login2/static/template/bootstrap/css/bootstrap.css
diff --git a/public/login/static/template/bootstrap/css/bootstrap.css.map b/public/login2/static/template/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from public/login/static/template/bootstrap/css/bootstrap.css.map
rename to public/login2/static/template/bootstrap/css/bootstrap.css.map
diff --git a/public/login/static/template/bootstrap/css/bootstrap.min.css b/public/login2/static/template/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from public/login/static/template/bootstrap/css/bootstrap.min.css
rename to public/login2/static/template/bootstrap/css/bootstrap.min.css
diff --git a/public/login/static/template/bootstrap/css/bootstrap.min.css.map b/public/login2/static/template/bootstrap/css/bootstrap.min.css.map
similarity index 100%
rename from public/login/static/template/bootstrap/css/bootstrap.min.css.map
rename to public/login2/static/template/bootstrap/css/bootstrap.min.css.map
diff --git a/public/login/static/template/bootstrap/fonts/glyphicons-halflings-regular.eot b/public/login2/static/template/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from public/login/static/template/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to public/login2/static/template/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/public/login/static/template/bootstrap/fonts/glyphicons-halflings-regular.svg b/public/login2/static/template/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from public/login/static/template/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to public/login2/static/template/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/public/login/static/template/bootstrap/fonts/glyphicons-halflings-regular.ttf b/public/login2/static/template/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from public/login/static/template/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to public/login2/static/template/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/public/login/static/template/bootstrap/fonts/glyphicons-halflings-regular.woff b/public/login2/static/template/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from public/login/static/template/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to public/login2/static/template/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/public/login/static/template/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/public/login2/static/template/bootstrap/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from public/login/static/template/bootstrap/fonts/glyphicons-halflings-regular.woff2
rename to public/login2/static/template/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/public/login/static/template/bootstrap/js/bootstrap.js b/public/login2/static/template/bootstrap/js/bootstrap.js
similarity index 100%
rename from public/login/static/template/bootstrap/js/bootstrap.js
rename to public/login2/static/template/bootstrap/js/bootstrap.js
diff --git a/public/login/static/template/bootstrap/js/bootstrap.min.js b/public/login2/static/template/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from public/login/static/template/bootstrap/js/bootstrap.min.js
rename to public/login2/static/template/bootstrap/js/bootstrap.min.js
diff --git a/public/login/static/template/bootstrap/js/npm.js b/public/login2/static/template/bootstrap/js/npm.js
similarity index 100%
rename from public/login/static/template/bootstrap/js/npm.js
rename to public/login2/static/template/bootstrap/js/npm.js
diff --git a/public/login/static/template/jq/jq.min.js b/public/login2/static/template/jq/jq.min.js
similarity index 100%
rename from public/login/static/template/jq/jq.min.js
rename to public/login2/static/template/jq/jq.min.js
