Browse Source

👣 重构底层多租户

master
wangxiang 3 years ago
parent
commit
0482871532
  1. 3
      kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/grant/provider/KiccDaoAuthenticationProvider.java
  2. 4
      kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/KiccUserDetailsService.java
  3. 2
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AppController.java
  4. 2
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java

3
kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/grant/provider/KiccDaoAuthenticationProvider.java

@ -2,7 +2,6 @@ package com.cloud.kicc.common.security.grant.provider; @@ -2,7 +2,6 @@ package com.cloud.kicc.common.security.grant.provider;
import cn.hutool.extra.spring.SpringUtil;
import com.cloud.kicc.common.core.util.WebUtil;
import com.cloud.kicc.common.security.exception.ServerErrorException;
import com.cloud.kicc.common.security.service.KiccUserDetailsService;
import org.springframework.core.Ordered;
import org.springframework.security.authentication.BadCredentialsException;
@ -114,7 +113,7 @@ public class KiccDaoAuthenticationProvider extends AbstractUserDetailsAuthentica @@ -114,7 +113,7 @@ public class KiccDaoAuthenticationProvider extends AbstractUserDetailsAuthentica
} catch (InternalAuthenticationServiceException ex) {
throw ex;
} catch (Exception ex) {
throw new ServerErrorException(ex.getMessage(), ex);
throw new InternalAuthenticationServiceException(ex.getMessage(), ex);
}
}

4
kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/KiccUserDetailsService.java

@ -12,7 +12,7 @@ import org.springframework.security.core.GrantedAuthority; @@ -12,7 +12,7 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.oauth2.common.exceptions.OAuth2Exception;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import java.util.Arrays;
import java.util.Collection;
@ -54,7 +54,7 @@ public interface KiccUserDetailsService extends UserDetailsService, Ordered { @@ -54,7 +54,7 @@ public interface KiccUserDetailsService extends UserDetailsService, Ordered {
*/
default UserDetails getUserDetails(R<User> result) {
if (result == null || result.getData() == null) {
throw new OAuth2Exception(result.getMsg());
throw new UsernameNotFoundException("用户不存在");
}
User user = result.getData();

2
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AppController.java

@ -48,7 +48,7 @@ public class AppController { @@ -48,7 +48,7 @@ public class AppController {
public R<User> selectByPhone(@PathVariable String phone) {
User user = userService.getOne(Wrappers.<User>query().lambda().eq(User::getPhone, phone));
if (user == null) {
return R.error(String.format("找不到手机号:%s,请检查是否用户或者密码不正确!", phone));
return R.error(String.format("用户信息为空 %s", phone));
}
return R.ok(userService.getUserAuthority(user));
}

2
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java

@ -105,7 +105,7 @@ public class UserController { @@ -105,7 +105,7 @@ public class UserController {
public R selectByUserName(@PathVariable String userName) {
User user = userService.getOne(Wrappers.<User>query().lambda().eq(User::getUserName, userName));
if (user == null) {
return R.error(String.format("找不到用户:%s,请检查是否用户或者密码不正确!", userName));
return R.error(String.format("用户信息为空 %s", userName));
}
return R.ok(userService.getUserAuthority(user));
}

Loading…
Cancel
Save