From c8a73f64e981c347b5d9413ec6fd5603bdebfc39 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 10 十一月 2023 14:30:58 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/DocLogService.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/DocLogService.java b/src/main/java/com/whyc/service/DocLogService.java
index ef5ab62..52fba19 100644
--- a/src/main/java/com/whyc/service/DocLogService.java
+++ b/src/main/java/com/whyc/service/DocLogService.java
@@ -13,11 +13,9 @@
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.lang.reflect.Type;
import java.util.Date;
import java.util.List;
@@ -98,7 +96,14 @@
public void record(long uId,String name, int operationType, String msg,String msgDetail) {
DocLog docLog = new DocLog();
- docLog.setTerminalIp(ActionUtil.getRequest().getRemoteAddr());
+ HttpServletRequest request = ActionUtil.getRequest();
+ String remoteAddr;
+ if(request!=null) {
+ remoteAddr = request.getRemoteAddr();
+ }else{
+ remoteAddr = "127.0.0.1";
+ }
+ docLog.setTerminalIp(remoteAddr);
docLog.setOprateDay(new Date());
docLog.setId((int)(uId));
docLog.setName(name);
--
Gitblit v1.9.1