From 81f954d87d61dbc188cb131cfc0361ff3f10d308 Mon Sep 17 00:00:00 2001
From: wangxinxx <wangxinxx@163.com>
Date: Thu, 26 Apr 2018 17:56:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0th=E5=A3=B0=E6=98=8E=EF=BC=8C?=
 =?UTF-8?q?login.html/index.html=E9=A1=B5=E9=9D=A2=E7=9A=84css/js=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=A2=9E=E5=8A=A0thymeleaf=E5=B1=9E=E6=80=A7=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AF=E9=80=9A=E8=BF=87=E6=B5=8F=E8=A7=88=E5=99=A8=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=89=93=E5=BC=80=E5=B9=B6=E6=98=BE=E7=A4=BA=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/logback.xml                |  2 +-
 src/main/resources/templates/index.html       | 11 +++++----
 src/main/resources/templates/login.html       | 23 ++++++++++---------
 .../resources/templates/monitor/job/add.html  |  2 +-
 .../resources/templates/monitor/job/edit.html |  2 +-
 .../resources/templates/system/dept/add.html  |  2 +-
 .../resources/templates/system/dept/dept.html |  2 +-
 .../resources/templates/system/dept/edit.html |  2 +-
 .../resources/templates/system/dept/tree.html |  2 +-
 .../templates/system/dict/data/add.html       |  2 +-
 .../templates/system/dict/data/edit.html      |  2 +-
 .../templates/system/dict/type/add.html       |  2 +-
 .../templates/system/dict/type/edit.html      |  2 +-
 .../resources/templates/system/menu/add.html  |  2 +-
 .../resources/templates/system/menu/edit.html |  2 +-
 .../resources/templates/system/menu/menu.html |  2 +-
 .../resources/templates/system/menu/tree.html |  2 +-
 .../resources/templates/system/post/add.html  |  2 +-
 .../resources/templates/system/post/edit.html |  2 +-
 .../resources/templates/system/role/add.html  |  2 +-
 .../resources/templates/system/role/edit.html |  2 +-
 .../resources/templates/system/user/add.html  |  2 +-
 .../resources/templates/system/user/edit.html |  2 +-
 .../templates/system/user/resetPwd.html       |  2 +-
 24 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index d30b1c16..7998e89c 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-	<property name="log_home" value="/home/logs/ruoyi" />
+	<property name="log_home" value="logs/ruoyi" />
 
 	<!-- 控制台输出 -->
 	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 2a25b308..a7729d7d 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
 <html>
 <head>
     <meta charset="utf-8">
@@ -10,11 +11,11 @@
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html"/>
     <![endif]-->
-    <link rel="shortcut icon" href="favicon.ico">
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/css/font-awesome.min.css" rel="stylesheet">
-    <link href="/css/animate.css" rel="stylesheet">
-    <link href="/css/style.css" rel="stylesheet">
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}">
+    <link href="../static/css/bootstrap.min.css" rel="stylesheet" th:href="@{/css/bootstrap.min.css}">
+    <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.css}" rel="stylesheet">
+    <link href="../static/css/animate.css" th:href="@{/css/animate.css}" rel="stylesheet">
+    <link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet">
 </head>
 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden">
 <div id="wrapper">
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index dcb5faf6..8e621514 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+<html 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">
@@ -7,14 +8,14 @@
     <title>若依管理系统 - 登录</title>
     <meta name="keywords" content="若依管理系统">
     <meta name="description" content="RuoYi">
-    <link href="/css/bootstrap.min.css" rel="stylesheet">
-    <link href="/css/font-awesome.css" rel="stylesheet">
-    <link href="/css/style.min.css" rel="stylesheet">
-    <link href="/css/login.min.css" rel="stylesheet">
+    <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet">
+    <link href="../static/css/font-awesome.css" th:href="@{/css/font-awesome.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">
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html" />
     <![endif]-->
-    <link rel="shortcut icon" href="favicon.ico">
+    <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}">
     <script>
         if(window.top!==window.self){window.top.location=window.location};
     </script>
@@ -26,7 +27,7 @@
             <div class="col-sm-7">
                 <div class="signin-info">
                     <div class="logopanel m-b">
-                        <h1><img alt="[ 若依 ]" src="/ruoyi.png"></h1>
+                        <h1><img alt="[ 若依 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1>
                     </div>
                     <div class="m-b"></div>
                     <h4>欢迎使用 <strong>若依 后台管理系统</strong></h4>
@@ -59,12 +60,12 @@
     </div>
 <script th:inline="javascript"> var ctx = [[@{/}]]; </script>
 <!-- 全局js -->
-<script src="/js/jquery.min.js"></script>
-<script src="/js/bootstrap.min.js"></script>
+<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="/ajax/libs/validate/jquery.validate.min.js"></script>
-<script src="/ajax/libs/validate/messages_zh.min.js"></script>
-<script src="/ajax/libs/layer/layer.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="http://tajs.qq.com/stats?sId=62048022"></script>
 <script type="text/javascript">
 	$(document).ready(function() {
diff --git a/src/main/resources/templates/monitor/job/add.html b/src/main/resources/templates/monitor/job/add.html
index fb841da4..50d6f299 100644
--- a/src/main/resources/templates/monitor/job/add.html
+++ b/src/main/resources/templates/monitor/job/add.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="white-bg">
diff --git a/src/main/resources/templates/monitor/job/edit.html b/src/main/resources/templates/monitor/job/edit.html
index 9e950ecd..b2728ea3 100644
--- a/src/main/resources/templates/monitor/job/edit.html
+++ b/src/main/resources/templates/monitor/job/edit.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="white-bg">
diff --git a/src/main/resources/templates/system/dept/add.html b/src/main/resources/templates/system/dept/add.html
index 65af0dea..4717c76d 100644
--- a/src/main/resources/templates/system/dept/add.html
+++ b/src/main/resources/templates/system/dept/add.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="white-bg">
diff --git a/src/main/resources/templates/system/dept/dept.html b/src/main/resources/templates/system/dept/dept.html
index 26351362..8d867c2e 100644
--- a/src/main/resources/templates/system/dept/dept.html
+++ b/src/main/resources/templates/system/dept/dept.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="gray-bg">
diff --git a/src/main/resources/templates/system/dept/edit.html b/src/main/resources/templates/system/dept/edit.html
index 7d602ae4..54e7b28e 100644
--- a/src/main/resources/templates/system/dept/edit.html
+++ b/src/main/resources/templates/system/dept/edit.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="white-bg">
diff --git a/src/main/resources/templates/system/dept/tree.html b/src/main/resources/templates/system/dept/tree.html
index 34cd543d..da59d70d 100644
--- a/src/main/resources/templates/system/dept/tree.html
+++ b/src/main/resources/templates/system/dept/tree.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" rel="stylesheet">
diff --git a/src/main/resources/templates/system/dict/data/add.html b/src/main/resources/templates/system/dict/data/add.html
index a233efa6..c62208ab 100644
--- a/src/main/resources/templates/system/dict/data/add.html
+++ b/src/main/resources/templates/system/dict/data/add.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="white-bg">
diff --git a/src/main/resources/templates/system/dict/data/edit.html b/src/main/resources/templates/system/dict/data/edit.html
index 700a940f..3641df2d 100644
--- a/src/main/resources/templates/system/dict/data/edit.html
+++ b/src/main/resources/templates/system/dict/data/edit.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="white-bg">
diff --git a/src/main/resources/templates/system/dict/type/add.html b/src/main/resources/templates/system/dict/type/add.html
index efa88d45..1f9e6563 100644
--- a/src/main/resources/templates/system/dict/type/add.html
+++ b/src/main/resources/templates/system/dict/type/add.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="white-bg">
diff --git a/src/main/resources/templates/system/dict/type/edit.html b/src/main/resources/templates/system/dict/type/edit.html
index bffbc950..c62626e4 100644
--- a/src/main/resources/templates/system/dict/type/edit.html
+++ b/src/main/resources/templates/system/dict/type/edit.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="white-bg">
diff --git a/src/main/resources/templates/system/menu/add.html b/src/main/resources/templates/system/menu/add.html
index 77150cb8..040dd548 100644
--- a/src/main/resources/templates/system/menu/add.html
+++ b/src/main/resources/templates/system/menu/add.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <link href="/ajax/libs/iCheck/custom.css" rel="stylesheet">
diff --git a/src/main/resources/templates/system/menu/edit.html b/src/main/resources/templates/system/menu/edit.html
index 7b997749..368ac78f 100644
--- a/src/main/resources/templates/system/menu/edit.html
+++ b/src/main/resources/templates/system/menu/edit.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <link href="/ajax/libs/iCheck/custom.css" rel="stylesheet">
diff --git a/src/main/resources/templates/system/menu/menu.html b/src/main/resources/templates/system/menu/menu.html
index 908734ad..759c04c8 100644
--- a/src/main/resources/templates/system/menu/menu.html
+++ b/src/main/resources/templates/system/menu/menu.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="gray-bg">
diff --git a/src/main/resources/templates/system/menu/tree.html b/src/main/resources/templates/system/menu/tree.html
index 01e835a9..54830d4f 100644
--- a/src/main/resources/templates/system/menu/tree.html
+++ b/src/main/resources/templates/system/menu/tree.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" rel="stylesheet">
diff --git a/src/main/resources/templates/system/post/add.html b/src/main/resources/templates/system/post/add.html
index 76cf3191..0fd40e35 100644
--- a/src/main/resources/templates/system/post/add.html
+++ b/src/main/resources/templates/system/post/add.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="white-bg">
diff --git a/src/main/resources/templates/system/post/edit.html b/src/main/resources/templates/system/post/edit.html
index e397b7b1..e39d31d4 100644
--- a/src/main/resources/templates/system/post/edit.html
+++ b/src/main/resources/templates/system/post/edit.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="white-bg">
diff --git a/src/main/resources/templates/system/role/add.html b/src/main/resources/templates/system/role/add.html
index b6797fcc..1d665a3b 100644
--- a/src/main/resources/templates/system/role/add.html
+++ b/src/main/resources/templates/system/role/add.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" rel="stylesheet">
diff --git a/src/main/resources/templates/system/role/edit.html b/src/main/resources/templates/system/role/edit.html
index 8d0d99ee..94c1af1a 100644
--- a/src/main/resources/templates/system/role/edit.html
+++ b/src/main/resources/templates/system/role/edit.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" rel="stylesheet">
diff --git a/src/main/resources/templates/system/user/add.html b/src/main/resources/templates/system/user/add.html
index 8e6b7acb..bdb007d7 100644
--- a/src/main/resources/templates/system/user/add.html
+++ b/src/main/resources/templates/system/user/add.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <link href="/ajax/libs/iCheck/custom.css" rel="stylesheet">
diff --git a/src/main/resources/templates/system/user/edit.html b/src/main/resources/templates/system/user/edit.html
index 9f07859e..dd600937 100644
--- a/src/main/resources/templates/system/user/edit.html
+++ b/src/main/resources/templates/system/user/edit.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <link href="/ajax/libs/iCheck/custom.css" rel="stylesheet">
diff --git a/src/main/resources/templates/system/user/resetPwd.html b/src/main/resources/templates/system/user/resetPwd.html
index 0ed1712b..7523a6c6 100644
--- a/src/main/resources/templates/system/user/resetPwd.html
+++ b/src/main/resources/templates/system/user/resetPwd.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
 <body class="white-bg">
