From 11e69a99464761475aff6a1103e01737f24923ab Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Tue, 24 Feb 2026 16:10:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20[=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=20[=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97]=20=E5=8F=8C=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxhq/system/api/domain/SysLogininfor.java | 12 ++++++++++++ .../src/main/java/com/hxhq/auth/service/SysLoginService.java | 4 ++-- .../main/java/com/hxhq/auth/service/SysRecordLogService.java | 3 ++- .../com/hxhq/system/controller/SysLogininforController.java | 2 +- .../src/main/resources/mapper/system/SysLogininforMapper.xml | 7 ++++--- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysLogininfor.java b/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysLogininfor.java index 27f0f3c..71c2ca8 100644 --- a/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysLogininfor.java +++ b/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysLogininfor.java @@ -39,6 +39,10 @@ public class SysLogininfor extends BaseEntity @Excel(name = "描述") private String msg; + /** 描述 */ + @Excel(name = "描述-英文") + private String msgEn; + /** 访问时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @@ -108,6 +112,14 @@ public class SysLogininfor extends BaseEntity this.msg = msg; } + public String getMsgEn() { + return msgEn; + } + + public void setMsgEn(String msgEn) { + this.msgEn = msgEn; + } + public Date getAccessTime() { return accessTime; diff --git a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysLoginService.java b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysLoginService.java index 63daf9a..0c02618 100644 --- a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysLoginService.java +++ b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysLoginService.java @@ -117,7 +117,7 @@ public class SysLoginService } } - recordLogService.recordLogininfor(username,user.getNickName(), Constants.LOGIN_SUCCESS, "登录成功"); + recordLogService.recordLogininfor(username,user.getNickName(), Constants.LOGIN_SUCCESS, "登录成功","Login Successful"); recordLoginInfo(user.getUserId()); return userInfo; } @@ -176,6 +176,6 @@ public class SysLoginService { throw new ServiceException(registerResult.getMsg()); } - recordLogService.recordLogininfor(username,null, Constants.REGISTER, "注册成功"); +// recordLogService.recordLogininfor(username,null, Constants.REGISTER, "注册成功"); } } diff --git a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysRecordLogService.java b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysRecordLogService.java index b6cc877..3a39a5a 100644 --- a/hxhq-auth/src/main/java/com/hxhq/auth/service/SysRecordLogService.java +++ b/hxhq-auth/src/main/java/com/hxhq/auth/service/SysRecordLogService.java @@ -29,13 +29,14 @@ public class SysRecordLogService * @param message 消息内容 * @return */ - public void recordLogininfor(String username,String nickName, String status, String message) + public void recordLogininfor(String username,String nickName, String status, String message, String messageEn) { SysLogininfor logininfor = new SysLogininfor(); logininfor.setUserName(username); logininfor.setNickName(nickName); logininfor.setIpaddr(IpUtils.getIpAddr()); logininfor.setMsg(message); + logininfor.setMsgEn(messageEn); // 日志状态 if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysLogininforController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysLogininforController.java index 2404b61..0fd5f4f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysLogininforController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysLogininforController.java @@ -72,7 +72,7 @@ public class SysLogininforController extends BaseController systemLog.setQmrMc(l.getNickName()); systemLog.setCzlx(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?"登录":"Login"); systemLog.setCzsj(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,l.getAccessTime())); - systemLog.setCzxq(l.getMsg()); + systemLog.setCzxq(ServletUtils.getRequest().getHeader("lang").equals("zh_CN")?l.getMsg():l.getMsgEn()); logList.add(systemLog); } ExcelUtil util = new ExcelUtil(SystemLog.class); diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 43bc1f4..2bcecd2 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -11,16 +11,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - insert into sys_logininfor (user_name,nick_name, status, ipaddr, msg, access_time) - values (#{userName},#{nickName}, #{status}, #{ipaddr}, #{msg}, sysdate()) + insert into sys_logininfor (user_name,nick_name, status, ipaddr, msg, msg_en, access_time) + values (#{userName},#{nickName}, #{status}, #{ipaddr}, #{msg}, #{msgEn}, sysdate())