From 99a46bbdd8aaef9492f5498f1808b1338b84f265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Wed, 10 Apr 2019 10:03:10 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E7=89=B9=E6=80=A7=E3=80=82=20=E6=8E=88=E6=9D=83=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA=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

---
 .../com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java | 2 ++
 pigx-auth/src/main/resources/templates/ftl/confirm.ftl      | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
index 265304ac4..1f25407b5 100644
--- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
+++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
@@ -28,6 +28,7 @@ import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
 import com.pig4cloud.pigx.common.security.annotation.Inner;
+import com.pig4cloud.pigx.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.cache.CacheManager;
 import org.springframework.data.redis.core.ConvertingCursor;
@@ -98,6 +99,7 @@ public class PigxTokenEndpoint {
 			AuthorizationRequest authorizationRequest = (AuthorizationRequest) auth;
 			ClientDetails clientDetails = clientDetailsService.loadClientByClientId(authorizationRequest.getClientId());
 			modelAndView.addObject("app", clientDetails.getAdditionalInformation());
+			modelAndView.addObject("user", SecurityUtils.getUser());
 		}
 
 		modelAndView.setViewName("ftl/confirm");
diff --git a/pigx-auth/src/main/resources/templates/ftl/confirm.ftl b/pigx-auth/src/main/resources/templates/ftl/confirm.ftl
index 30909ff63..63a204081 100644
--- a/pigx-auth/src/main/resources/templates/ftl/confirm.ftl
+++ b/pigx-auth/src/main/resources/templates/ftl/confirm.ftl
@@ -20,13 +20,17 @@
             <p class="navbar-text navbar-right">
                 <a target="_blank" href="https://pig4cloud.com">技术支持</a>
             </p>
+            <p class="navbar-text navbar-right">
+                <a target="_blank" href="https://pig4cloud.com">${user.username}</a>
+            </p>
         </div>
     </div>
 </nav>
 <div style="padding-top: 80px;width: 300px; color: #555; margin:0px auto;">
     <form id='confirmationForm' name='confirmationForm' action="/oauth/authorize" method='post'>
         <input name='user_oauth_approval' value='true' type='hidden'/>
-        <p><a href="${app.website}" target="_blank">${app.appName}</a> 将获得以下权限：</p>
+        <p>
+            <a href="${app.website}" target="_blank">${app.appName}</a> 将获得以下权限：</p>
         <ul class="list-group">
             <li class="list-group-item"> <span>
               <#list scopeList as scope>