From dcb98a36af4ad7823edd61a9c3388bd024db740f Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Mon, 21 Aug 2023 14:33:13 +0800 Subject: [PATCH] chore:测试提交 --- screen-manage/src/main/java/com/moral/api/controller/LoginController.java | 38 +++++++++++++++++++++++++++++++++----- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/controller/LoginController.java b/screen-manage/src/main/java/com/moral/api/controller/LoginController.java index c705879..d72a4c4 100644 --- a/screen-manage/src/main/java/com/moral/api/controller/LoginController.java +++ b/screen-manage/src/main/java/com/moral/api/controller/LoginController.java @@ -1,14 +1,21 @@ package com.moral.api.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.moral.api.entity.SysConfig; import com.moral.api.pojo.dto.login.LoginDTO; -import com.moral.api.pojo.form.LoginForm; -import com.moral.api.pojo.form.LogoutForm; +import com.moral.api.pojo.form.login.LoginForm; +import com.moral.api.pojo.form.login.LogoutForm; +import com.moral.api.pojo.redisBean.AccountInfoDTO; +import com.moral.api.pojo.vo.login.AccountInfoVO; import com.moral.api.pojo.vo.login.LoginVO; import com.moral.api.service.ManageAccountService; +import com.moral.api.service.SysConfigService; +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 io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -27,10 +34,13 @@ **/ @Slf4j @Api(tags = {"������������"}) +@CrossOrigin(origins = "*", maxAge = 3600) @RestController public class LoginController { @Autowired ManageAccountService accountService; + @Autowired + SysConfigService sysConfigService; /** * @Description: ������������ @@ -50,6 +60,20 @@ LoginVO loginVO = LoginVO.convert(loginDTO); return new ResultMessage(loginDTO.getCode(), loginDTO.getMsg(), loginVO); + } + + /** + * @Description: ������������������������ + * @Param: [] + * @return: com.moral.constant.ResultMessage + * @Author: ��������� + * @Date: 2021/6/9 + */ + @GetMapping("getAccountInfo") + public ResultMessage getAccountInfo(){ + AccountInfoDTO dto = (AccountInfoDTO) TokenUtils.getUserInfo(); + AccountInfoVO vo = AccountInfoVO.convert(dto); + return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo); } @@ -80,10 +104,14 @@ * @Author: ��������� * @Date: 2021/3/18 */ - @GetMapping + @GetMapping("verificationCode/config") public ResultMessage verifyConfig(){ - - return null; + QueryWrapper<SysConfig> wrapper = new QueryWrapper<>(); + wrapper.eq(Constants.MANAGE_VERIFICATIONCODE_COLUMN,Constants.MANAGE_VERIFICATIONCODE_VALUE); + SysConfig config = sysConfigService.getOne(wrapper); + if(config.getCode().equals(Constants.VERFICATIONCODE_OPEN)) + return new ResultMessage(ResponseCodeEnum.VERIFICATION_OPEN,null); + return new ResultMessage(ResponseCodeEnum.VERIFICATION_CLOSE,null); } /** -- Gitblit v1.8.0