diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 15569178..103825cb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -25,7 +25,7 @@ user:
#Spring配置
spring:
thymeleaf:
- mode: LEGACYHTML5
+ mode: HTML
cache: false
messages:
#国际化资源文件路径
diff --git a/src/main/resources/mybatis/system/UserMapper.xml b/src/main/resources/mybatis/system/UserMapper.xml
index 86544601..4d95102e 100644
--- a/src/main/resources/mybatis/system/UserMapper.xml
+++ b/src/main/resources/mybatis/system/UserMapper.xml
@@ -35,13 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<select id="selectUserList" parameterType="User" resultMap="UserResult">
- select user_id, dept_id, login_name, user_name, email, phonenumber, password, sex, avatar, salt, status, create_by, create_time, remark from sys_user
- where status in (0,1)
+ select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.phonenumber, u.password, u.sex, u.avatar, u.salt, u.status, u.create_by, u.create_time, u.remark, d.dept_name from sys_user u
+ left join sys_dept d on u.dept_id = d.dept_id
+ where u.status in (0,1)
<if test="searchValue != null and searchValue != ''">
- AND login_name like concat(concat('%', #{searchValue}), '%')
+ AND u.login_name like concat(concat('%', #{searchValue}), '%')
</if>
<if test="deptId != null and parentId != null and parentId != 0">
- AND dept_id IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} OR parent_id = #{deptId})
+ AND u.dept_id IN (SELECT t.dept_id FROM sys_dept t WHERE t.dept_id = #{deptId} OR t.parent_id = #{deptId})
</if>
</select>
diff --git a/src/main/resources/static/ruoyi/system/user/user.js b/src/main/resources/static/ruoyi/system/user/user.js
index a07000d4..0b1fead1 100644
--- a/src/main/resources/static/ruoyi/system/user/user.js
+++ b/src/main/resources/static/ruoyi/system/user/user.js
@@ -23,6 +23,10 @@ function queryUserList() {
field: 'userName',
title: '用户名称'
},
+ {
+ field: 'dept.deptName',
+ title: '部门'
+ },
{
field: 'email',
title: '邮箱'
diff --git a/src/main/resources/templates/error/404.html b/src/main/resources/templates/error/404.html
index e5e00022..61643cb3 100644
--- a/src/main/resources/templates/error/404.html
+++ b/src/main/resources/templates/error/404.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html lang="zh">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/src/main/resources/templates/error/500.html b/src/main/resources/templates/error/500.html
index 678020c0..200dacc9 100644
--- a/src/main/resources/templates/error/500.html
+++ b/src/main/resources/templates/error/500.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html lang="zh">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/src/main/resources/templates/error/unauth.html b/src/main/resources/templates/error/unauth.html
index 56217dea..0be6a56d 100644
--- a/src/main/resources/templates/error/unauth.html
+++ b/src/main/resources/templates/error/unauth.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html lang="zh">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 81038cfe..53c1bb90 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 302640ce..b51b4bdd 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -1,6 +1,5 @@
<!DOCTYPE html>
-<html lang="en">
-<html xmlns:th="http://www.thymeleaf.org">
+<html lang="zh" 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">
diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html
index 724ad910..e078f81d 100644
--- a/src/main/resources/templates/main.html
+++ b/src/main/resources/templates/main.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/src/main/resources/templates/monitor/job/add.html b/src/main/resources/templates/monitor/job/add.html
index 8ccda0d4..6782c35b 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<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 b67db35e..d3dc14d8 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
diff --git a/src/main/resources/templates/monitor/job/job.html b/src/main/resources/templates/monitor/job/job.html
index f7bfaba6..65ebf43a 100644
--- a/src/main/resources/templates/monitor/job/job.html
+++ b/src/main/resources/templates/monitor/job/job.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
diff --git a/src/main/resources/templates/monitor/job/jobLog.html b/src/main/resources/templates/monitor/job/jobLog.html
index 95d227b6..0ca24362 100644
--- a/src/main/resources/templates/monitor/job/jobLog.html
+++ b/src/main/resources/templates/monitor/job/jobLog.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
diff --git a/src/main/resources/templates/monitor/logininfor/logininfor.html b/src/main/resources/templates/monitor/logininfor/logininfor.html
index 9d98fc63..bd503d2d 100644
--- a/src/main/resources/templates/monitor/logininfor/logininfor.html
+++ b/src/main/resources/templates/monitor/logininfor/logininfor.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
diff --git a/src/main/resources/templates/monitor/online/online.html b/src/main/resources/templates/monitor/online/online.html
index 55a050db..0a64a530 100644
--- a/src/main/resources/templates/monitor/online/online.html
+++ b/src/main/resources/templates/monitor/online/online.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
diff --git a/src/main/resources/templates/monitor/operlog/detail.html b/src/main/resources/templates/monitor/operlog/detail.html
index 02f15f2d..ca1e1fe1 100644
--- a/src/main/resources/templates/monitor/operlog/detail.html
+++ b/src/main/resources/templates/monitor/operlog/detail.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
diff --git a/src/main/resources/templates/monitor/operlog/operlog.html b/src/main/resources/templates/monitor/operlog/operlog.html
index b4b3e421..81f6d0c3 100644
--- a/src/main/resources/templates/monitor/operlog/operlog.html
+++ b/src/main/resources/templates/monitor/operlog/operlog.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
diff --git a/src/main/resources/templates/system/config/add.html b/src/main/resources/templates/system/config/add.html
index aab67b52..6344908b 100644
--- a/src/main/resources/templates/system/config/add.html
+++ b/src/main/resources/templates/system/config/add.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
diff --git a/src/main/resources/templates/system/config/config.html b/src/main/resources/templates/system/config/config.html
index 2f410aa5..92b9eaac 100644
--- a/src/main/resources/templates/system/config/config.html
+++ b/src/main/resources/templates/system/config/config.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="gray-bg">
diff --git a/src/main/resources/templates/system/config/edit.html b/src/main/resources/templates/system/config/edit.html
index 39e94fea..a5c7d0dc 100644
--- a/src/main/resources/templates/system/config/edit.html
+++ b/src/main/resources/templates/system/config/edit.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<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 3ed0a9d5..dc7d50f1 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<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 5cc6cfeb..70288f69 100644
--- a/src/main/resources/templates/system/dept/dept.html
+++ b/src/main/resources/templates/system/dept/dept.html
@@ -1,5 +1,6 @@
<!DOCTYPE html>
-<html xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
+ xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<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 eb6ed7b4..4604f687 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<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 10996dcf..b34c1cd8 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" th: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 b228b7da..f9d2c1bd 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
diff --git a/src/main/resources/templates/system/dict/data/data.html b/src/main/resources/templates/system/dict/data/data.html
index c1ea9d59..1bede3eb 100644
--- a/src/main/resources/templates/system/dict/data/data.html
+++ b/src/main/resources/templates/system/dict/data/data.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
diff --git a/src/main/resources/templates/system/dict/data/edit.html b/src/main/resources/templates/system/dict/data/edit.html
index 259915c9..09b0d1f9 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<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 15fafbb6..209606c0 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<link href="/ajax/libs/iCheck/custom.css" th: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 6a01704d..746eec1b 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<link href="/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
diff --git a/src/main/resources/templates/system/menu/icon.html b/src/main/resources/templates/system/menu/icon.html
index 78adb044..f9f7f194 100644
--- a/src/main/resources/templates/system/menu/icon.html
+++ b/src/main/resources/templates/system/menu/icon.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="en">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<meta charset="UTF-8">
<title>Font Awesome Ico list</title>
diff --git a/src/main/resources/templates/system/menu/menu.html b/src/main/resources/templates/system/menu/menu.html
index 205ae717..a3185879 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<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 e4f69dc0..b4e83b5b 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" th: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 40ee7169..7264a846 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<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 eb60b3ec..abf3e02c 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
diff --git a/src/main/resources/templates/system/post/post.html b/src/main/resources/templates/system/post/post.html
index b5646adf..a84abb28 100644
--- a/src/main/resources/templates/system/post/post.html
+++ b/src/main/resources/templates/system/post/post.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
diff --git a/src/main/resources/templates/system/role/add.html b/src/main/resources/templates/system/role/add.html
index bd236450..b4dcd0b4 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" th: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 f0e0df2b..ed993504 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>
diff --git a/src/main/resources/templates/system/role/role.html b/src/main/resources/templates/system/role/role.html
index f615d7e0..dc38e2ba 100644
--- a/src/main/resources/templates/system/role/role.html
+++ b/src/main/resources/templates/system/role/role.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
diff --git a/src/main/resources/templates/system/user/add.html b/src/main/resources/templates/system/user/add.html
index a88b8978..157a4af6 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<link href="/ajax/libs/iCheck/custom.css" th: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 7a922fc0..cc4596b6 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<link href="/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
diff --git a/src/main/resources/templates/system/user/profile/avatar.html b/src/main/resources/templates/system/user/profile/avatar.html
index a859dd6a..a3b01706 100644
--- a/src/main/resources/templates/system/user/profile/avatar.html
+++ b/src/main/resources/templates/system/user/profile/avatar.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<title>用户头像修改</title>
<link href="/ajax/libs/cropbox/cropbox.css" th:href="@{/ajax/libs/cropbox/cropbox.css}" rel="stylesheet"/>
diff --git a/src/main/resources/templates/system/user/profile/edit.html b/src/main/resources/templates/system/user/profile/edit.html
index f4ebf6af..c9121462 100644
--- a/src/main/resources/templates/system/user/profile/edit.html
+++ b/src/main/resources/templates/system/user/profile/edit.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
diff --git a/src/main/resources/templates/system/user/profile/profile.html b/src/main/resources/templates/system/user/profile/profile.html
index c75b7a8c..a33f1316 100644
--- a/src/main/resources/templates/system/user/profile/profile.html
+++ b/src/main/resources/templates/system/user/profile/profile.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/src/main/resources/templates/system/user/profile/resetPwd.html b/src/main/resources/templates/system/user/profile/resetPwd.html
index 778324c7..e939de0c 100644
--- a/src/main/resources/templates/system/user/profile/resetPwd.html
+++ b/src/main/resources/templates/system/user/profile/resetPwd.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
diff --git a/src/main/resources/templates/system/user/resetPwd.html b/src/main/resources/templates/system/user/resetPwd.html
index b1a49222..7986f135 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 xmlns:th="http://www.w3.org/1999/xhtml">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
diff --git a/src/main/resources/templates/system/user/user.html b/src/main/resources/templates/system/user/user.html
index afcf1b85..caa6215d 100644
--- a/src/main/resources/templates/system/user/user.html
+++ b/src/main/resources/templates/system/user/user.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
+<html lang="zh" xmlns:th="http://www.thymeleaf.org"
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
diff --git a/src/main/resources/templates/tool/build/build.html b/src/main/resources/templates/tool/build/build.html
index cf7e76d7..6724e91b 100644
--- a/src/main/resources/templates/tool/build/build.html
+++ b/src/main/resources/templates/tool/build/build.html
@@ -1,6 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
- xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
<link href="/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
diff --git a/src/main/resources/templates/tool/gen/gen.html b/src/main/resources/templates/tool/gen/gen.html
index 5a9709a0..2d4991b8 100644
--- a/src/main/resources/templates/tool/gen/gen.html
+++ b/src/main/resources/templates/tool/gen/gen.html
@@ -1,6 +1,5 @@
<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org"
- xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="gray-bg">
diff --git a/src/main/resources/templates/vm/html/add.html.vm b/src/main/resources/templates/vm/html/add.html.vm
index 79bb32b8..2b85c474 100644
--- a/src/main/resources/templates/vm/html/add.html.vm
+++ b/src/main/resources/templates/vm/html/add.html.vm
@@ -1,5 +1,5 @@
-<!DOCTYPE html>
-<html>
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
diff --git a/src/main/resources/templates/vm/html/edit.html.vm b/src/main/resources/templates/vm/html/edit.html.vm
index 0cfd4e06..67ec9218 100644
--- a/src/main/resources/templates/vm/html/edit.html.vm
+++ b/src/main/resources/templates/vm/html/edit.html.vm
@@ -1,5 +1,5 @@
-<!DOCTYPE html>
-<html>
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
diff --git a/src/main/resources/templates/vm/html/list.html.vm b/src/main/resources/templates/vm/html/list.html.vm
index e87de562..6486d0e2 100644
--- a/src/main/resources/templates/vm/html/list.html.vm
+++ b/src/main/resources/templates/vm/html/list.html.vm
@@ -1,5 +1,5 @@
-<!DOCTYPE html>
-<html lang="zh_CN" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="gray-bg">