From e208d7a53e4b12c10768b5f6c75f75caf9b287ae Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 28 Apr 2018 17:58:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=83=A8=E5=88=86=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/ruoyi/system/post/add.js |  2 +-
 .../static/ruoyi/system/post/edit.js          |  2 +-
 .../static/ruoyi/system/post/post.js          |  2 +-
 src/main/resources/templates/include.html     | 44 +++++++++----------
 src/main/resources/templates/index.html       | 17 +++----
 src/main/resources/templates/login.html       |  2 +-
 src/main/resources/templates/main.html        | 16 +++----
 .../templates/system/dict/type/type.html      |  2 +-
 .../resources/templates/system/post/add.html  |  2 +-
 .../resources/templates/system/post/edit.html |  2 +-
 .../resources/templates/system/post/post.html |  2 +-
 11 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/src/main/resources/static/ruoyi/system/post/add.js b/src/main/resources/static/ruoyi/system/post/add.js
index d1aea4d5..9412877e 100644
--- a/src/main/resources/static/ruoyi/system/post/add.js
+++ b/src/main/resources/static/ruoyi/system/post/add.js
@@ -17,5 +17,5 @@ $("#form-post-add").validate({
 
 /** 岗位管理-新增岗位 */
 function add() {
-	_ajax_save("/system/post/save", $("#form-post-add").serialize());
+	_ajax_save(ctx + "/system/post/save", $("#form-post-add").serialize());
 }
\ No newline at end of file
diff --git a/src/main/resources/static/ruoyi/system/post/edit.js b/src/main/resources/static/ruoyi/system/post/edit.js
index 3b3d6c07..be65a4c6 100644
--- a/src/main/resources/static/ruoyi/system/post/edit.js
+++ b/src/main/resources/static/ruoyi/system/post/edit.js
@@ -17,5 +17,5 @@ $("#form-post-edit").validate({
 
 /** 岗位管理-修改岗位 */
 function edit() {
-	_ajax_save("/system/post/save", $("#form-post-edit").serialize());
+	_ajax_save(ctx + "/system/post/save", $("#form-post-edit").serialize());
 }
\ No newline at end of file
diff --git a/src/main/resources/static/ruoyi/system/post/post.js b/src/main/resources/static/ruoyi/system/post/post.js
index 937276e1..f4c06c51 100644
--- a/src/main/resources/static/ruoyi/system/post/post.js
+++ b/src/main/resources/static/ruoyi/system/post/post.js
@@ -1,4 +1,4 @@
-var prefix = "/system/post"
+var prefix = ctx + "/system/post"
 
 $(function() {
 	var columns = [{
diff --git a/src/main/resources/templates/include.html b/src/main/resources/templates/include.html
index 57eade74..b0d9f1dd 100644
--- a/src/main/resources/templates/include.html
+++ b/src/main/resources/templates/include.html
@@ -5,35 +5,35 @@
 	<meta name="keywords" content="">
 	<meta name="description" content="">
 	<link rel="shortcut icon" href="favicon.ico">
-	<link href="/css/bootstrap.min.css" rel="stylesheet">
-	<link href="/css/font-awesome.css" rel="stylesheet">
+	<link href="../static/css/bootstrap.min.css" rel="stylesheet" th:href="@{/css/bootstrap.min.css}">
+	<link href="../static/css/font-awesome.css" rel="stylesheet" th:href="@{/css/font-awesome.css}">
 	<!-- bootstrap-table 表格插件样式 -->
-	<link href="/ajax/libs/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
-	<link href="/ajax/libs/jqTreeGrid/jquery.treegrid.css" rel="stylesheet">
-	<link href="/css/animate.css" rel="stylesheet">
-	<link href="/css/style.css" rel="stylesheet">
-	<link href="/css/checkbox.css" rel="stylesheet">
+	<link href="../static/ajax/libs/bootstrap-table/bootstrap-table.min.css" rel="stylesheet" th:href="@{/ajax/libs/bootstrap-table/bootstrap-table.min.css}">
+	<link href="../static/ajax/libs/jqTreeGrid/jquery.treegrid.css" rel="stylesheet" th:href="@{/ajax/libs/jqTreeGrid/jquery.treegrid.css}">
+	<link href="../static/css/animate.css" rel="stylesheet" th:href="@{/css/animate.css}">
+	<link href="../static/css/style.css" rel="stylesheet" th:href="@{/css/style.css}">
+	<link href="../static/css/checkbox.css" rel="stylesheet" th:href="@{/css/checkbox.css}">
 </head>
 <div th:fragment="footer">
-	<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>
 	
 	<!-- bootstrap-table 表格插件 -->
-	<script src="/ajax/libs/bootstrap-table/bootstrap-table.min.js"></script>
-	<script src="/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
-	<script src="/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
-	<script src="/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js"></script>
+	<script src="../static/ajax/libs/bootstrap-table/bootstrap-table.min.js" th:src="@{/ajax/libs/bootstrap-table/bootstrap-table.min.js}"></script>
+	<script src="../static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js" th:src="@{/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js}"></script>
+	<script src="../static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js" th:src="@{/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js}"></script>
+	<script src="../static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js" th:src="@{/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js}"></script>
 	<!-- jquery-validate 表单验证插件 -->
-	<script src="/ajax/libs/validate/jquery.validate.min.js"></script>
-	<script src="/ajax/libs/validate/messages_zh.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>
 	<!-- jquery-validate 表单树插件 -->
-	<script src="/ajax/libs/jqTreeGrid/jquery.treegrid.min.js"></script>
-	<script src="/ajax/libs/jqTreeGrid/jquery.treegrid.extension.js"></script>
+	<script src="../static/ajax/libs/jqTreeGrid/jquery.treegrid.min.js" th:src="@{/ajax/libs/jqTreeGrid/jquery.treegrid.min.js}"></script>
+	<script src="../static/ajax/libs/jqTreeGrid/jquery.treegrid.extension.js" th:src="@{/ajax/libs/jqTreeGrid/jquery.treegrid.extension.js}"></script>
 	<!-- jquery-export 表格导出插件 -->
-	<script src="/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js"></script>
-	<script src="/ajax/libs/bootstrap-table/extensions/export/tableExport.js"></script>
-	<script src="/ajax/libs/layer/layer.min.js"></script>
-	<script src="/ruoyi/js/common.js?v=1.1.1"></script>
-	<script src="/ruoyi/js/ry-ui.js?v=1.1.1"></script>
+	<script src="../static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js" th:src="@{/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js}"></script>
+	<script src="../static/ajax/libs/bootstrap-table/extensions/export/tableExport.js" th:src="@{/ajax/libs/bootstrap-table/extensions/export/tableExport.js}"></script>
+	<script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
+	<script src="../static/ruoyi/js/common.js?v=1.1.1" th:src="@{/ruoyi/js/common.js?v=1.1.1}"></script>
+	<script src="../static/ruoyi/js/ry-ui.js?v=1.1.1" th:src="@{/ruoyi/js/ry-ui.js?v=1.1.1}"></script>
 	<script src="http://tajs.qq.com/stats?sId=62048022"></script>
 </div>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index a7729d7d..78d3d3c2 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -17,6 +17,7 @@
     <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>
+<script th:inline="javascript"> var ctx = [[@{/}]]; </script>
 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden">
 <div id="wrapper">
 
@@ -36,7 +37,7 @@
                          <ul class="dropdown-menu animated fadeInRight m-t-xs">
                              <li><a class="menuItem" href="profile.html">个人信息</a></li>
                              <li class="divider"></li>
-                             <li><a href="/logout">退出</a></li>
+                             <li><a th-href="@{/logout}">退出</a></li>
                          </ul>
                     </div>
                 </li>
@@ -54,7 +55,7 @@
                 	</a>
                    <ul class="nav nav-second-level collapse">
                         <li th:each="cmenu : ${menu.children}">
-                        	<a class="menuItem" th:text="${cmenu.menuName}" th:href="${cmenu.url}">二级菜单</a>
+                        	<a class="menuItem" th:text="${cmenu.menuName}" th:href="@{${cmenu.url}}">二级菜单</a>
                         </li>
                     </ul>
                 </li>
@@ -83,7 +84,7 @@
 	                <li>
 	                    <span class="m-r-sm text-muted welcome-message">欢迎来到若依管理后台.</span>
 	                </li>
-                    <li class="hidden-xs"><a href="/logout" ><i class="fa fa-sign-out"></i>退出</li>
+                    <li class="hidden-xs"><a th:href="@{logout}"><i class="fa fa-sign-out"></i>退出</li>
                 </ul>
             </nav>
         </div>
@@ -121,10 +122,10 @@
     <!--右侧部分结束-->
 </div>
 <!-- 全局js -->
-<script src="/js/jquery.min.js"></script>
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/plugins/metisMenu/jquery.metisMenu.js"></script>
-<script src="/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
-<script src="/ruoyi/js/index.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="../static/js/plugins/metisMenu/jquery.metisMenu.js" th:src="@{/js/plugins/metisMenu/jquery.metisMenu.js}"></script>
+<script src="../static/js/plugins/slimscroll/jquery.slimscroll.min.js" th:src="@{/js/plugins/slimscroll/jquery.slimscroll.min.js}"></script>
+<script src="../static/ruoyi/js/index.js" th:src="@{/ruoyi/js/index.js}"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 8e621514..7854ef02 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -86,7 +86,7 @@
 	        data: $('#signupForm').serialize(),
 	        success: function(r) {
 	            if (r.code == 0) {
-	                parent.location.href = '/index';
+	                parent.location.href = ctx + 'index';
 	            } else {
 	                layer.msg(r.msg);
 	            }
diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html
index d726ee56..60862348 100644
--- a/src/main/resources/templates/main.html
+++ b/src/main/resources/templates/main.html
@@ -6,10 +6,10 @@
     <!--360浏览器优先以webkit内核解析-->
     <title>若依介绍</title>
     <link rel="shortcut icon" href="favicon.ico">
-    <link href="/css/main/bootstrap.min14ed.css" rel="stylesheet">
-    <link href="/css/main/font-awesome.min93e3.css" rel="stylesheet">
-    <link href="/css/main/animate.min.css" rel="stylesheet">
-    <link href="/css/main/style.min862f.css" rel="stylesheet">
+    <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/main/animate.min.css" th:href="@{/css/main/animate.min.css}" rel="stylesheet">
+    <link href="../static/css/main/style.min862f.css" th:href="@{/css/main/style.min862f.css}" rel="stylesheet">
 </head>
 
 <body class="gray-bg">
@@ -28,7 +28,7 @@
             <small>移动设备访问请扫描以下二维码：</small>
             <br>
             <br>
-            <img src="/img/qr_code.png" width="100%" style="max-width:264px;">
+            <img src="../static/img/qr_code.png" width="100%" style="max-width:264px;">
             <br>
         </div>
         <div class="col-sm-5">
@@ -297,7 +297,7 @@
                             	请作者喝杯咖啡。
                         </div>
                         <p id="pay-qrcode">
-                            <a href="javascript:;"><img src="/img/pay.png" width="100%" alt="请使用手机支付宝或者微信扫码支付">
+                            <a href="javascript:;"><img src="../static/img/pay.png" width="100%" alt="请使用手机支付宝或者微信扫码支付">
                             </a>
                         </p>
 
@@ -306,7 +306,7 @@
             </div>
         </div>
     </div>
-    <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>
 </body>
 </html>
diff --git a/src/main/resources/templates/system/dict/type/type.html b/src/main/resources/templates/system/dict/type/type.html
index e0225249..df0a2fe4 100644
--- a/src/main/resources/templates/system/dict/type/type.html
+++ b/src/main/resources/templates/system/dict/type/type.html
@@ -19,7 +19,7 @@
 		</table>
 	</div>
 	<div th:include="include :: footer"></div>
-	<script type="text/javascript" src="/ruoyi/system/dict/type/type.js"></script>
+	<script type="text/javascript" src="/ruoyi/system/dict/type/type.js" th:src="@{/ruoyi/system/dict/type/type.js}"></script>
 	<script th:inline="javascript" type="text/javascript">
 		var editFlag = [[${@permissionService.hasPermi('system:dict:edit')}]];
 		var listFlag = [[${@permissionService.hasPermi('system:dict:list')}]];
diff --git a/src/main/resources/templates/system/post/add.html b/src/main/resources/templates/system/post/add.html
index 0fd40e35..bca9cbe0 100644
--- a/src/main/resources/templates/system/post/add.html
+++ b/src/main/resources/templates/system/post/add.html
@@ -51,7 +51,7 @@
 		</form>
 	</div>
 	<div th:include="include::footer"></div>
-	<script type="text/javascript" src="/ruoyi/system/post/add.js">
+	<script type="text/javascript" src="/ruoyi/system/post/add.js" th:src="@{/ruoyi/system/post/add.js}">
 	</script>
 </body>
 </html>
diff --git a/src/main/resources/templates/system/post/edit.html b/src/main/resources/templates/system/post/edit.html
index e39d31d4..365913d2 100644
--- a/src/main/resources/templates/system/post/edit.html
+++ b/src/main/resources/templates/system/post/edit.html
@@ -52,7 +52,7 @@
 		</form>
 	</div>
 	<div th:include="include::footer"></div>
-	<script type="text/javascript" src="/ruoyi/system/post/edit.js">
+	<script type="text/javascript" src="/ruoyi/system/post/edit.js" th:src="@{/ruoyi/system/post/edit.js}">
 	</script>
 </body>
 </html>
diff --git a/src/main/resources/templates/system/post/post.html b/src/main/resources/templates/system/post/post.html
index e3348097..5ac30ffb 100644
--- a/src/main/resources/templates/system/post/post.html
+++ b/src/main/resources/templates/system/post/post.html
@@ -18,7 +18,7 @@
 		</table>
 	</div>
 	<div th:include="include :: footer"></div>
-	<script type="text/javascript" src="/ruoyi/system/post/post.js"></script>
+	<script type="text/javascript" src="/ruoyi/system/post/post.js" th:src="@{/ruoyi/system/post/post.js}"></script>
 	<script th:inline="javascript" type="text/javascript">
 		var editFlag = [[${@permissionService.hasPermi('system:post:edit')}]];
 		var removeFlag = [[${@permissionService.hasPermi('system:post:remove')}]];