gyc
/
ruoyi-clode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: gyc:dev
Branches Tags
gyc:dev
gyc:master
..
compare: gyc:master
Branches Tags
gyc:dev
gyc:master

No commits in common. "dev" and "master" have entirely different histories.
dev ... master

7 changed files with 7 additions and 60 deletions
Show Stats Expand all files Collapse all files

50
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java
View File

@ -1,6 +1,5 @@
package com.muyu.system.controller;
import com.muyu.common.core.constant.CacheConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.utils.poi.ExcelUtil;
@ -8,16 +7,13 @@ import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.log.annotation.Log;
import com.muyu.common.log.enums.BusinessType;
import com.muyu.common.redis.service.RedisService;
import com.muyu.common.security.annotation.InnerAuth;
import com.muyu.common.security.annotation.RequiresPermissions;
import com.muyu.common.security.service.TokenService;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.domain.SysDept;
import com.muyu.common.system.domain.SysRole;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.domain.LoginUser;
import com.muyu.system.domain.SysUserOnline;
import com.muyu.system.domain.resp.AuthRoleResp;
import com.muyu.system.domain.resp.UserDetailInfoResp;
import com.muyu.system.domain.resp.UserInfoResp;
@ -30,7 +26,8 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
@ -41,8 +38,6 @@ import java.util.stream.Collectors;
@RestController
@RequestMapping("/user")
public class SysUserController extends BaseController {
@Autowired
private SysUserOnlineService userOnlineService;
@Autowired
private SysUserService userService;
@ -60,8 +55,7 @@ public class SysUserController extends BaseController {
@Autowired
private SysConfigService configService;
@Autowired
private RedisService redisService;
/**
* 获取用户列表
*/
@ -105,24 +99,10 @@ public class SysUserController extends BaseController {
@InnerAuth
@GetMapping("/info/{username}")
public Result<LoginUser> info (@PathVariable("username") String username) {
String regular = "^" +
"(([^<>()\\[\\]\\\\.,;:\\s@\"]+(\\.[^<>()\\[\\]\\\\.,;:\\s@\"]+)*)|(\".+\"))@" +
"((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\])|" +
"(([a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}))" +
"$";
SysUser sysUser=null;
if (username.matches(regular)) {
sysUser = userService.selectUserByEmail(username);
if (StringUtils.isNull(sysUser)) {
return Result.error("邮箱或密码错误");
}
}else {
sysUser = userService.selectUserByUserName(username);
if (StringUtils.isNull(sysUser)) {
return Result.error("用户名或密码错误");
}
SysUser sysUser = userService.selectUserByUserName(username);
if (StringUtils.isNull(sysUser)) {
return Result.error("用户名或密码错误");
}
// 角色集合
Set<String> roles = permissionService.getRolePermission(sysUser);
// 权限集合
@ -254,23 +234,7 @@ public class SysUserController extends BaseController {
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd")
public Result resetPwd (@RequestBody SysUser user) {
//获取缓存列表
Collection<String> keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
//循环获得的缓存列表
for (String key : keys) {
//获取用户的信息
LoginUser userRedis = redisService.getCacheObject(key);
//根据用户id判断是否修改了密码
if (user.getUserId()!=null && user.getUserId()!=0L) {
if (user.getUserId()==userRedis.getUserid()){
//修改了就删除
redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + userRedis.getToken());
}
}
}
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setUpdateBy(SecurityUtils.getUsername());

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java
View File

@ -139,6 +139,4 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* @return 结果
*/
public SysUser checkEmailUnique (String email);
SysUser selectUserByEmail(String username);
}

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java
View File

@ -30,8 +30,6 @@ public interface SysUserOnlineService {
*/
public SysUserOnline selectOnlineByUserName (String userName, LoginUser user);
/**
* 通过登录地址/用户名称查询信息
*

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java
View File

@ -225,6 +225,4 @@ public interface SysUserService extends IService<SysUser> {
* @return 结果
*/
public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName);
SysUser selectUserByEmail(String username);
}

1
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java
View File

@ -46,7 +46,6 @@ public class SysUserOnlineServiceImpl implements SysUserOnlineService {
return null;
}
/**
* 通过登录地址/用户名称查询信息
*

6
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
View File

@ -500,10 +500,4 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
return successMsg.toString();
}
@Override
public SysUser selectUserByEmail(String username) {
return userMapper.selectUserByEmail(username);
}
}

4
muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -183,10 +183,6 @@
and del_flag = '0'
limit 1
</select>
<select id="selectUserByEmail" resultType="com.muyu.common.system.domain.SysUser">
<include refid="selectUserVo"/>
where u.email = #{username} and u.del_flag = '0'
</select>
<insert id="insertUser" parameterType="com.muyu.common.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(