From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 16 一月 2025 16:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLoginController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLoginController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLoginController.java
index 151bf6b..112c102 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLoginController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsLoginController.java
@@ -1,18 +1,19 @@
package com.vci.web.controller;
+import com.vci.bo.LoginResultBO;
+import com.vci.corba.common.PLException;
+import com.vci.dto.LoginUserDTO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.constant.TokenKeyConstant;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.RequestClientInfo;
import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.starter.web.util.LangBaseUtil;
import com.vci.starter.web.util.MessageUtils;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.WebThreadLocalUtil;
-import com.vci.bo.LoginResultBO;
-import com.vci.dto.LoginUserDTO;
import com.vci.web.service.OsLoginServiceI;
+import com.zeroc.IceInternal.Ex;
import eu.bitwalker.useragentutils.*;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -22,14 +23,8 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.security.Principal;
-import java.util.Enumeration;
-import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -186,8 +181,15 @@
@ResponseBody
public BaseResult logout(HttpServletRequest request){
String userToken = request.getHeader(TokenKeyConstant.USER_TOKEN_KEY);
- loginService.logout(userToken);
- return BaseResult.success();
+ try {
+ loginService.logout(userToken);
+ return BaseResult.success("閫�鍑烘垚鍔�");
+ } catch (Exception e) {
+ e.printStackTrace();
+ String errorLog = "鐧诲嚭鏃跺嚭鐜板紓甯革紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorLog);
+ return BaseResult.fail(errorLog);
+ }
}
}
--
Gitblit v1.9.3