backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商家后台登录bug修复

Browse Source
This commit is contained in:
Jack 2025-04-07 08:29:30 +08:00
parent 5699cafbbb
commit 92ec2f5735
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java
View File

@ -124,7 +124,7 @@ public class AccountUserBaseController extends BaseControllerImpl {
@ApiOperation("根据用户名获取通用用户信息")
@RequestMapping(value = "/loadByUsername", method = RequestMethod.GET)
public UserDto loadUserByUsername(@RequestParam String user_account, @RequestParam(name = "user_is_admin", required = false) Integer user_is_admin) {
public UserDto loadUserByUsername(@RequestParam String user_account, @RequestParam(name = "user_is_admin", required = false) List<Integer> user_is_admin) {
return accountUserBaseService.loadUserByUsername(user_account, user_is_admin);
}

2
mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBaseService.java
View File

@ -29,7 +29,7 @@ public interface AccountUserBaseService extends IBaseService<AccountUserBase> {
UserDto loadUserByUsername(String user_account);
UserDto loadUserByUsername(String user_account, Integer user_is_admin);
UserDto loadUserByUsername(String user_account, List<Integer> user_is_admin);
boolean logout();

10
mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java
View File

@ -270,7 +270,7 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
@Override
public UserDto loadUserByUsername(String user_account) {
return loadUserByUsername(user_account, CommonConstant.USER_TYPE_NORMAL);
return loadUserByUsername(user_account, Collections.singletonList(CommonConstant.USER_TYPE_NORMAL));
}
/**
@ -279,18 +279,18 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
* @return
*/
@Override
public UserDto loadUserByUsername(String user_account, Integer user_is_admin) {
public UserDto loadUserByUsername(String user_account, List<Integer> user_is_admin) {
if (StrUtil.isBlank(user_account)) {
return null;
}
if (ObjectUtil.isEmpty(user_is_admin)) {
user_is_admin = CommonConstant.USER_TYPE_NORMAL;
if (CollUtil.isEmpty(user_is_admin)) {
user_is_admin = Collections.singletonList(CommonConstant.USER_TYPE_NORMAL);
}
//获取用户信息
QueryWrapper<AccountUserBase> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_account", user_account).eq("user_is_admin", user_is_admin).orderByDesc("user_id");
queryWrapper.eq("user_account", user_account).in("user_is_admin", user_is_admin).orderByDesc("user_id");
List<AccountUserBase> list = accountUserBaseService.find(queryWrapper);
if (CollUtil.isEmpty(list)) {
return null;

6
mall-auth/src/main/java/com/suisung/mall/auth/service/AccountService.java
View File

@ -5,10 +5,12 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@FeignClient("mall-account")
public interface AccountService {
@GetMapping("/admin/account/account-user-base/loadByUsername")
UserDto loadUserByUsername(@RequestParam("user_account") String user_account, @RequestParam(name = "user_is_admin", required = false) Integer user_is_admin);
UserDto loadUserByUsername(@RequestParam("user_account") String user_account, @RequestParam(name = "user_is_admin", required = false) List<Integer> user_is_admin);
}

8
mall-auth/src/main/java/com/suisung/mall/auth/service/impl/UserServiceImpl.java
View File

@ -18,6 +18,8 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Collections;
/**
* 用户管理业务类
@ -35,11 +37,11 @@ public class UserServiceImpl implements UserDetailsService {
String client_id = request.getParameter("client_id");
UserDto userDto;
if (AuthConstant.ADMIN_CLIENT_ID.equals(client_id)) {
userDto = accountService.loadUserByUsername(username, CommonConstant.USER_TYPE_ADMIN);
userDto = accountService.loadUserByUsername(username, Arrays.asList(CommonConstant.USER_TYPE_ADMIN, CommonConstant.USER_TYPE_MCH));
} else if (AuthConstant.MCH_CLIENT_ID.equals(client_id)) {
userDto = accountService.loadUserByUsername(username, CommonConstant.USER_TYPE_MCH);
userDto = accountService.loadUserByUsername(username, Collections.singletonList(CommonConstant.USER_TYPE_MCH));
} else {
userDto = accountService.loadUserByUsername(username, CommonConstant.USER_TYPE_NORMAL);
userDto = accountService.loadUserByUsername(username, Collections.singletonList(CommonConstant.USER_TYPE_NORMAL));
}
if (ObjectUtil.isEmpty(userDto)) {
throw new UsernameNotFoundException(MessageConstant.USERNAME_PASSWORD_ERROR);