From 96aab84b83310b11ed6cfc69a05aa22805612f08 Mon Sep 17 00:00:00 2001
From: "wei.zhang2" <wei.zhang2@baidao.com>
Date: Mon, 16 Oct 2017 10:30:33 +0800
Subject: [PATCH] 1

---
 .../java/com/boot/security/server/utils/UserUtil.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/boot/security/server/utils/UserUtil.java b/src/main/java/com/boot/security/server/utils/UserUtil.java
index 62a0ddf..7399ebe 100644
--- a/src/main/java/com/boot/security/server/utils/UserUtil.java
+++ b/src/main/java/com/boot/security/server/utils/UserUtil.java
@@ -1,5 +1,6 @@
 package com.boot.security.server.utils;
 
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import com.boot.security.server.dto.LoginUser;
@@ -7,9 +8,12 @@ import com.boot.security.server.dto.LoginUser;
 public class UserUtil {
 
 	public static LoginUser getLoginUser() {
-		LoginUser loginUser = (LoginUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+		Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+		if (authentication != null) {
+			return (LoginUser) authentication.getPrincipal();
+		}
 
-		return loginUser;
+		return null;
 	}
 
 }