root
/
boot-security
mirror of https://gitee.com/zhang_1334717033/boot-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1

master
zwzw1219 2017-10-15 18:57:30 +08:00
parent 201ef04546
commit fa2796a77e
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/boot/security/server/service/impl/SysLogServiceImpl.java
View File

@ -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);

25
src/main/java/com/boot/security/server/service/impl/UserServiceImpl.java
View File

@ -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);
}
}