🎉 优化登录逻辑

smallchill · smallchill · commit de204e77443d · 2019-07-16T14:01:14.000+08:00
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
@@ -58,7 +58,7 @@ public R<AuthInfo> token(@ApiParam(value = "授权类型", required = true) @Req
 		ITokenGranter granter = TokenGranterBuilder.getGranter(grantType);
 		UserInfo userInfo = granter.grant(tokenParameter);
 
-		if (userInfo == null || userInfo.getUser() == null) {
+		if (userInfo == null || userInfo.getUser() == null || userInfo.getUser().getId() == null) {
 			return R.fail(TokenUtil.USER_NOT_FOUND);
 		}
 
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
@@ -29,7 +29,8 @@
  * @author Chill
  */
 @FeignClient(
-	value = AppConstant.APPLICATION_USER_NAME
+	value = AppConstant.APPLICATION_USER_NAME,
+	fallback = IUserClientFallback.class
 )
 public interface IUserClient {
 
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springblade.system.user.feign;
+
+import org.springblade.core.tool.api.R;
+import org.springblade.system.user.entity.UserInfo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Feign失败配置
+ *
+ * @author Chill
+ */
+@Component
+public class IUserClientFallback implements IUserClient {
+
+	@Override
+	public R<UserInfo> userInfo(Long userId) {
+		return R.fail("未获取到账号信息");
+	}
+
+	@Override
+	public R<UserInfo> userInfo(String tenantCode, String account, String password) {
+		return R.fail("未获取到账号信息");
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public R<AuthInfo> token(@ApiParam(value = "授权类型", required = true) @Req`
`58`	`58`	`ITokenGranter granter = TokenGranterBuilder.getGranter(grantType);`
`59`	`59`	`UserInfo userInfo = granter.grant(tokenParameter);`
`60`	`60`
`61`		`- if (userInfo == null \|\| userInfo.getUser() == null) {`
	`61`	`+ if (userInfo == null \|\| userInfo.getUser() == null \|\| userInfo.getUser().getId() == null) {`
`62`	`62`	`return R.fail(TokenUtil.USER_NOT_FOUND);`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@`
`29`	`29`	`* @author Chill`
`30`	`30`	`*/`
`31`	`31`	`@FeignClient(`
`32`		`- value = AppConstant.APPLICATION_USER_NAME`
	`32`	`+ value = AppConstant.APPLICATION_USER_NAME,`
	`33`	`+ fallback = IUserClientFallback.class`
`33`	`34`	`)`
`34`	`35`	`public interface IUserClient {`
`35`	`36`