Merge branch 'master' into leng_dev

pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java

@@ -62,37 +62,11 @@ public class SecurityUtils {
 		return null;
 	}
 
-	/**
-	 * 获取当前用名
-	 *
-	 * @return String
-	 */
-	public String getUsername() {
-		Object principal = getAuthentication().getPrincipal();
-		if (principal instanceof String) {
-			return principal.toString();
-		}
-		return null;
-	}
-
-
-	public String getClientId() {
-		Authentication authentication = getAuthentication();
-		if (authentication instanceof OAuth2Authentication) {
-			OAuth2Authentication auth2Authentication = (OAuth2Authentication) authentication;
-			return auth2Authentication.getOAuth2Request().getClientId();
-		}
-		return null;
-	}
-
 	/**
 	 * 获取用户
 	 */
 	public PigxUser getUser() {
 		Authentication authentication = getAuthentication();
-		if (authentication == null) {
-			return null;
-		}
 		return getUser(authentication);
 	}
 

pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java

@@ -34,7 +34,7 @@ import java.util.Objects;
 /**
  * @author lengleng
  * <p>
- * fallBack 代理处理
+ * fallback 代理处理
  */
 @Slf4j
 @AllArgsConstructor