diff --git a/src/main/java/com/boot/security/server/service/impl/TokenServiceDbImpl.java b/src/main/java/com/boot/security/server/service/impl/TokenServiceDbImpl.java
index 757c8bf..570af47 100644
--- a/src/main/java/com/boot/security/server/service/impl/TokenServiceDbImpl.java
+++ b/src/main/java/com/boot/security/server/service/impl/TokenServiceDbImpl.java
@@ -10,6 +10,7 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.xml.bind.DatatypeConverter;
 
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -156,17 +157,21 @@ public class TokenServiceDbImpl implements TokenService {
 	}
 
 	private String getUUIDFromJWT(String jwt) {
+		if ("null".equals(jwt) || StringUtils.isBlank(jwt)) {
+			return null;
+		}
+
 		Map<String, Object> jwtClaims = null;
 		try {
 			jwtClaims = Jwts.parser().setSigningKey(getKeyInstance()).parseClaimsJws(jwt).getBody();
+			return MapUtils.getString(jwtClaims, LOGIN_USER_KEY);
 		} catch (ExpiredJwtException e) {
 			log.error("{}已过期", jwt);
-			return null;
 		} catch (Exception e) {
-			throw e;
+			log.error("{}", e);
 		}
 
-		return MapUtils.getString(jwtClaims, LOGIN_USER_KEY);
+		return null;
 	}
 
 }
diff --git a/src/main/java/com/boot/security/server/service/impl/TokenServiceJWTImpl.java b/src/main/java/com/boot/security/server/service/impl/TokenServiceJWTImpl.java
index 84717a9..677ef26 100644
--- a/src/main/java/com/boot/security/server/service/impl/TokenServiceJWTImpl.java
+++ b/src/main/java/com/boot/security/server/service/impl/TokenServiceJWTImpl.java
@@ -10,6 +10,7 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.xml.bind.DatatypeConverter;
 
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -147,16 +148,20 @@ public class TokenServiceJWTImpl implements TokenService {
 	}
 
 	private String getUUIDFromJWT(String jwtToken) {
+		if ("null".equals(jwtToken) || StringUtils.isBlank(jwtToken)) {
+			return null;
+		}
+
 		Map<String, Object> jwtClaims = null;
 		try {
 			jwtClaims = Jwts.parser().setSigningKey(getKeyInstance()).parseClaimsJws(jwtToken).getBody();
+			return MapUtils.getString(jwtClaims, LOGIN_USER_KEY);
 		} catch (ExpiredJwtException e) {
 			log.error("{}已过期", jwtToken);
-			return null;
 		} catch (Exception e) {
-			throw e;
+			log.error("{}", e);
 		}
 
-		return MapUtils.getString(jwtClaims, LOGIN_USER_KEY);
+		return null;
 	}
 }
diff --git a/doc/datatables排序问题.docx b/文档和sql/datatables排序问题.docx
similarity index 100%
rename from doc/datatables排序问题.docx
rename to 文档和sql/datatables排序问题.docx
diff --git a/doc/db/boot_security.sql b/文档和sql/db/boot_security.sql
similarity index 100%
rename from doc/db/boot_security.sql
rename to 文档和sql/db/boot_security.sql
diff --git a/doc/idea导入maven项目.docx b/文档和sql/idea导入maven项目.docx
similarity index 100%
rename from doc/idea导入maven项目.docx
rename to 文档和sql/idea导入maven项目.docx
diff --git a/doc/安装运行.docx b/文档和sql/安装运行.docx
similarity index 100%
rename from doc/安装运行.docx
rename to 文档和sql/安装运行.docx
diff --git a/doc/框架及配置.docx b/文档和sql/框架及配置.docx
similarity index 100%
rename from doc/框架及配置.docx
rename to 文档和sql/框架及配置.docx