Merge branch 'master' into build

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/springsecurity/SpringSecurityUserInfoHolder.java

@@ -4,15 +4,28 @@ import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
 import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
 
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.security.Principal;
 
 public class SpringSecurityUserInfoHolder implements UserInfoHolder {
 
   @Override
   public UserInfo getUser() {
     UserInfo userInfo = new UserInfo();
-    String userId = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
-    userInfo.setUserId(userId);
+    userInfo.setUserId(getCurrentUsername());
     return userInfo;
   }
+
+  private String getCurrentUsername() {
+    Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+    if (principal instanceof UserDetails) {
+      return ((UserDetails) principal).getUsername();
+    }
+    if (principal instanceof Principal) {
+      return ((Principal) principal).getName();
+    }
+    return String.valueOf(principal);
+  }
+
 }