|
@@ -265,7 +265,6 @@ public class UserService {
|
|
}else{
|
|
}else{
|
|
String token = AccessCtrlUtil.buildToken();
|
|
String token = AccessCtrlUtil.buildToken();
|
|
initUserLogin(user);
|
|
initUserLogin(user);
|
|
- createUserOpsLog(user,"登录");
|
|
|
|
createAccessUser(token,user,null);
|
|
createAccessUser(token,user,null);
|
|
createUserLogin(token,user);
|
|
createUserLogin(token,user);
|
|
return getUserInfo(user,token);
|
|
return getUserInfo(user,token);
|
|
@@ -385,10 +384,6 @@ public class UserService {
|
|
public void logout(AccessUser accessUser) {
|
|
public void logout(AccessUser accessUser) {
|
|
accessUserOps.delete(accessUser.getToken());
|
|
accessUserOps.delete(accessUser.getToken());
|
|
userLoginRepo.deleteByUserId(accessUser.getUserId());
|
|
userLoginRepo.deleteByUserId(accessUser.getUserId());
|
|
- User user = new User();
|
|
|
|
- user.setId(accessUser.getUserId());
|
|
|
|
- user.setName(accessUser.getName());
|
|
|
|
- createUserOpsLog(user,"退出");
|
|
|
|
}
|
|
}
|
|
|
|
|
|
public List<User> getMarker(Long rootOrgId) {
|
|
public List<User> getMarker(Long rootOrgId) {
|