From 6a9605d7e333d4af8ba89f9b3b1c2f8332289587 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 18 九月 2023 10:33:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index e91e46a..15415e2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -53,13 +53,19 @@
import com.vci.ubcs.system.vo.DeptVO;
import com.vci.ubcs.system.vo.RoleVO;
import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import javax.jws.WebMethod;
import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -143,12 +149,25 @@
*/
@Resource
private IDockingLogeService dockingLogeService;
+ @Resource
+ private IPasswordFreeLoginService passwordFreeLoginService;
private static String separator="##VCI##";
private String errorid="0";
private String msg="鎴愬姛";
private String objerrorCode="0";
private String objerrorMsg="鎴愬姛";
+
+ @Resource
+ private WebServiceContext webServiceContext;
+
+ @WebMethod
+ public HttpServletRequest getRequest() {
+ // 鑾峰彇HttpServletRequest瀵硅薄
+ HttpServletRequest request = (HttpServletRequest) webServiceContext.getMessageContext().get(MessageContext.SERVLET_REQUEST);
+ return request;
+ }
+
/***
* 鐢宠缂栫爜鎺ュ彛
* @param data 浼犻�掔殑鏁版嵁鍙傛暟
@@ -191,9 +210,10 @@
ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
systemId = interParameterVO.getData().getSystemId();
UserVO userVo = interParameterVO.getData().getUser();
+ //鍏嶅瘑鐧诲綍鐢宠token锛宧eader寰�token涓坊鍔�
+ passwordFreeLoginService.passwordFreeLogin(userVo.getUserName(),this.getRequest());
List<ClassfyVO> classVOList = classfysVO.getClassify();
InterParameterVO finalInterParameterVO = interParameterVO;
-
//杩欐槸璐﹀彿淇℃伅
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setUserId(userVo.getUserName());
--
Gitblit v1.9.3