From 722f40cdf7942942a656af3135582499f59f53ba Mon Sep 17 00:00:00 2001 From: Siri-Ray <109605599+Siri-Ray@users.noreply.github.com> Date: Sun, 24 Nov 2024 09:41:33 +0800 Subject: [PATCH 1/2] (improvement)(auth) Add user email info to jwt claim (#1921) --- .../auth/api/authentication/pojo/UserWithPassword.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/UserWithPassword.java b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/UserWithPassword.java index 2ebfd3d9a..fc5dfbd05 100644 --- a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/UserWithPassword.java +++ b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/UserWithPassword.java @@ -11,6 +11,7 @@ import java.util.Map; import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_CREATE_TIME; import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_IS_ADMIN; import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_DISPLAY_NAME; +import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_EMAIL; import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_ID; import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_NAME; import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_PASSWORD; @@ -38,6 +39,7 @@ public class UserWithPassword extends User { claims.put(TOKEN_USER_NAME, StringUtils.isEmpty(user.getName()) ? "" : user.getName()); claims.put(TOKEN_USER_PASSWORD, StringUtils.isEmpty(user.getPassword()) ? "" : user.getPassword()); + claims.put(TOKEN_USER_EMAIL, StringUtils.isEmpty(user.getEmail()) ? "" : user.getEmail()); claims.put(TOKEN_USER_DISPLAY_NAME, user.getDisplayName()); claims.put(TOKEN_CREATE_TIME, System.currentTimeMillis()); claims.put(TOKEN_IS_ADMIN, user.getIsAdmin()); From 224c114d20bf945089daa72e0ebd542a70181ca8 Mon Sep 17 00:00:00 2001 From: wangk Date: Tue, 26 Nov 2024 21:41:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E9=87=8D=E5=90=AF=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=90=8E=E5=AD=98=E5=9C=A8=E5=A4=9A=E4=B8=AA=E9=97=B2=E8=81=8A?= =?UTF-8?q?=E5=8A=A9=E6=89=8B=20(#1928)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/tencent/supersonic/demo/S2SmallTalkDemo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2SmallTalkDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2SmallTalkDemo.java index 7964d0bf8..3c8afaaff 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2SmallTalkDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2SmallTalkDemo.java @@ -49,6 +49,6 @@ public class S2SmallTalkDemo extends S2BaseDemo { boolean checkNeedToRun() { List agentNames = agentService.getAgents().stream().map(Agent::getName).collect(Collectors.toList()); - return !agentNames.contains("来闲聊"); + return !agentNames.contains("闲聊助手"); } }