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

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java

@@ -1,39 +1,21 @@
 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.aliyuncs.exceptions.ClientException;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.jero.modules.system.service.*;
+import com.jero.common.api.vo.Result;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.model.SysLoginModel;
+import com.jero.modules.system.service.ILoginService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-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.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.security.KeyPair;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Author scott
@@ -52,7 +34,7 @@ public class LoginController {
 	public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel){
 		return loginService.login(sysLoginModel);
 	}
-	
+
 	/**
 	 * 退出登录
 	 * @param request
@@ -63,7 +45,7 @@ public class LoginController {
 	public Result<Object> logout(HttpServletRequest request,HttpServletResponse response) {
 		return loginService.logout(request,response);
 	}
-	
+
 	/**
 	 * 获取访问量
 	 * @return
@@ -72,7 +54,7 @@ public class LoginController {
 	public Result<JSONObject> loginfo() {
 		return loginService.loginfo();
 	}
-	
+
 	/**
 	 * 获取访问量
 	 * @return
@@ -94,7 +76,7 @@ public class LoginController {
 
 	/**
 	 * 短信登录接口
-	 * 
+	 *
 	 * @param jsonObject
 	 * @return
 	 */
@@ -102,10 +84,10 @@ public class LoginController {
 	public Result<String> sms(@RequestBody JSONObject jsonObject) {
 		return loginService.sms(jsonObject);
 	}
-	
+
 	/**
 	 * 手机号登录接口
-	 * 
+	 *
 	 * @param jsonObject
 	 * @return
 	 */
@@ -135,7 +117,7 @@ public class LoginController {
 	public Result<String> randomImage(HttpServletResponse response,@PathVariable String key){
 		return loginService.randomImage(response,key);
 	}
-	
+
 	/**
 	 * app登录
 	 * @param sysLoginModel
@@ -153,7 +135,7 @@ public class LoginController {
 	 * @return
 	 */
 	@RequestMapping(value = "/checkCaptcha", method = RequestMethod.POST)
-	public Result<?> checkCaptcha(@RequestBody SysLoginModel sysLoginModel){
+	public Result<T> checkCaptcha(@RequestBody SysLoginModel sysLoginModel){
 		return loginService.checkCaptcha(sysLoginModel);
 	}
 
@@ -169,4 +151,4 @@ public class LoginController {
 	public Result<String> getRSAPublicKey(){
 		return loginService.getRSAPublicKey();
 	}
-}
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ILoginService.java

@@ -1,15 +1,11 @@
 package com.jero.modules.system.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
 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.model.SysLoginModel;
-import com.jero.modules.system.model.TreeSelectModel;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -99,7 +95,7 @@ public interface ILoginService{
 	 * @param sysLoginModel
 	 * @return
 	 */
-	public Result<?> checkCaptcha(@RequestBody SysLoginModel sysLoginModel);
+	public Result<T> checkCaptcha(@RequestBody SysLoginModel sysLoginModel);
 
 	/**
 	 * 返回一个RSA公钥

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java

@@ -24,6 +24,7 @@ import com.jero.modules.system.model.TreeSelectModel;
 import com.jero.modules.system.service.*;
 import com.jero.modules.system.util.RandImageUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
 import org.jeecgframework.poi.excel.imports.base.ImportFileServiceI;
 import org.springframework.beans.BeanUtils;
@@ -421,7 +422,7 @@ public class LoginServiceImpl implements ILoginService {
     }
 
     @Override
-    public Result<?> checkCaptcha(SysLoginModel sysLoginModel) {
+    public Result<T> checkCaptcha(SysLoginModel sysLoginModel) {
         String captcha = sysLoginModel.getCaptcha();
         String checkKey = sysLoginModel.getCheckKey();
         if(captcha==null){