diff --git a/blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java b/blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java index 8461dffa..fea550b5 100644 --- a/blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java +++ b/blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java @@ -63,7 +63,7 @@ public class AuthController { User user = res.getData().getUser(); //验证用户 - if (user == null) { + if (Func.isEmpty(user.getId())) { return R.fail("用户名或密码不正确"); } diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java index fab3b906..56d36ea9 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java @@ -42,7 +42,7 @@ public interface IUserClient { * @param password 密码 * @return */ - @GetMapping(API_PREFIX + "/userInfo") + @GetMapping(API_PREFIX + "/user-info") R userInfo(@RequestParam("account") String account, @RequestParam("password") String password); } diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java index 98e8330a..0d34cf2f 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java @@ -35,7 +35,7 @@ public class UserClient implements IUserClient { IUserService service; @Override - @GetMapping(API_PREFIX + "/userInfo") + @GetMapping(API_PREFIX + "/user-info") public R userInfo(String account, String password) { return R.data(service.userInfo(account, password)); }