Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-09-05 ba9c4bca1bdf36f827ab258222d92c885ff890db

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

@@ -14,15 +14,11 @@

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 org.springframework.web.bind.annotation.*;

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.UserLogService;
import com.moral.api.service.UserService;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
@@ -34,6 +30,7 @@
@Slf4j
@Api(tags = {"登陆"})
@RestController
@CrossOrigin(origins = "*", maxAge = 3600)
public class LoginController {

    @Autowired
@@ -42,7 +39,7 @@
    @Autowired
    private SysConfigService sysConfigService;

    @ApiOperation(value = "登陆", notes = "登陆")
    @ApiOperation(value = "登陆信息", notes = "登陆信息")
    @RequestMapping(value = "login", method = RequestMethod.POST)
    public ResultMessage login(@RequestBody Map<String, Object> parameters) {
        if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
@@ -50,25 +47,34 @@
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Map<String, Object> result = userService.login(parameters);
        if (!result.containsKey("data")) {
        if (!result.containsKey("token")) {
            return ResultMessage.fail((int) result.get("code"), (String) result.get("msg"));
        }
        Map<String, Object> data = (Map<String, Object>) result.get("data");
        return ResultMessage.ok(data);
        return ResultMessage.ok(result);
    }

    @ApiOperation(value = "退出", notes = "退出")
    @RequestMapping(value = "logout", method = RequestMethod.POST)
    @ApiOperation(value = "获取用户信息", notes = "获取用户信息")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    public ResultMessage logout(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
        if (!parameters.containsKey("uid")) {
    @RequestMapping(value = "getUserInfo", method = RequestMethod.POST)
    public ResultMessage getUserInfo() {
        Map<String, Object> result = userService.getCurrentUserInfo();
        return ResultMessage.ok(result);
    }

    @ApiOperation(value = "退出", notes = "退出")
    @RequestMapping(value = "logout", method = RequestMethod.GET)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    public ResultMessage logout(Integer userId, HttpServletRequest request) {
        if (userId == null) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        String token = request.getHeader("token");
        TokenUtils.destoryToken(parameters.get("uid").toString(), token);
        TokenUtils.destoryToken(userId.toString(), token);
        return ResultMessage.ok();
    }

@@ -79,9 +85,9 @@
        queryWrapper.eq(Constants.FRONT_VERIFICATIONCODE_COLUMN, Constants.FRONT_ERIFICATIONCODE_VALUE);
        SysConfig sysConfig = sysConfigService.getOne(queryWrapper);
        if (Constants.VERFICATIONCODE_OPEN.equals(sysConfig.getCode())) {
            return new ResultMessage(ResponseCodeEnum.VERIFICATION_OPEN,null);
            return new ResultMessage(ResponseCodeEnum.VERIFICATION_OPEN, null);
        }
        return new ResultMessage(ResponseCodeEnum.VERIFICATION_CLOSE,null);
        return new ResultMessage(ResponseCodeEnum.VERIFICATION_CLOSE, null);
    }

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