From 3faac1edf6673219a1ec1f7b415871c0c8d15d0c Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 12 七月 2024 15:58:07 +0800 Subject: [PATCH] 密码策略接口联调修改上传 --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java index 8f8310a..3cd9c93 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java @@ -17,7 +17,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -27,7 +26,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.security.Principal; -import java.util.*; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; /** * 鐧诲綍鎺у埗鍣� @@ -256,6 +258,14 @@ clientInfo.setRequestType("browser"); } } + + Locale loc = Locale.getDefault(); + clientInfo.setCountry(loc.getCountry()); + clientInfo.setLanguage(loc.toLanguageTag()); + + Map<String,String> map = System.getenv(); + clientInfo.setMachine(map.get("COMPUTERNAME")); + clientInfo.setOsUser(map.get("USERNAME")); } } @@ -297,9 +307,9 @@ @ResponseBody public BaseResult getSessionInfo(){ BaseResult<SessionInfo> json = new BaseResult<>(); - json.setObj(WebThreadLocalUtil.getCurrentUserSessionInfoInThread()); - if(json.getObj()!=null){ - json.setSuccess(true); + SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread(); + if(sessionInfo != null){ + json = json.success(sessionInfo); } return json; } -- Gitblit v1.9.3