From fa2796a77eb369f4496b71680fb7ea674ad52749 Mon Sep 17 00:00:00 2001
From: zwzw1219 <zwzw1219@192.168.1.111>
Date: Sun, 15 Oct 2017 18:57:30 +0800
Subject: [PATCH] 1

---
 .../service/impl/SysLogServiceImpl.java       | 13 +++++-----
 .../server/service/impl/UserServiceImpl.java  | 25 ++++++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/boot/security/server/service/impl/SysLogServiceImpl.java b/src/main/java/com/boot/security/server/service/impl/SysLogServiceImpl.java
index 547f25f..1e8fc7a 100644
--- a/src/main/java/com/boot/security/server/service/impl/SysLogServiceImpl.java
+++ b/src/main/java/com/boot/security/server/service/impl/SysLogServiceImpl.java
@@ -8,11 +8,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import com.zw.admin.server.dao.SysLogsDao;
-import com.zw.admin.server.model.SysLogs;
-import com.zw.admin.server.model.User;
-import com.zw.admin.server.service.SysLogService;
-import com.zw.admin.server.utils.UserUtil;
+import com.boot.security.server.dao.SysLogsDao;
+import com.boot.security.server.model.SysLogs;
+import com.boot.security.server.model.SysUser;
+import com.boot.security.server.service.SysLogService;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -26,7 +25,7 @@ public class SysLogServiceImpl implements SysLogService {
 	@Async
 	@Override
 	public void save(SysLogs sysLogs) {
-		User user = UserUtil.getCurrentUser();
+		SysUser user = UserUtil.getCurrentUser();
 		if (user == null || user.getId() == null) {
 			return;
 		}
@@ -43,7 +42,7 @@ public class SysLogServiceImpl implements SysLogService {
 		sysLogs.setModule(module);
 		sysLogs.setRemark(remark);
 
-		User user = new User();
+		SysUser user = new SysUser();
 		user.setId(userId);
 		sysLogs.setUser(user);
 
diff --git a/src/main/java/com/boot/security/server/service/impl/UserServiceImpl.java b/src/main/java/com/boot/security/server/service/impl/UserServiceImpl.java
index 391c39c..5092fe4 100644
--- a/src/main/java/com/boot/security/server/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/boot/security/server/service/impl/UserServiceImpl.java
@@ -4,19 +4,14 @@ import java.util.List;
 import java.util.UUID;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.shiro.crypto.hash.SimpleHash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import com.zw.admin.server.constants.UserConstants;
-import com.zw.admin.server.dao.UserDao;
-import com.zw.admin.server.dto.UserDto;
-import com.zw.admin.server.model.User;
-import com.zw.admin.server.model.User.Status;
-import com.zw.admin.server.service.UserService;
-import com.zw.admin.server.utils.UserUtil;
+import com.boot.security.server.dao.UserDao;
+import com.boot.security.server.model.SysUser;
+import com.boot.security.server.service.UserService;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -29,8 +24,8 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	@Transactional
-	public User saveUser(UserDto userDto) {
-		User user = userDto;
+	public SysUser saveUser(UserDto userDto) {
+		SysUser user = userDto;
 		user.setSalt(DigestUtils
 				.md5Hex(UUID.randomUUID().toString() + System.currentTimeMillis() + UUID.randomUUID().toString()));
 		user.setPassword(passwordEncoder(user.getPassword(), user.getSalt()));
@@ -58,13 +53,13 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public User getUser(String username) {
+	public SysUser getUser(String username) {
 		return userDao.getUser(username);
 	}
 
 	@Override
 	public void changePassword(String username, String oldPassword, String newPassword) {
-		User u = userDao.getUser(username);
+		SysUser u = userDao.getUser(username);
 		if (u == null) {
 			throw new IllegalArgumentException("用户不存在");
 		}
@@ -80,7 +75,7 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	@Transactional
-	public User updateUser(UserDto userDto) {
+	public SysUser updateUser(UserDto userDto) {
 		userDao.update(userDto);
 		saveUserRoles(userDto.getId(), userDto.getRoleIds());
 		updateUserSession(userDto.getId());
@@ -89,9 +84,9 @@ public class UserServiceImpl implements UserService {
 	}
 
 	private void updateUserSession(Long id) {
-		User current = UserUtil.getCurrentUser();
+		SysUser current = UserUtil.getCurrentUser();
 		if (current.getId().equals(id)) {
-			User user = userDao.getById(id);
+			SysUser user = userDao.getById(id);
 			UserUtil.setUserSession(user);
 		}
 	}