From eafd2b1442062a5f320ced17bbdfbae8ea19c6ea Mon Sep 17 00:00:00 2001
From: zwzw1219 <zwzw1219@192.168.1.111>
Date: Sat, 14 Oct 2017 14:12:56 +0800
Subject: [PATCH] 1

---
 .../java/com/boot/security/server/dao/UserDao.java   | 12 ++++++------
 .../java/com/boot/security/server/dto/UserDto.java   |  4 ++--
 .../server/model/{User.java => SysUser.java}         |  2 +-
 src/main/resources/mybatis-mappers/RoleMapper.xml    |  2 +-
 src/main/resources/mybatis-mappers/UserMapper.xml    |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename src/main/java/com/boot/security/server/model/{User.java => SysUser.java} (89%)

diff --git a/src/main/java/com/boot/security/server/dao/UserDao.java b/src/main/java/com/boot/security/server/dao/UserDao.java
index 4412251..83b2a04 100644
--- a/src/main/java/com/boot/security/server/dao/UserDao.java
+++ b/src/main/java/com/boot/security/server/dao/UserDao.java
@@ -11,27 +11,27 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
-import com.boot.security.server.model.User;
+import com.boot.security.server.model.SysUser;
 
 @Mapper
 public interface UserDao {
 
 	@Options(useGeneratedKeys = true, keyProperty = "id")
 	@Insert("insert into sys_user(username, password, salt, nickname, headImgUrl, phone, telephone, email, birthday, sex, status, intro, createTime, updateTime) values(#{username}, #{password}, #{salt}, #{nickname}, #{headImgUrl}, #{phone}, #{telephone}, #{email}, #{birthday}, #{sex}, #{status}, #{intro}, now(), now())")
-	int save(User user);
+	int save(SysUser user);
 
 	@Select("select * from sys_user t where t.id = #{id}")
-	User getById(Long id);
+	SysUser getById(Long id);
 
 	@Select("select * from sys_user t where t.username = #{username}")
-	User getUser(String username);
+	SysUser getUser(String username);
 
 	@Update("update sys_user t set t.password = #{password} where t.id = #{id}")
 	int changePassword(@Param("id") Long id, @Param("password") String password);
 
 	Integer count(@Param("params") Map<String, Object> params);
 
-	List<User> list(@Param("params") Map<String, Object> params, @Param("offset") Integer offset,
+	List<SysUser> list(@Param("params") Map<String, Object> params, @Param("offset") Integer offset,
 			@Param("limit") Integer limit);
 
 	@Delete("delete from sys_role_user where userId = #{userId}")
@@ -39,5 +39,5 @@ public interface UserDao {
 
 	int saveUserRoles(@Param("userId") Long userId, @Param("roleIds") List<Long> roleIds);
 
-	int update(User user);
+	int update(SysUser user);
 }
diff --git a/src/main/java/com/boot/security/server/dto/UserDto.java b/src/main/java/com/boot/security/server/dto/UserDto.java
index 685c6e3..a1a5ca2 100644
--- a/src/main/java/com/boot/security/server/dto/UserDto.java
+++ b/src/main/java/com/boot/security/server/dto/UserDto.java
@@ -2,14 +2,14 @@ package com.boot.security.server.dto;
 
 import java.util.List;
 
-import com.boot.security.server.model.User;
+import com.boot.security.server.model.SysUser;
 
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class UserDto extends User {
+public class UserDto extends SysUser {
 
 	private static final long serialVersionUID = -184009306207076712L;
 
diff --git a/src/main/java/com/boot/security/server/model/User.java b/src/main/java/com/boot/security/server/model/SysUser.java
similarity index 89%
rename from src/main/java/com/boot/security/server/model/User.java
rename to src/main/java/com/boot/security/server/model/SysUser.java
index b10155c..1323b98 100644
--- a/src/main/java/com/boot/security/server/model/User.java
+++ b/src/main/java/com/boot/security/server/model/SysUser.java
@@ -10,7 +10,7 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class User extends BaseEntity<Long> {
+public class SysUser extends BaseEntity<Long> {
 
 	private static final long serialVersionUID = -6525908145032868837L;
 
diff --git a/src/main/resources/mybatis-mappers/RoleMapper.xml b/src/main/resources/mybatis-mappers/RoleMapper.xml
index cb8bd0b..ed130fa 100644
--- a/src/main/resources/mybatis-mappers/RoleMapper.xml
+++ b/src/main/resources/mybatis-mappers/RoleMapper.xml
@@ -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="com.zw.admin.server.dao.RoleDao">
+<mapper namespace="com.boot.security.server.dao.RoleDao">
 
 	<sql id="where">
 		<where>
diff --git a/src/main/resources/mybatis-mappers/UserMapper.xml b/src/main/resources/mybatis-mappers/UserMapper.xml
index da1d50e..8d07fd3 100644
--- a/src/main/resources/mybatis-mappers/UserMapper.xml
+++ b/src/main/resources/mybatis-mappers/UserMapper.xml
@@ -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="com.zw.admin.server.dao.UserDao">
+<mapper namespace="com.boot.security.server.dao.UserDao">
 
 	<sql id="where">
 		<where>
@@ -22,7 +22,7 @@
 		<include refid="where" />
 	</select>
 
-	<select id="list" resultType="User">
+	<select id="list" resultType="SysUser">
 		select * from sys_user t
 		<include refid="where" />
 		${params.orderBy}