From 554ff936b26db2e996292d22d7980092a414fea9 Mon Sep 17 00:00:00 2001
From: zhouxiunai <154707516@qq.com>
Date: Wed, 26 Dec 2018 10:16:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=8D=A2=E6=88=90=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserServiceImpl.java         | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/adminapi/service/impl/UserServiceImpl.java b/src/main/java/com/gzzn/omms/adminapi/service/impl/UserServiceImpl.java
index 9da9a75..515e1c1 100644
--- a/src/main/java/com/gzzn/omms/adminapi/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/gzzn/omms/adminapi/service/impl/UserServiceImpl.java
@@ -40,29 +40,31 @@ public class UserServiceImpl implements IUserService {
 	
 	//获取网关header中传递的用户信息
 	private HeaderUserDto getHeaderUserDto()  {
+		/*
 		HeaderUserDto dto = new HeaderUserDto();
 		dto.setUserId("00000000000000000000000000000000");
 		dto.setUserName("admin");
 		dto.setRealName("超级管理员");
 		return dto;
-//		try 
-//		{
-//			String userStr = request.getHeader("user");
-//			logger.info("gateway-User:"+userStr);
-//			if(null == userStr)
-//			{
-//				throw new UserNoLoginException();
-//			}
-//			BASE64Decoder base64Decoder = new BASE64Decoder();
-//			byte[] bt =  base64Decoder.decodeBuffer(userStr);
-//			
-//			ObjectMapper objectMapper = new ObjectMapper();
-//			return objectMapper.readValue(bt, HeaderUserDto.class);
-//		} 
-//		catch (IOException e) 
-//		{
-//			throw new RuntimeException("header userinfo error!"+e.getMessage());
-//		}
+		*/
+		try 
+		{
+			String userStr = request.getHeader("user");
+			logger.info("gateway-User:"+userStr);
+			if(null == userStr)
+			{
+				throw new UserNoLoginException();
+			}
+			BASE64Decoder base64Decoder = new BASE64Decoder();
+			byte[] bt =  base64Decoder.decodeBuffer(userStr);
+			
+			ObjectMapper objectMapper = new ObjectMapper();
+			return objectMapper.readValue(bt, HeaderUserDto.class);
+		} 
+		catch (IOException e) 
+		{
+			throw new RuntimeException("header userinfo error!"+e.getMessage());
+		}
 	}