diff --git a/modules/server/src/main/resources/vm/build/logPage.html b/modules/server/src/main/resources/vm/build/logPage.html
index 8d9bd4469..fb0872a6f 100644
--- a/modules/server/src/main/resources/vm/build/logPage.html
+++ b/modules/server/src/main/resources/vm/build/logPage.html
@@ -20,11 +20,10 @@
     </div>
 </form>
 <script type="text/javascript"
-        th:src="@{${session.jpomProxyPath}+'/static/js/auto-line-number.js?v='+${staticCacheTime}}"></script>
+        th:src="@{${session.jpomProxyPath}+'/static/js/auto-line-number.js?v='+${session.staticCacheTime}}"></script>
 
 <script type="text/javascript">
     var line = 1;
-    var showLine = 0;
 
     function loadSuccess() {
         initPlugin();
diff --git a/modules/server/src/main/resources/vm/common/indexMenus.html b/modules/server/src/main/resources/vm/common/indexMenus.html
index b47f50416..a8a69abce 100644
--- a/modules/server/src/main/resources/vm/common/indexMenus.html
+++ b/modules/server/src/main/resources/vm/common/indexMenus.html
@@ -64,7 +64,7 @@
     <script type="text/html" id="menus_tpl">
         {{#  layui.each(d, function(index, item){ }}
         <li class="layui-nav-item  {{# if(index==0) { }} layui-this {{# } }} ">
-            <a href="javascript:" data-options="{{# if(!item.childs) { }}{{ JSON.stringify(item) }}{{# } }}">
+            <a href="javascript:" data-options={{# if(!item.childs) { }}{{ JSON.stringify(item) }}{{# } }}>
                 {{# if(item.icon && item.icon!=''){ }}
                 <i class="layui-icon {{ item.icon }}"></i>
                 {{# } }}
@@ -108,6 +108,7 @@
                                 try {
                                     options = JSON.parse(dataJSON);
                                 } catch (e) {
+                                    console.log(dataJSON);
                                     options = eval('(' + dataJSON + ')');
                                 }
                                 tabChange(options);
diff --git a/modules/server/src/main/resources/vm/system/cache.vm b/modules/server/src/main/resources/vm/system/cache.html
similarity index 77%
rename from modules/server/src/main/resources/vm/system/cache.vm
rename to modules/server/src/main/resources/vm/system/cache.html
index 2eb279930..b09c68c9f 100644
--- a/modules/server/src/main/resources/vm/system/cache.vm
+++ b/modules/server/src/main/resources/vm/system/cache.html
@@ -1,14 +1,8 @@
 <!DOCTYPE html>
-<html>
-
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <head>
-    <title>Jpom-项目管理系统</title>
-    #parse("./common/head.vm")
+    <th:block th:include="common/head::head"></th:block>
     <style>
-        body {
-            padding: 10px;
-            margin-top: 20px;
-        }
 
         .clear {
             margin-left: 20px;
@@ -19,79 +13,59 @@
 
 <body>
 
-    #if(!$node)
-    <blockquote class="layui-elem-quote">服务端文件缓存：$!cacheFileSize
+
+<th:block th:unless="${node}">
+    <blockquote class="layui-elem-quote">服务端文件缓存：[[${cacheFileSize}]]
         <button type="button" class="layui-btn layui-btn-sm clear" t="serviceCacheFileSize">清空</button>
     </blockquote>
 
-    <blockquote class="layui-elem-quote">黑名单IP数量：$!ipSize
+    <blockquote class="layui-elem-quote">黑名单IP数量：[[${ipSize}]]
         <button type="button" class="layui-btn layui-btn-sm clear" t="serviceIpSize">清空</button>
     </blockquote>
-    <blockquote class="layui-elem-quote">在读取的日志文件数：$!readFileOnLineCount
+    <blockquote class="layui-elem-quote">在读取的日志文件数：[[${readFileOnLineCount}]]
     </blockquote>
-    <blockquote class="layui-elem-quote">在线构建文件占用空间：$!cacheBuildFileSize
+    <blockquote class="layui-elem-quote">在线构建文件占用空间：[[${cacheBuildFileSize}]]
     </blockquote>
-
-    #else
+</th:block>
+<th:block th:if="${node}">
     <blockquote class="layui-elem-quote">文件缓存：
-        <span nodeId="$node.id" fileSize> </span>
-        <button type="button" class="layui-btn layui-btn-sm clear" nodeId="$node.id"
+        <span th:nodeId="${node?.id}" fileSize> </span>
+        <button type="button" class="layui-btn layui-btn-sm clear" th:nodeId="${node?.id}"
                 t="fileSize">清空
         </button>
     </blockquote>
     <blockquote class="layui-elem-quote">进程名缓存：
-        <span nodeId="$node.id" pidName></span>
-        <button type="button" class="layui-btn layui-btn-sm clear" nodeId="$node.id"
+        <span th:nodeId="${node?.id}" pidName></span>
+        <button type="button" class="layui-btn layui-btn-sm clear" th:nodeId="${node?.id}"
                 t="pidName">清空
         </button>
     </blockquote>
     <blockquote class="layui-elem-quote">进程端口缓存：
-        <span nodeId="$node.id" pidPort></span>
-        <button type="button" class="layui-btn layui-btn-sm clear" nodeId="$node.id"
+        <span th:nodeId="${node?.id}" pidPort></span>
+        <button type="button" class="layui-btn layui-btn-sm clear" th:nodeId="${node?.id}"
                 t="pidPort">清空
         </button>
     </blockquote>
     <blockquote class="layui-elem-quote">错误进程缓存：
-        <span nodeId="$node.id" pidError></span>
-        <button type="button" class="layui-btn layui-btn-sm clear" nodeId="$node.id"
+        <span th:nodeId="${node?.id}" pidError></span>
+        <button type="button" class="layui-btn layui-btn-sm clear" th:nodeId="${node?.id}"
                 t="pidPort">清空
         </button>
     </blockquote>
 
     <blockquote class="layui-elem-quote">在读取的日志文件数：
-        <span nodeId="$node.id" readFileOnLineCount></span>
+        <span th:nodeId="${node?.id}" readFileOnLineCount></span>
     </blockquote>
-    #end
+</th:block>
 </body>
 <script>
     function loadSuccess() {
-        #if($user.isSystemUser())
+        if ([[${session.user.isSystemUser()}]]) {
             $(".clear").show();
-        #end
-        #if($node)
-            getCache("$!node.id");
-        #end
-    }
-
-    function getCache(nodeId) {
-        $("button[nodeId='" + nodeId + "']").hide();
-        loadingAjax({
-            url: './node_cache.json',
-            data: {
-                nodeId: nodeId
-            },
-            success: function (data) {
-                if (200 != data.code) {
-                    layer.msg(data.msg);
-                    return;
-                }
-                for (var key in data.data) {
-                    $("span[" + key.toLowerCase() + "][nodeId='" + nodeId + "']").text(data.data[key]);
-                }
-                $("button[nodeId='" + nodeId + "']").show();
-            }
-        });
-
+        }
+        if ([[${node!=null?true:false}]]) {
+            getCache("[[${node?.id}]]");
+        }
 
         $(".clear").click(function () {
             var nodeId = $(this).attr("nodeId");
@@ -118,5 +92,24 @@
             });
         });
     }
+
+    function getCache(nodeId) {
+        loadingAjax({
+            url: './node_cache.json',
+            data: {
+                nodeId: nodeId
+            },
+            success: function (data) {
+                if (200 != data.code) {
+                    layer.msg(data.msg);
+                    return;
+                }
+                for (var key in data.data) {
+                    $("span[" + key.toLowerCase() + "][nodeId='" + nodeId + "']").text(data.data[key]);
+                }
+                $("button[nodeId='" + nodeId + "']").show();
+            }
+        });
+    }
 </script>
 </html>
diff --git a/modules/server/src/main/resources/vm/system/log.vm b/modules/server/src/main/resources/vm/system/log.html
similarity index 89%
rename from modules/server/src/main/resources/vm/system/log.vm
rename to modules/server/src/main/resources/vm/system/log.html
index f6d1afc06..16c9e33c2 100644
--- a/modules/server/src/main/resources/vm/system/log.vm
+++ b/modules/server/src/main/resources/vm/system/log.html
@@ -1,19 +1,11 @@
 <!DOCTYPE html>
-<html>
-
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 <head>
-    <title>Jpom-项目管理系统</title>
-    #parse("./common/head.vm")
+    <th:block th:include="common/head::head"></th:block>
     <style>
-        body {
-            padding: 10px;
-            margin-top: 20px;
-        }
-
         .context {
             height: 90vh;
         }
-
     </style>
 </head>
 
@@ -28,12 +20,16 @@
     </div>
 </div>
 </body>
-<script type="text/javascript" src="$!jpomProxyPath/static/js/auto-line-number.js?v=$staticCacheTime"></script>
+<script type="text/javascript"
+        th:src="@{${session.jpomProxyPath}+'/static/js/auto-line-number.js?v='+${session.staticCacheTime}}"></script>
 <script type="text/javascript">
     var treeData = [];
     var tree;
-
-    var url = getSocketHost() + "/tomcat_log?userId=$user.getUserMd5Key()&tomcatId=system&nodeId=#if(!$node)system#else$!node.id#end&type=tomcat";
+    var nodeId = "system";
+    if ([[${node!=null?true:false}]]) {
+        nodeId = "[[${node?.id}]]";
+    }
+    var url = getSocketHost() + "/tomcat_log?userId=[[${session.user.getUserMd5Key()}]]&tomcatId=system&nodeId=" + nodeId + "&type=tomcat";
     var ws;
 
     function loadSuccess() {
@@ -67,7 +63,7 @@
                                 url: './log_del.json',
                                 data: {
                                     path: data.path,
-                                    nodeId: "$!node.id"
+                                    nodeId: "[[${node?.id}]]"
                                 },
                                 success: function (data) {
                                     layer.msg(data.msg);
@@ -90,7 +86,7 @@
                         if (data.children) {
                             layer.msg("不支持下载文件夹");
                         } else {
-                            window.open("./log_download?path=" + data.path + "&nodeId=$!node.id");
+                            window.open("./log_download?path=" + data.path + "&nodeId=[[${node?.id}]]");
                         }
                         reloadTree();
                         return false;
diff --git a/modules/server/src/main/resources/vm/system/update.vm b/modules/server/src/main/resources/vm/system/update.html
similarity index 91%
rename from modules/server/src/main/resources/vm/system/update.vm
rename to modules/server/src/main/resources/vm/system/update.html
index e06abcbe2..9f90f7e38 100644
--- a/modules/server/src/main/resources/vm/system/update.vm
+++ b/modules/server/src/main/resources/vm/system/update.html
@@ -1,15 +1,7 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
 
-<head>
-    <title>Jpom-项目管理系统</title>
-    #parse("./common/head.vm")
-    <style>
-        body {
-            padding: 10px;
-            margin-top: 20px;
-        }
-    </style>
+<head th:replace="common/head::head">
 </head>
 
 <body>
@@ -36,7 +28,7 @@
         loadingAjax({
             url: './info',
             data: {
-                nodeId: "$!node.id"
+                nodeId: "[[${node?.id}]]"
             },
             success: function (data) {
                 if (200 != data.code) {
diff --git a/modules/server/src/main/resources/vm/user/log/list.vm b/modules/server/src/main/resources/vm/user/log/list.html
similarity index 82%
rename from modules/server/src/main/resources/vm/user/log/list.vm
rename to modules/server/src/main/resources/vm/user/log/list.html
index c81c4b654..9ef6138e6 100644
--- a/modules/server/src/main/resources/vm/user/log/list.vm
+++ b/modules/server/src/main/resources/vm/user/log/list.html
@@ -1,14 +1,6 @@
 <!DOCTYPE html>
-<html>
-
-<head>
-    #parse("./common/head.vm")
-    <title>项目管理系统</title>
-    <style>
-        body {
-            padding: 10px;
-        }
-    </style>
+<html xmlns:th="http://www.w3.org/1999/xhtml">
+<head th:replace="common/head::head">
 </head>
 
 <body>
@@ -56,9 +48,7 @@
                             lay-search="">
                         <option value="">请选择</option>
                         <option value="-">无节点操作</option>
-                        #foreach($item in $nodeArray)
-                            <option value="$item.id">$item.name</option>
-                        #end
+                        <option th:each="item : ${nodeArray}" th:value="${item.id}" th:text="${item.name}"></option>
                     </select>
                 </div>
             </div>
@@ -68,9 +58,7 @@
                     <select name="selectUser" id="selectUser" lay-verify="required" lay-filter="selectUser"
                             lay-search="">
                         <option value="">请选择</option>
-                        #foreach($item in $userArray)
-                            <option value="$item.id">$item.name</option>
-                        #end
+                        <option th:each="item : ${userArray}" th:value="${item.id}" th:text="${item.name}"></option>
                         <option value="system">系统管理员</option>
                     </select>
                 </div>
@@ -81,6 +69,20 @@
 <script type="text/javascript">
     const apiWhere = {};
     var laydate;
+    var col = [
+        {field: 'userId', title: '操作者'},
+        {field: 'ip', title: '操作ip'},
+        {field: 'nodeId', title: '节点Id'},
+        {field: 'dataId', title: '数据Id'},
+        {field: 'optTypeMsg', title: '操作类型'},
+        {field: 'optStatusMsg', title: '执行结果'},
+        {
+            field: 'optTime', title: '操作时间', templet: function (d) {
+                return formateTime(d.optTime);
+            }
+        },
+        {field: 'op', title: '操作', align: 'center', toolbar: '#bar_projects', fixed: 'right'}
+    ];
 
     function loadSuccess() {
         tableRender({
@@ -90,20 +92,7 @@
             toolbar: '#toolbarDemo',
             page: true,
             where: apiWhere,
-            cols: [[
-                {field: 'userId', title: '操作者'},
-                {field: 'ip', title: '操作ip'},
-                {field: 'nodeId', title: '节点Id'},
-                {field: 'dataId', title: '数据Id'},
-                {field: 'optTypeMsg', title: '操作类型'},
-                {field: 'optStatusMsg', title: '执行结果'},
-                {
-                    field: 'optTime', title: '操作时间', templet: function (d) {
-                        return formateTime(d.optTime);
-                    }
-                },
-                {field: 'op', title: '操作', align: 'center', toolbar: '#bar_projects', fixed: 'right'}
-            ]],
+            cols: [col],
             parseData: function (data) {
                 return {
                     "code": data.code,
