diff --git a/ridelease-admin/src/main/java/com/ruoyi/web/controller/rl/RlUserController.java b/ridelease-admin/src/main/java/com/ruoyi/web/controller/rl/RlUserController.java index ef89f92..6dc6f40 100644 --- a/ridelease-admin/src/main/java/com/ruoyi/web/controller/rl/RlUserController.java +++ b/ridelease-admin/src/main/java/com/ruoyi/web/controller/rl/RlUserController.java @@ -2,7 +2,6 @@ package com.ruoyi.web.controller.rl; import com.alibaba.fastjson2.JSON; import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.ServiceConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.RlUser; @@ -17,11 +16,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.agent.RlAgentVO; import com.ruoyi.system.domain.userExt.RlUserExt; import com.ruoyi.system.domain.userWithdraw.RlUserWithdraw; -import com.ruoyi.system.domain.vo.RlUserQuery; +import com.ruoyi.system.domain.RlUserQuery; import com.ruoyi.system.service.*; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.support.TransactionTemplate; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ridelease-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ridelease-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 81297b1..6541ce7 100644 --- a/ridelease-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ridelease-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -8,7 +8,6 @@ import org.springframework.http.HttpMethod; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.ProviderManager; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; diff --git a/ridelease-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ridelease-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index 6807522..4a923f7 100644 --- a/ridelease-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ridelease-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -507,6 +507,7 @@ public class SysLoginService } finally { AuthenticationContextHolder.clearContext(); } + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); LoginUser loginUser = (LoginUser) authentication.getPrincipal(); recordAppLoginInfo(loginUser.getUserId()); //修改rl_user最近登录IP和登录时间 // 生成token diff --git a/ridelease-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ridelease-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java index 335ebda..1fe3817 100644 --- a/ridelease-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/ridelease-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java @@ -36,9 +36,6 @@ public class UserDetailsServiceImpl implements UserDetailsService @Autowired private IRlUserService userService; - @Resource - private IRlUserService asUserService; - @Autowired private SysPasswordService passwordService; @@ -64,7 +61,7 @@ public class UserDetailsServiceImpl implements UserDetailsService user = userService.selectUserByUserName(username, appletType); }else if(Constants.USER_TYPE_APP.equals(userType)){ // app用户登录 如果是app用户则用openid查询 - user = asUserService.selectUserByWxopenid(username); + user = userService.selectUserByWxopenid(username); }else{ // app用户登录(短信登录) 如果是app用户则用手机号 user = userService.selectUserByUserName(username, appletType); @@ -73,7 +70,7 @@ public class UserDetailsServiceImpl implements UserDetailsService if(StrUtil.isBlank(user.getPassword())){ String password = authentication.getCredentials().toString(); String newPassword = SecurityUtils.encryptPassword(password); - asUserService.updateUserPwd(user.getUserId(), newPassword); + userService.updateUserPwd(user.getUserId(), newPassword); }else{ passwordService.validate2(user); } diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/vo/RlUserQuery.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/RlUserQuery.java similarity index 94% rename from ridelease-system/src/main/java/com/ruoyi/system/domain/vo/RlUserQuery.java rename to ridelease-system/src/main/java/com/ruoyi/system/domain/RlUserQuery.java index 9e95d44..ef002a8 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/domain/vo/RlUserQuery.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/RlUserQuery.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.ruoyi.system.domain; import com.ruoyi.common.core.domain.entity.RlUser; import lombok.Data; diff --git a/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlUserMapper.java b/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlUserMapper.java index cc73239..676423c 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlUserMapper.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlUserMapper.java @@ -3,7 +3,7 @@ package com.ruoyi.system.mapper; import com.ruoyi.common.core.domain.entity.RlUser; import com.ruoyi.common.core.domain.entity.RlUserVO; import com.ruoyi.common.core.domain.vo.LabelVo; -import com.ruoyi.system.domain.vo.RlUserQuery; +import com.ruoyi.system.domain.RlUserQuery; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/IRlUserService.java b/ridelease-system/src/main/java/com/ruoyi/system/service/IRlUserService.java index ee53089..08bd1fb 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/service/IRlUserService.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/service/IRlUserService.java @@ -5,8 +5,7 @@ import com.ruoyi.common.core.domain.entity.RlUserVO; import com.ruoyi.system.domain.changeBalance.RlChangeBalance; import com.ruoyi.system.domain.changeBalance.RlChangeBalanceQuery; import com.ruoyi.system.domain.query.AuthenticationQuery; -import com.ruoyi.system.domain.vo.RlUserQuery; -import com.ruoyi.system.domain.withdraw.RlWithdraw; +import com.ruoyi.system.domain.RlUserQuery; import com.ruoyi.system.domain.withdraw.RlWithdrawQuery; import java.math.BigDecimal; diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlUserServiceImpl.java b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlUserServiceImpl.java index 2cdace1..0d6202d 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlUserServiceImpl.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlUserServiceImpl.java @@ -1,7 +1,6 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; @@ -9,7 +8,6 @@ import com.aliyuncs.exceptions.ClientException; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.ServiceConstants; import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.ChangeBalanceInterface; import com.ruoyi.common.core.domain.entity.RlUser; import com.ruoyi.common.core.domain.entity.RlUserVO; import com.ruoyi.common.exception.ServiceException; @@ -20,15 +18,12 @@ import com.ruoyi.common.utils.verify.VerifyIdentityUtil; import com.ruoyi.system.domain.RlMsgLog; import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.domain.agent.RlAgentVO; import com.ruoyi.system.domain.changeBalance.RlChangeBalance; import com.ruoyi.system.domain.changeBalance.RlChangeBalanceQuery; -import com.ruoyi.system.domain.channel.ChannelVO; import com.ruoyi.system.domain.channelWithdraw.ChannelWithdrawVO; import com.ruoyi.system.domain.query.AuthenticationQuery; -import com.ruoyi.system.domain.userExt.RlUserExt; import com.ruoyi.system.domain.userWithdraw.RlUserWithdraw; -import com.ruoyi.system.domain.vo.RlUserQuery; +import com.ruoyi.system.domain.RlUserQuery; import com.ruoyi.system.domain.withdraw.RlWithdraw; import com.ruoyi.system.domain.withdraw.RlWithdrawQuery; import com.ruoyi.system.mapper.RlUserMapper;