style(pom): 格式化pom.xml文件结构
- 统一XML元素的缩进格式 - 调整依赖项和模块的缩进层级 - 优化配置元素的布局结构 style(annotations): 优化注解类代码格式 - 调整AnonymousAccess注解的结构 - 重新格式化AnonymousDeleteMapping注解的属性布局 - 重新格式化AnonymousGetMapping注解的属性布局 - 重新格式化AnonymousPatchMapping注解的属性布局 - 重新格式化AnonymousPostMapping注解的属性布局 - 统一注解属性的缩进和换行格式
This commit is contained in:
+42
-42
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="cn.odboy.system.dal.mysql.SystemRoleMapper">
|
||||
<resultMap id="BaseResultMap" type="cn.odboy.system.dal.dataobject.SystemRoleTb">
|
||||
<resultMap id="BaseResultMap" type="cn.odboy.system.dal.model.SystemRoleVo">
|
||||
<id column="role_role_id" property="id"/>
|
||||
<result column="role_name" property="name"/>
|
||||
<result column="role_data_scope" property="dataScope"/>
|
||||
@@ -54,50 +54,50 @@
|
||||
order by role.role_level
|
||||
</select>
|
||||
<select id="getRoleById" resultMap="BaseResultMap">
|
||||
select role.role_id as role_role_id,
|
||||
role.name as role_name,
|
||||
role.data_scope as role_data_scope,
|
||||
role.level as role_level,
|
||||
role.description as role_description,
|
||||
role.create_by as role_create_by,
|
||||
role.update_by as role_update_by,
|
||||
role.create_time as role_create_time,
|
||||
role.update_time as role_update_time,
|
||||
dept.dept_id as dept_id,
|
||||
dept.name as dept_name,
|
||||
menu.menu_id as menu_id,
|
||||
menu.title as menu_title,
|
||||
menu.permission as menu_permission
|
||||
select role.role_id as role_role_id,
|
||||
role.name as role_name,
|
||||
role.data_scope as role_data_scope,
|
||||
role.level as role_level,
|
||||
role.description as role_description,
|
||||
role.create_by as role_create_by,
|
||||
role.update_by as role_update_by,
|
||||
role.create_time as role_create_time,
|
||||
role.update_time as role_update_time,
|
||||
dept.dept_id as dept_id,
|
||||
dept.name as dept_name,
|
||||
menu.menu_id as menu_id,
|
||||
menu.title as menu_title,
|
||||
menu.permission as menu_permission
|
||||
from system_role role
|
||||
left join system_roles_menus srm on role.role_id = srm.role_id
|
||||
left join system_menu menu on menu.menu_id = srm.menu_id
|
||||
left join system_roles_depts srd on role.role_id = srd.role_id
|
||||
left join system_dept dept on dept.dept_id = srd.dept_id
|
||||
left join system_roles_menus srm on role.role_id = srm.role_id
|
||||
left join system_menu menu on menu.menu_id = srm.menu_id
|
||||
left join system_roles_depts srd on role.role_id = srd.role_id
|
||||
left join system_dept dept on dept.dept_id = srd.dept_id
|
||||
where role.role_id = #{roleId}
|
||||
</select>
|
||||
<select id="selectRoleByUserId" resultMap="BaseResultMap">
|
||||
SELECT role.role_id as role_role_id,
|
||||
role.name as role_name,
|
||||
role.data_scope as role_data_scope,
|
||||
role.level as role_level,
|
||||
role.description as role_description,
|
||||
role.create_by as role_create_by,
|
||||
role.update_by as role_update_by,
|
||||
role.create_time as role_create_time,
|
||||
role.update_time as role_update_time,
|
||||
dept.dept_id as dept_id,
|
||||
dept.name as dept_name,
|
||||
menu.menu_id as menu_id,
|
||||
menu.title as menu_title,
|
||||
menu.permission as menu_permission
|
||||
SELECT role.role_id as role_role_id,
|
||||
role.name as role_name,
|
||||
role.data_scope as role_data_scope,
|
||||
role.level as role_level,
|
||||
role.description as role_description,
|
||||
role.create_by as role_create_by,
|
||||
role.update_by as role_update_by,
|
||||
role.create_time as role_create_time,
|
||||
role.update_time as role_update_time,
|
||||
dept.dept_id as dept_id,
|
||||
dept.name as dept_name,
|
||||
menu.menu_id as menu_id,
|
||||
menu.title as menu_title,
|
||||
menu.permission as menu_permission
|
||||
from system_role role
|
||||
left join system_roles_menus srm on role.role_id = srm.role_id
|
||||
left join system_menu menu on menu.menu_id = srm.menu_id
|
||||
left join system_roles_depts srd on role.role_id = srd.role_id
|
||||
left join system_dept dept on dept.dept_id = srd.dept_id
|
||||
left join system_users_roles ur on role.role_id = ur.role_id
|
||||
left join system_roles_menus srm on role.role_id = srm.role_id
|
||||
left join system_menu menu on menu.menu_id = srm.menu_id
|
||||
left join system_roles_depts srd on role.role_id = srd.role_id
|
||||
left join system_dept dept on dept.dept_id = srd.dept_id
|
||||
left join system_users_roles ur on role.role_id = ur.role_id
|
||||
WHERE role.role_id = ur.role_id
|
||||
AND ur.user_id = #{userId}
|
||||
AND ur.user_id = #{userId}
|
||||
</select>
|
||||
<select id="countRoleByDeptIds" resultType="int">
|
||||
select count(*)
|
||||
@@ -108,11 +108,11 @@
|
||||
#{deptId}
|
||||
</foreach>
|
||||
</select>
|
||||
<select id="selectRoleByMenuId" resultType="cn.odboy.system.dal.dataobject.SystemRoleTb">
|
||||
<select id="selectRoleByMenuId" resultType="cn.odboy.system.dal.model.SystemRoleVo">
|
||||
SELECT role.role_id as id
|
||||
FROM system_role role,
|
||||
system_roles_menus rm
|
||||
system_roles_menus rm
|
||||
WHERE role.role_id = rm.role_id
|
||||
AND rm.menu_id = #{menuId}
|
||||
AND rm.menu_id = #{menuId}
|
||||
</select>
|
||||
</mapper>
|
||||
+36
-36
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="cn.odboy.system.dal.mysql.SystemUserMapper">
|
||||
<resultMap id="BaseResultMap" type="cn.odboy.system.dal.dataobject.SystemUserTb">
|
||||
<resultMap id="BaseResultMap" type="cn.odboy.system.dal.model.SystemUserVo">
|
||||
<id column="user_user_id" property="id"/>
|
||||
<result column="user_dept_id" property="deptId"/>
|
||||
<result column="user_username" property="username"/>
|
||||
@@ -27,7 +27,7 @@
|
||||
<id column="job_id" property="id"/>
|
||||
<result column="job_name" property="name"/>
|
||||
</collection>
|
||||
<collection property="roles" ofType="cn.odboy.system.dal.dataobject.SystemRoleTb">
|
||||
<collection property="roles" ofType="cn.odboy.system.dal.model.SystemRoleVo">
|
||||
<id column="role_id" property="id"/>
|
||||
<result column="role_name" property="name"/>
|
||||
<result column="role_level" property="level"/>
|
||||
@@ -91,56 +91,56 @@
|
||||
order by u.user_id desc
|
||||
</select>
|
||||
<select id="getUserByUsername" resultMap="BaseResultMap">
|
||||
select u.password user_password,
|
||||
u.is_admin user_is_admin,
|
||||
u.user_id as user_user_id,
|
||||
u.dept_id as user_dept_id,
|
||||
u.username as user_username,
|
||||
u.nick_name as user_nick_name,
|
||||
u.email as user_email,
|
||||
u.phone as user_phone,
|
||||
u.gender as user_gender,
|
||||
u.avatar_name as user_avatar_name,
|
||||
u.avatar_path as user_avatar_path,
|
||||
u.enabled as user_enabled,
|
||||
u.pwd_reset_time as user_pwd_reset_time,
|
||||
u.create_by as user_create_by,
|
||||
u.update_by as user_update_by,
|
||||
u.create_time as user_create_time,
|
||||
u.update_time as user_update_time,
|
||||
d.dept_id as dept_id,
|
||||
d.name as dept_name
|
||||
select u.password user_password,
|
||||
u.is_admin user_is_admin,
|
||||
u.user_id as user_user_id,
|
||||
u.dept_id as user_dept_id,
|
||||
u.username as user_username,
|
||||
u.nick_name as user_nick_name,
|
||||
u.email as user_email,
|
||||
u.phone as user_phone,
|
||||
u.gender as user_gender,
|
||||
u.avatar_name as user_avatar_name,
|
||||
u.avatar_path as user_avatar_path,
|
||||
u.enabled as user_enabled,
|
||||
u.pwd_reset_time as user_pwd_reset_time,
|
||||
u.create_by as user_create_by,
|
||||
u.update_by as user_update_by,
|
||||
u.create_time as user_create_time,
|
||||
u.update_time as user_update_time,
|
||||
d.dept_id as dept_id,
|
||||
d.name as dept_name
|
||||
from system_user u
|
||||
left join system_dept d on u.dept_id = d.dept_id
|
||||
left join system_dept d on u.dept_id = d.dept_id
|
||||
where u.username = #{username}
|
||||
and u.enabled = 1
|
||||
and u.enabled = 1
|
||||
</select>
|
||||
<select id="selectUserByRoleId" resultType="cn.odboy.system.dal.dataobject.SystemUserTb">
|
||||
<select id="selectUserByRoleId" resultType="cn.odboy.system.dal.model.SystemUserVo">
|
||||
SELECT u.user_id as id, u.username
|
||||
FROM system_user u,
|
||||
system_users_roles r
|
||||
system_users_roles r
|
||||
WHERE u.user_id = r.user_id
|
||||
AND r.role_id = #{roleId}
|
||||
AND r.role_id = #{roleId}
|
||||
group by u.user_id
|
||||
</select>
|
||||
<select id="selectUserByDeptId" resultType="cn.odboy.system.dal.dataobject.SystemUserTb">
|
||||
<select id="selectUserByDeptId" resultType="cn.odboy.system.dal.model.SystemUserVo">
|
||||
SELECT u.*
|
||||
FROM system_user u,
|
||||
system_users_roles r,
|
||||
system_roles_depts d
|
||||
system_users_roles r,
|
||||
system_roles_depts d
|
||||
WHERE u.user_id = r.user_id
|
||||
AND r.role_id = d.role_id
|
||||
AND d.dept_id = #{deptId}
|
||||
AND r.role_id = d.role_id
|
||||
AND d.dept_id = #{deptId}
|
||||
group by u.user_id
|
||||
</select>
|
||||
<select id="selectUserByMenuId" resultType="cn.odboy.system.dal.dataobject.SystemUserTb">
|
||||
<select id="selectUserByMenuId" resultType="cn.odboy.system.dal.model.SystemUserVo">
|
||||
SELECT u.user_id as id, u.username
|
||||
FROM system_user u,
|
||||
system_users_roles ur,
|
||||
system_roles_menus rm
|
||||
system_users_roles ur,
|
||||
system_roles_menus rm
|
||||
WHERE u.user_id = ur.user_id
|
||||
AND ur.role_id = rm.role_id
|
||||
AND rm.menu_id = #{menuId}
|
||||
AND ur.role_id = rm.role_id
|
||||
AND rm.menu_id = #{menuId}
|
||||
group by u.user_id
|
||||
</select>
|
||||
<select id="countUserByJobIds" resultType="Long">
|
||||
|
||||
+18
-18
@@ -1,12 +1,12 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
<style>
|
||||
@page {
|
||||
margin: 0;
|
||||
}
|
||||
</style>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
<style>
|
||||
@page {
|
||||
margin: 0;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body style="margin: 0px;
|
||||
padding: 0px;
|
||||
@@ -18,10 +18,10 @@
|
||||
margin: 0 auto;
|
||||
margin-top: 20px;
|
||||
border: 1px solid #eee;">
|
||||
<div style="padding: 10px;padding-bottom: 0px;">
|
||||
<p style="margin-bottom: 10px;padding-bottom: 0px;">尊敬的用户, 您好：</p>
|
||||
<p style="text-indent: 2em; margin-bottom: 10px;">您正在申请邮箱验证，您的验证码为：</p>
|
||||
<p style="text-align: center;
|
||||
<div style="padding: 10px;padding-bottom: 0px;">
|
||||
<p style="margin-bottom: 10px;padding-bottom: 0px;">尊敬的用户, 您好：</p>
|
||||
<p style="text-indent: 2em; margin-bottom: 10px;">您正在申请邮箱验证，您的验证码为：</p>
|
||||
<p style="text-align: center;
|
||||
font-family: Times New Roman;
|
||||
font-size: 22px;
|
||||
color: #C60024;
|
||||
@@ -29,22 +29,22 @@
|
||||
margin-bottom: 10px;
|
||||
font-weight: bold;
|
||||
background: #ebebeb;">${code}</p>
|
||||
<div class="foot-hr hr" style="margin: 0 auto;
|
||||
<div class="foot-hr hr" style="margin: 0 auto;
|
||||
z-index: 111;
|
||||
width: 800px;
|
||||
margin-top: 30px;
|
||||
border-top: 1px solid #DA251D;">
|
||||
</div>
|
||||
<div style="text-align: center;
|
||||
</div>
|
||||
<div style="text-align: center;
|
||||
font-size: 12px;
|
||||
padding: 20px 0px;
|
||||
font-family: Microsoft YaHei;">
|
||||
Copyright ©${.now?string("yyyy")} <a hover="color: #DA251D;" style="color: #999;"
|
||||
href="https://github.com/odboy-tianjun/cutejava" target="_blank">CuteJava</a>
|
||||
后台管理系统 All Rights Reserved.
|
||||
</div>
|
||||
|
||||
Copyright ©${.now?string("yyyy")} <a hover="color: #DA251D;" style="color: #999;"
|
||||
href="https://github.com/odboy-tianjun/cutejava" target="_blank">CuteJava</a>
|
||||
后台管理系统 All Rights Reserved.
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
+38
-38
@@ -1,12 +1,12 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
<style>
|
||||
@page {
|
||||
margin: 0;
|
||||
}
|
||||
</style>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
<style>
|
||||
@page {
|
||||
margin: 0;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body style="margin: 0px;
|
||||
padding: 0px;
|
||||
@@ -17,30 +17,30 @@
|
||||
margin-top: 20px;
|
||||
padding: 20px;
|
||||
border: 1px solid #eee;">
|
||||
<div>
|
||||
<p style="margin-bottom: 10px;">任务信息：</p>
|
||||
<table style="border-collapse: collapse;">
|
||||
<tr>
|
||||
<th style="padding: .65em;background: #666;border: 1px solid #777;color: #fff;">任务名称</th>
|
||||
<th style="padding: .65em;background: #666;border: 1px solid #777;color: #fff;">Bean名称</th>
|
||||
<th style="padding: .65em;background: #666;border: 1px solid #777;color: #fff;">执行方法</th>
|
||||
<th style="padding: .65em;background: #666;border: 1px solid #777;color: #fff;">参数内容</th>
|
||||
<th style="padding: .65em;background: #666;border: 1px solid #777;color: #fff;">Cron表达式</th>
|
||||
<th style="padding: .65em;background: #666;border: 1px solid #777;color: #fff;">描述内容</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="padding: .65em;border: 1px solid#777;">${task.jobName}</td>
|
||||
<td style="padding: .65em;border: 1px solid#777;">${task.beanName}</td>
|
||||
<td style="padding: .65em;border: 1px solid#777;">${task.methodName}</td>
|
||||
<td style="padding: .65em;border: 1px solid#777;">${(task.params)!""}</td>
|
||||
<td style="padding: .65em;border: 1px solid#777;">${task.cronExpression}</td>
|
||||
<td style="padding: .65em;border: 1px solid#777;">${(task.description)!""}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div>
|
||||
<p style="margin-bottom: 10px;">异常信息：</p>
|
||||
<pre style="position: relative;
|
||||
<div>
|
||||
<p style="margin-bottom: 10px;">任务信息：</p>
|
||||
<table style="border-collapse: collapse;">
|
||||
<tr>
|
||||
<th style="padding: .65em;background: #666;border: 1px solid #777;color: #fff;">任务名称</th>
|
||||
<th style="padding: .65em;background: #666;border: 1px solid #777;color: #fff;">Bean名称</th>
|
||||
<th style="padding: .65em;background: #666;border: 1px solid #777;color: #fff;">执行方法</th>
|
||||
<th style="padding: .65em;background: #666;border: 1px solid #777;color: #fff;">参数内容</th>
|
||||
<th style="padding: .65em;background: #666;border: 1px solid #777;color: #fff;">Cron表达式</th>
|
||||
<th style="padding: .65em;background: #666;border: 1px solid #777;color: #fff;">描述内容</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="padding: .65em;border: 1px solid#777;">${task.jobName}</td>
|
||||
<td style="padding: .65em;border: 1px solid#777;">${task.beanName}</td>
|
||||
<td style="padding: .65em;border: 1px solid#777;">${task.methodName}</td>
|
||||
<td style="padding: .65em;border: 1px solid#777;">${(task.params)!""}</td>
|
||||
<td style="padding: .65em;border: 1px solid#777;">${task.cronExpression}</td>
|
||||
<td style="padding: .65em;border: 1px solid#777;">${(task.description)!""}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div>
|
||||
<p style="margin-bottom: 10px;">异常信息：</p>
|
||||
<pre style="position: relative;
|
||||
padding: 15px;
|
||||
line-height: 20px;
|
||||
border-left: 5px solid #ddd;
|
||||
@@ -49,21 +49,21 @@
|
||||
font-size: 12px">
|
||||
${msg}
|
||||
</pre>
|
||||
</div>
|
||||
<div class="foot-hr hr" style="margin: 0 auto;
|
||||
</div>
|
||||
<div class="foot-hr hr" style="margin: 0 auto;
|
||||
z-index: 111;
|
||||
width: 800px;
|
||||
margin-top: 30px;
|
||||
border-top: 1px solid #DA251D;">
|
||||
</div>
|
||||
<div style="text-align: center;
|
||||
</div>
|
||||
<div style="text-align: center;
|
||||
font-size: 12px;
|
||||
padding: 20px 0px;
|
||||
font-family: Microsoft YaHei;">
|
||||
Copyright ©${.now?string("yyyy")} <a hover="color: #DA251D;" style="color: #999;"
|
||||
href="https://github.com/odboy-tianjun/cutejava" target="_blank">CuteJava</a>
|
||||
后台管理系统 All Rights Reserved.
|
||||
</div>
|
||||
Copyright ©${.now?string("yyyy")} <a hover="color: #DA251D;" style="color: #999;"
|
||||
href="https://github.com/odboy-tianjun/cutejava" target="_blank">CuteJava</a>
|
||||
后台管理系统 All Rights Reserved.
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
|
||||
Reference in New Issue
Block a user