KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】LoginController.java ILoginService.java LoginServiceImpl.java 文件

Browse Source
This commit is contained in:
tianwenbo
2023-03-03 16:59:33 +08:00
parent 86d1816a3e
commit 1efbc54a7f
3 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
+8 -26
View File
@@ -1,39 +1,21 @@
package com.jero.modules.system.controller; package com.jero.modules.system.controller;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.crypto.asymmetric.RSA;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.exceptions.ClientException; import com.jero.common.api.vo.Result;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.*; import com.jero.modules.system.model.SysLoginModel;
import com.jero.modules.system.service.ILoginService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils; import org.apache.poi.ss.formula.functions.T;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.modules.base.service.BaseCommonService;
import com.jero.common.system.util.JwtUtil;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.*;
import com.jero.common.util.encryption.EncryptedString;
import com.jero.modules.system.entity.SysDepart;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.model.SysLoginModel;
import com.jero.modules.system.util.RandImageUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.security.KeyPair; import java.util.List;
import java.security.PrivateKey; import java.util.Map;
import java.security.PublicKey;
import java.util.*;
/** /**
* @Author scott * @Author scott
@@ -153,7 +135,7 @@ public class LoginController {
* @return * @return
*/ */
@RequestMapping(value = "/checkCaptcha", method = RequestMethod.POST) @RequestMapping(value = "/checkCaptcha", method = RequestMethod.POST)
public Result<?> checkCaptcha(@RequestBody SysLoginModel sysLoginModel){ public Result<T> checkCaptcha(@RequestBody SysLoginModel sysLoginModel){
return loginService.checkCaptcha(sysLoginModel); return loginService.checkCaptcha(sysLoginModel);
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ILoginService.java
+3 -7
View File
@@ -1,15 +1,11 @@
package com.jero.modules.system.service; package com.jero.modules.system.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.model.SysLoginModel; import com.jero.modules.system.model.SysLoginModel;
import com.jero.modules.system.model.TreeSelectModel; import org.apache.poi.ss.formula.functions.T;
import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -99,7 +95,7 @@ public interface ILoginService{
* @param sysLoginModel * @param sysLoginModel
* @return * @return
*/ */
public Result<?> checkCaptcha(@RequestBody SysLoginModel sysLoginModel); public Result<T> checkCaptcha(@RequestBody SysLoginModel sysLoginModel);
/** /**
* 返回一个RSA公钥 * 返回一个RSA公钥
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
+2 -1
View File
@@ -24,6 +24,7 @@ import com.jero.modules.system.model.TreeSelectModel;
import com.jero.modules.system.service.*; import com.jero.modules.system.service.*;
import com.jero.modules.system.util.RandImageUtil; import com.jero.modules.system.util.RandImageUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.jeecgframework.poi.excel.imports.base.ImportFileServiceI; import org.jeecgframework.poi.excel.imports.base.ImportFileServiceI;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@@ -421,7 +422,7 @@ public class LoginServiceImpl implements ILoginService {
} }
@Override @Override
public Result<?> checkCaptcha(SysLoginModel sysLoginModel) { public Result<T> checkCaptcha(SysLoginModel sysLoginModel) {
String captcha = sysLoginModel.getCaptcha(); String captcha = sysLoginModel.getCaptcha();
String checkKey = sysLoginModel.getCheckKey(); String checkKey = sysLoginModel.getCheckKey();
if(captcha==null){ if(captcha==null){