From 962c72b74f27a76899863b88134305f5be925960 Mon Sep 17 00:00:00 2001
From: "wei.zhang2" <wei.zhang2@baidao.com>
Date: Tue, 17 Oct 2017 09:44:44 +0800
Subject: [PATCH] 1

---
 src/main/resources/{public => static}/index.html              | 0
 src/main/resources/{public => static}/login.html              | 4 ++--
 src/main/resources/{public => static}/pages/dashboard.html    | 0
 src/main/resources/{public => static}/pages/excel/sql.html    | 0
 .../resources/{public => static}/pages/file/fileList.html     | 0
 .../resources/{public => static}/pages/generate/edit.html     | 0
 src/main/resources/{public => static}/pages/job/addJob.html   | 0
 src/main/resources/{public => static}/pages/job/jobList.html  | 0
 .../resources/{public => static}/pages/job/updateJob.html     | 0
 src/main/resources/{public => static}/pages/log/logList.html  | 0
 src/main/resources/{public => static}/pages/mail/addMail.html | 0
 .../resources/{public => static}/pages/mail/mailDetail.html   | 0
 .../resources/{public => static}/pages/mail/mailList.html     | 0
 src/main/resources/{public => static}/pages/menu/addMenu.html | 0
 src/main/resources/{public => static}/pages/menu/icon.html    | 0
 .../resources/{public => static}/pages/menu/menuList.html     | 0
 .../resources/{public => static}/pages/menu/updateMenu.html   | 0
 .../resources/{public => static}/pages/notice/addNotice.html  | 0
 .../resources/{public => static}/pages/notice/detail.html     | 0
 .../resources/{public => static}/pages/notice/noticeList.html | 0
 .../{public => static}/pages/notice/noticePubList.html        | 0
 .../{public => static}/pages/notice/updateNotice.html         | 0
 src/main/resources/{public => static}/pages/role/addRole.html | 0
 .../resources/{public => static}/pages/role/roleList.html     | 0
 src/main/resources/{public => static}/pages/user/addUser.html | 0
 .../{public => static}/pages/user/changePassword.html         | 0
 .../{public => static}/pages/user/updateHeadImg.html          | 0
 .../resources/{public => static}/pages/user/updateMyself.html | 0
 .../resources/{public => static}/pages/user/updateUser.html   | 0
 .../resources/{public => static}/pages/user/userList.html     | 0
 30 files changed, 2 insertions(+), 2 deletions(-)
 rename src/main/resources/{public => static}/index.html (100%)
 rename src/main/resources/{public => static}/login.html (94%)
 rename src/main/resources/{public => static}/pages/dashboard.html (100%)
 rename src/main/resources/{public => static}/pages/excel/sql.html (100%)
 rename src/main/resources/{public => static}/pages/file/fileList.html (100%)
 rename src/main/resources/{public => static}/pages/generate/edit.html (100%)
 rename src/main/resources/{public => static}/pages/job/addJob.html (100%)
 rename src/main/resources/{public => static}/pages/job/jobList.html (100%)
 rename src/main/resources/{public => static}/pages/job/updateJob.html (100%)
 rename src/main/resources/{public => static}/pages/log/logList.html (100%)
 rename src/main/resources/{public => static}/pages/mail/addMail.html (100%)
 rename src/main/resources/{public => static}/pages/mail/mailDetail.html (100%)
 rename src/main/resources/{public => static}/pages/mail/mailList.html (100%)
 rename src/main/resources/{public => static}/pages/menu/addMenu.html (100%)
 rename src/main/resources/{public => static}/pages/menu/icon.html (100%)
 rename src/main/resources/{public => static}/pages/menu/menuList.html (100%)
 rename src/main/resources/{public => static}/pages/menu/updateMenu.html (100%)
 rename src/main/resources/{public => static}/pages/notice/addNotice.html (100%)
 rename src/main/resources/{public => static}/pages/notice/detail.html (100%)
 rename src/main/resources/{public => static}/pages/notice/noticeList.html (100%)
 rename src/main/resources/{public => static}/pages/notice/noticePubList.html (100%)
 rename src/main/resources/{public => static}/pages/notice/updateNotice.html (100%)
 rename src/main/resources/{public => static}/pages/role/addRole.html (100%)
 rename src/main/resources/{public => static}/pages/role/roleList.html (100%)
 rename src/main/resources/{public => static}/pages/user/addUser.html (100%)
 rename src/main/resources/{public => static}/pages/user/changePassword.html (100%)
 rename src/main/resources/{public => static}/pages/user/updateHeadImg.html (100%)
 rename src/main/resources/{public => static}/pages/user/updateMyself.html (100%)
 rename src/main/resources/{public => static}/pages/user/updateUser.html (100%)
 rename src/main/resources/{public => static}/pages/user/userList.html (100%)

diff --git a/src/main/resources/public/index.html b/src/main/resources/static/index.html
similarity index 100%
rename from src/main/resources/public/index.html
rename to src/main/resources/static/index.html
diff --git a/src/main/resources/public/login.html b/src/main/resources/static/login.html
similarity index 94%
rename from src/main/resources/public/login.html
rename to src/main/resources/static/login.html
index baf1461..c5744d1 100644
--- a/src/main/resources/public/login.html
+++ b/src/main/resources/static/login.html
@@ -6,7 +6,7 @@
 <meta http-equiv="Cache-Control" content="no-cache">
 <meta http-equiv="Expires" content="0">
 <title>登录</title>
-<link href="../css/login.css" type="text/css" rel="stylesheet">
+<link href="css/login.css" type="text/css" rel="stylesheet">
 </head>
 <body>
 
@@ -31,7 +31,7 @@
 	</div>
 
 </body>
-<script src="../js/libs/jquery-2.1.1.min.js"></script>
+<script src="js/libs/jquery-2.1.1.min.js"></script>
 <script type="text/javascript">
 	if (top != self) {
 		parent.location.href = '/login.html';
diff --git a/src/main/resources/public/pages/dashboard.html b/src/main/resources/static/pages/dashboard.html
similarity index 100%
rename from src/main/resources/public/pages/dashboard.html
rename to src/main/resources/static/pages/dashboard.html
diff --git a/src/main/resources/public/pages/excel/sql.html b/src/main/resources/static/pages/excel/sql.html
similarity index 100%
rename from src/main/resources/public/pages/excel/sql.html
rename to src/main/resources/static/pages/excel/sql.html
diff --git a/src/main/resources/public/pages/file/fileList.html b/src/main/resources/static/pages/file/fileList.html
similarity index 100%
rename from src/main/resources/public/pages/file/fileList.html
rename to src/main/resources/static/pages/file/fileList.html
diff --git a/src/main/resources/public/pages/generate/edit.html b/src/main/resources/static/pages/generate/edit.html
similarity index 100%
rename from src/main/resources/public/pages/generate/edit.html
rename to src/main/resources/static/pages/generate/edit.html
diff --git a/src/main/resources/public/pages/job/addJob.html b/src/main/resources/static/pages/job/addJob.html
similarity index 100%
rename from src/main/resources/public/pages/job/addJob.html
rename to src/main/resources/static/pages/job/addJob.html
diff --git a/src/main/resources/public/pages/job/jobList.html b/src/main/resources/static/pages/job/jobList.html
similarity index 100%
rename from src/main/resources/public/pages/job/jobList.html
rename to src/main/resources/static/pages/job/jobList.html
diff --git a/src/main/resources/public/pages/job/updateJob.html b/src/main/resources/static/pages/job/updateJob.html
similarity index 100%
rename from src/main/resources/public/pages/job/updateJob.html
rename to src/main/resources/static/pages/job/updateJob.html
diff --git a/src/main/resources/public/pages/log/logList.html b/src/main/resources/static/pages/log/logList.html
similarity index 100%
rename from src/main/resources/public/pages/log/logList.html
rename to src/main/resources/static/pages/log/logList.html
diff --git a/src/main/resources/public/pages/mail/addMail.html b/src/main/resources/static/pages/mail/addMail.html
similarity index 100%
rename from src/main/resources/public/pages/mail/addMail.html
rename to src/main/resources/static/pages/mail/addMail.html
diff --git a/src/main/resources/public/pages/mail/mailDetail.html b/src/main/resources/static/pages/mail/mailDetail.html
similarity index 100%
rename from src/main/resources/public/pages/mail/mailDetail.html
rename to src/main/resources/static/pages/mail/mailDetail.html
diff --git a/src/main/resources/public/pages/mail/mailList.html b/src/main/resources/static/pages/mail/mailList.html
similarity index 100%
rename from src/main/resources/public/pages/mail/mailList.html
rename to src/main/resources/static/pages/mail/mailList.html
diff --git a/src/main/resources/public/pages/menu/addMenu.html b/src/main/resources/static/pages/menu/addMenu.html
similarity index 100%
rename from src/main/resources/public/pages/menu/addMenu.html
rename to src/main/resources/static/pages/menu/addMenu.html
diff --git a/src/main/resources/public/pages/menu/icon.html b/src/main/resources/static/pages/menu/icon.html
similarity index 100%
rename from src/main/resources/public/pages/menu/icon.html
rename to src/main/resources/static/pages/menu/icon.html
diff --git a/src/main/resources/public/pages/menu/menuList.html b/src/main/resources/static/pages/menu/menuList.html
similarity index 100%
rename from src/main/resources/public/pages/menu/menuList.html
rename to src/main/resources/static/pages/menu/menuList.html
diff --git a/src/main/resources/public/pages/menu/updateMenu.html b/src/main/resources/static/pages/menu/updateMenu.html
similarity index 100%
rename from src/main/resources/public/pages/menu/updateMenu.html
rename to src/main/resources/static/pages/menu/updateMenu.html
diff --git a/src/main/resources/public/pages/notice/addNotice.html b/src/main/resources/static/pages/notice/addNotice.html
similarity index 100%
rename from src/main/resources/public/pages/notice/addNotice.html
rename to src/main/resources/static/pages/notice/addNotice.html
diff --git a/src/main/resources/public/pages/notice/detail.html b/src/main/resources/static/pages/notice/detail.html
similarity index 100%
rename from src/main/resources/public/pages/notice/detail.html
rename to src/main/resources/static/pages/notice/detail.html
diff --git a/src/main/resources/public/pages/notice/noticeList.html b/src/main/resources/static/pages/notice/noticeList.html
similarity index 100%
rename from src/main/resources/public/pages/notice/noticeList.html
rename to src/main/resources/static/pages/notice/noticeList.html
diff --git a/src/main/resources/public/pages/notice/noticePubList.html b/src/main/resources/static/pages/notice/noticePubList.html
similarity index 100%
rename from src/main/resources/public/pages/notice/noticePubList.html
rename to src/main/resources/static/pages/notice/noticePubList.html
diff --git a/src/main/resources/public/pages/notice/updateNotice.html b/src/main/resources/static/pages/notice/updateNotice.html
similarity index 100%
rename from src/main/resources/public/pages/notice/updateNotice.html
rename to src/main/resources/static/pages/notice/updateNotice.html
diff --git a/src/main/resources/public/pages/role/addRole.html b/src/main/resources/static/pages/role/addRole.html
similarity index 100%
rename from src/main/resources/public/pages/role/addRole.html
rename to src/main/resources/static/pages/role/addRole.html
diff --git a/src/main/resources/public/pages/role/roleList.html b/src/main/resources/static/pages/role/roleList.html
similarity index 100%
rename from src/main/resources/public/pages/role/roleList.html
rename to src/main/resources/static/pages/role/roleList.html
diff --git a/src/main/resources/public/pages/user/addUser.html b/src/main/resources/static/pages/user/addUser.html
similarity index 100%
rename from src/main/resources/public/pages/user/addUser.html
rename to src/main/resources/static/pages/user/addUser.html
diff --git a/src/main/resources/public/pages/user/changePassword.html b/src/main/resources/static/pages/user/changePassword.html
similarity index 100%
rename from src/main/resources/public/pages/user/changePassword.html
rename to src/main/resources/static/pages/user/changePassword.html
diff --git a/src/main/resources/public/pages/user/updateHeadImg.html b/src/main/resources/static/pages/user/updateHeadImg.html
similarity index 100%
rename from src/main/resources/public/pages/user/updateHeadImg.html
rename to src/main/resources/static/pages/user/updateHeadImg.html
diff --git a/src/main/resources/public/pages/user/updateMyself.html b/src/main/resources/static/pages/user/updateMyself.html
similarity index 100%
rename from src/main/resources/public/pages/user/updateMyself.html
rename to src/main/resources/static/pages/user/updateMyself.html
diff --git a/src/main/resources/public/pages/user/updateUser.html b/src/main/resources/static/pages/user/updateUser.html
similarity index 100%
rename from src/main/resources/public/pages/user/updateUser.html
rename to src/main/resources/static/pages/user/updateUser.html
diff --git a/src/main/resources/public/pages/user/userList.html b/src/main/resources/static/pages/user/userList.html
similarity index 100%
rename from src/main/resources/public/pages/user/userList.html
rename to src/main/resources/static/pages/user/userList.html