删除，修改用户更新redis

jinpengyong

2021-03-23 9ec895d7754fdfd4918fab69cc220c0d814c41f7

删除，修改用户更新redis

 pom.xml

@@ -108,7 +108,7 @@
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>com.github.penggle</groupId>
            <groupId>com.google.code.kaptcha</groupId>
            <artifactId>kaptcha</artifactId>
            <version>2.3.2</version>
        </dependency>

 screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java

@@ -13,6 +13,6 @@
    public void addInterceptors(InterceptorRegistry registry) {
        registry.addInterceptor(new AuthenticationInterceptor())
                .addPathPatterns("/**")
                .excludePathPatterns("/**/login/**", "/**/logout/**", "/swagger-ui.html/**", "/swagger-resources/**");
                .excludePathPatterns("/**/login/**", "/**/logout/**", "/swagger-ui.html/**", "/swagger-resources/**","/**/verificationCode/**","/**/user/**");
    }
}

 screen-api/src/main/java/com/moral/api/controller/LoginController.java

@@ -10,21 +10,25 @@
import java.util.Map;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.SysConfig;
import com.moral.api.service.SysConfigService;
import com.moral.api.service.UserService;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.pojo.VerificationCode;
import com.moral.util.KaptchaUtils;
import com.moral.util.TokenUtils;
import com.moral.util.WebUtils;

@Slf4j
@Api(tags = {"登陆"})
@@ -38,13 +42,8 @@
    private SysConfigService sysConfigService;

    @ApiOperation(value = "登陆", notes = "登陆")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "account", value = "账户", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "password", value = "密码", required = true, paramType = "query", dataType = "String")
    })
    @RequestMapping(value = "login", method = RequestMethod.POST)
    public ResultMessage login(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
    public ResultMessage login(@RequestBody Map<String, Object> parameters) {
        if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
@@ -55,20 +54,18 @@
        return ResultMessage.ok(result.get("data"));
    }

    @ApiOperation(value = "注销", notes = "注销")
    @ApiOperation(value = "退出", notes = "退出")
    @RequestMapping(value = "logout", method = RequestMethod.POST)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "uid", value = "账户", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "uid", value = "用户id", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    public ResultMessage logout(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        if (!parameters.containsKey("uid")) {
    public ResultMessage logout(String uid, HttpServletRequest request) {
        if (uid == null) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        String userId = parameters.get("uid").toString();
        String token = request.getHeader("token");
        TokenUtils.destoryToken(userId, token);
        TokenUtils.destoryToken(uid, token);
        return ResultMessage.ok();
    }

@@ -81,9 +78,19 @@
     */

    @ApiOperation(value = "获取验证码是否开启", notes = "获取验证码是否开启")
    @RequestMapping(value = "verificationCodeConfig", method = RequestMethod.GET)
    public ResultMessage verifyConfig() {
        return null;
    @RequestMapping(value = "verificationCode/config", method = RequestMethod.GET)
    public void verifyConfig(HttpServletResponse response) {
        QueryWrapper<SysConfig> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("type", Constants.VERIFICATION_TYPE);
        SysConfig sysConfig = sysConfigService.getOne(queryWrapper);
        String code = sysConfig.getCode();
        if (Constants.VERIFICATION_OPEN_CODE.equals(code)) {
            try {
                response.sendRedirect("/verificationCode/get");
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
    }

    @ApiOperation(value = "获取验证码", notes = "获取验证码")

 screen-api/src/main/java/com/moral/api/controller/UserController.java

@@ -11,6 +11,7 @@
import javax.servlet.http.HttpServletRequest;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -35,16 +36,10 @@

    @ApiOperation(value = "添加账户", notes = "添加账户")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "account", value = "账户,长度6-10", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "password", value = "密码,长度6-20", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "userName", value = "账户名称", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "email", value = "邮箱,格式123456@qq.com", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "mobile", value = "手机号,1开头11为数字", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "wechat", value = "微信", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @RequestMapping(value = "addUser", method = RequestMethod.POST)
    public ResultMessage addUser(User user, HttpServletRequest request) {
    public ResultMessage addUser(@RequestBody User user, HttpServletRequest request) {
        if (user.getAccount().isEmpty() || user.getPassword().isEmpty()) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -59,8 +54,7 @@

    @ApiOperation(value = "删除账户", notes = "删除账户")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
            @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "query", dataType = "String")
    })
    @RequestMapping(value = "deleteUser", method = RequestMethod.POST)
    public ResultMessage deleteUser(String userId) {
@@ -79,17 +73,11 @@

    @ApiOperation(value = "修改账户信息", notes = "修改账户信息")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "account", value = "账户,长度6-10", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "password", value = "密码,长度6-20", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "userName", value = "账户名称", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "email", value = "邮箱,格式123456@qq.com", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "mobile", value = "手机号,1开头11位数字", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "wechat", value = "微信", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @RequestMapping(value = "updateUser", method = RequestMethod.POST)
    public ResultMessage updateUser(User user, HttpServletRequest request) {
        if (user.getAccount().isEmpty() || user.getPassword().isEmpty()) {
    public ResultMessage updateUser(@RequestBody User user, HttpServletRequest request) {
        if (user.getId() == null) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }

 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java

@@ -115,7 +115,7 @@
        userInfo.put("locationLevel", organization.getLocationLevel());
        userInfo.put("groups", groups);
        Map<String, Object> map = new HashMap<>();
        map.put("userId",userBo.getId());
        map.put("userId", userBo.getId());
        userInfo.putAll(getMenus(map));
        try {
            //生成token，并存入redis
@@ -247,12 +247,18 @@
    @Override
    @Transactional
    public void deleteUser(User user) {
        String userId = user.getId().toString();
        //逻辑删除user
        user.setIsDelete(Constants.DELETE);
        userMapper.updateById(user);
        //逻辑删除user_group
        UpdateWrapper<UserGroup> deleteWrapper = new UpdateWrapper<>();
        deleteWrapper.set("is_delete", Constants.DELETE).eq("user_id", user.getId());
        deleteWrapper.set("is_delete", Constants.DELETE).eq("user_id", userId);
        //更新redis
        if (TokenUtils.hHasKey(userId)) {
            String token = TokenUtils.hget(userId).toString();
            TokenUtils.destoryToken(userId, token);
        }
        userGroupMapper.update(null, deleteWrapper);
    }

@@ -265,7 +271,7 @@
        queryWrapper.ne("id", user.getId())
                .eq("account", user.getAccount())
                .eq("is_delete", Constants.NOT_DELETE);
        //校验账户是否存在
        //校验账户名是否重复
        if (userMapper.selectOne(queryWrapper) != null) {
            result.put("code", ResponseCodeEnum.ACCOUNT_EXIST.getCode());
            result.put("msg", ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
@@ -285,12 +291,14 @@
        }
        //正则校验密码
        String password = user.getPassword();
        //密码解密
        //password = AESUtils.decrypt(password, AESKey);
        if (!RegexUtils.checkPassword(password)) {
            result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
            result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
            return result;
        if (password != null) {
            //密码解密
            //password = AESUtils.decrypt(password, AESKey);
            if (!RegexUtils.checkPassword(password)) {
                result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
                result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
                return result;
            }
        }
        //正则校验手机号
        if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) {
@@ -298,16 +306,22 @@
            result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg());
            return result;
        }
        //密码加密
        //密码MD5加密
        user.setPassword(MD5Utils.saltMD5(password));
        user.setOrganizationId((int) currentUserInfo.get("organizationId"));
        user.setIsAdmin(false);
        //新增账户的过期时间
        //所修改账户的过期时间
        Date userExpireTime = user.getExpireTime();
        //当前账户的过期时间
        Date currentUserExpireTime = (Date) currentUserInfo.get("expireTime");
        if (userExpireTime == null || userExpireTime.getTime() > currentUserExpireTime.getTime()) {
            user.setExpireTime(currentUserExpireTime);
        }
        //更新redis
        String userId = user.getId().toString();
        if (TokenUtils.hHasKey(userId)) {
            String deleterToken = TokenUtils.hget(userId).toString();
            TokenUtils.destoryToken(userId, deleterToken);
        }
        userMapper.updateById(user);
        return result;
@@ -341,13 +355,6 @@
        }
        if (wechat != null) {
            queryWrapper.like("wechat", wechat);
        }
        //分页参数
        if (!parameters.containsKey("page")) {
            parameters.put("page", 0);
        }
        if (!parameters.containsKey("size")) {
            parameters.put("size", 10);
        }

        int page = Integer.parseInt(parameters.get("page").toString());

 screen-common/src/main/java/com/moral/util/TokenUtils.java

@@ -34,6 +34,15 @@
    //token有效期 单位：秒
    private static final int validity_time = 60*30;

    //判断user_token里有没有用户的token
    public static boolean hHasKey(String uid){
        return redisTemplate.opsForHash().hasKey("user_token",uid);
    }

    //根据用户id获取token
    public static Object hget(String uid){
        return redisTemplate.opsForHash().get("user_token",uid);
    }
    /**
     * @Description: 生成token,并且将用户信息存入缓存
     * @Param: [uid] type： 后台取值：manage  前台取值：api