From 328b0158c3d97f87efc7da22a1e3f5a7c258b127 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 04 七月 2024 19:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 87d292d..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;
/**
* 鐧诲綍鎺у埗鍣�
@@ -133,7 +135,7 @@
if(!loginResultBO.isSuccess()){
msg = loginResultBO.getFailMsg();
}else {
- token = loginResultBO.getSessionInfo().getToken();
+ token = loginResultBO.getTokenVO().getAccessToken();
}
}catch (Throwable e){
msg = LangBaseUtil.getErrorMsg(e);
@@ -196,7 +198,7 @@
msg = loginResultBO.getFailMsg();
return BaseResult.fail(msg);
}else {
- token = loginResultBO.getSessionInfo().getToken();
+ token = loginResultBO.getTokenVO().getAccessToken();
msg="鐧诲綍鎴愬姛锛�";
}
}catch (Throwable e){
@@ -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().get());
- if(json.getObj()!=null){
- json.setSuccess(true);
+ SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ if(sessionInfo != null){
+ json = json.success(sessionInfo);
}
return json;
}
--
Gitblit v1.9.3