Merge remote-tracking branch 'origin/master'

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -104,7 +104,7 @@ public class SysUserController {
     @PostMapping(value = "/login")
     public Result loginMultilevel(HttpServletRequest req, @RequestBody Map<String, String> map) {
         String remoteHost = req.getRemoteHost();
-        Result result = iSysUserService.loginMultilevel(req, map);
+        Result result = iSysUserService.loginMultilevel(req, map,remoteHost);
         AccessToken accessToken = new AccessToken();
         if (result.getCode() == 10000) {
             SysUser user = (SysUser) result.getData();
@@ -134,12 +134,12 @@ public class SysUserController {
             accessToken.setLoginIp(remoteHost);
         }
         if (result.getCode() == 10001) {
-            return iSysUserService.loginMultilevel(req, map);
+            return iSysUserService.loginMultilevel(req, map,remoteHost);
         }
         return new Result(ResultCode.SUCCESS, accessToken);
     }
 
-    //TODO
+    //
     @PostMapping(value = "/loginClient")
     public Result loginClient(HttpServletRequest req, @RequestBody Map<String, String> map) {
 
@@ -154,7 +154,7 @@ public class SysUserController {
             if (StringUtils.isEmpty(phone)){
                 return new Result(10001, "请输入手机号",false);
             }
-            Result result = iSysUserService.loginMultilevel(req, map);
+            Result result = iSysUserService.loginMultilevel(req, map,remoteHost);
             if ( result.getCode() == 10000) {
                SysUser sysUser = (SysUser) result.getData();
                 if (sysUser.getUserType() != 0 && sysUser.getUserType() != 4){
@@ -165,7 +165,7 @@ public class SysUserController {
         }
         if ("2".equals(loginType)){
             // 未对密码加密
-            Result result = iSysUserService.loginMultilevelClient(accountName, password);
+            Result result = iSysUserService.loginMultilevelClient(accountName, password,remoteHost);
             if(result.getCode() == 10000){
 
                 SysUser accountEntity = (SysUser) result.getData();

admin/src/main/java/com/huimv/farm/damsubsidy/service/ISysUserService.java

@@ -18,7 +18,7 @@ import java.util.Map;
  * @since 2023-04-26
  */
 public interface ISysUserService extends IService<SysUser> {
-    Result loginMultilevel(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+    Result loginMultilevel(HttpServletRequest httpServletRequest,Map<String,String> paramsMap,String remoteHost);
 
     Result loginOne();
 
@@ -50,7 +50,7 @@ public interface ISysUserService extends IService<SysUser> {
 
     Result getLastFarmId(Integer userId);
 
-    Result loginMultilevelClient(String accountName, String password);
+    Result loginMultilevelClient(String accountName, String password, String remoteHost);
 
     Result addXiang(SysUser sysUser, Long userId);
 

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -56,7 +56,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private AccountGroupMapper accountGroupMapper;
 
     @Override
-    public Result loginMultilevel(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+    public Result loginMultilevel(HttpServletRequest httpServletRequest, Map<String, String> paramsMap,String remoteHost) {
         //TODO 验证码接口暂时不写，验证码验证接口写在此接口之前，这里默认验证码已经正确！
         String phone = paramsMap.get("phone");
         String code = paramsMap.get("code");
@@ -86,6 +86,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             return new Result(10004, "用户暂未注册，请注册！", false);
         } else {
             if (sysUser.getAccoutType() == 1) {
+                this.updateById(sysUser.setLastIp(remoteHost));
                 return new Result(ResultCode.SUCCESS, sysUser);
             } else {
                 return new Result(10002, "未审核或者账号异常！", false);
@@ -103,7 +104,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public Result loginMultilevelClient(String accountName, String password) {
+    public Result loginMultilevelClient(String accountName, String password, String remoteHost) {
 
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
         wrapper.eq("account_num", accountName).eq("password", password);
@@ -118,6 +119,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (accoutType != 1) {
             return new Result(10001, "账号未启用",false);
         }
+
+        this.updateById(accountMultilevel.setLastIp(remoteHost));
         return new Result(ResultCode.SUCCESS, accountMultilevel);
     }
 

admin/src/main/java/com/huimv/farm/damsubsidy/test/LoginTest.java

@@ -59,10 +59,10 @@ public class LoginTest {
         //是否存在
         Boolean aBoolean = redisTemplate.hasKey("xumu:" + phone);
         //是否过期
-        Boolean is = redisTemplate.hasKey("xumu:" + phone);
+        Boolean isGuoqi = redisTemplate.hasKey("xumu:" + phone);
 
         System.out.println(aBoolean);
-        System.out.println(is);
+        System.out.println(isGuoqi);
         String s = redisTemplate.opsForValue().get("xumu:" + phone);
         if (!code.equals(s)){
             System.out.println("验证码错误");