fix: [系统管理] [登录日志] 双语

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;

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, "注册成功");
     }
 }

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))
         {

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<SystemLog> util = new ExcelUtil<SystemLog>(SystemLog.class);

hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -11,16 +11,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="status"        column="status"            />
 		<result property="ipaddr"        column="ipaddr"            />
 		<result property="msg"           column="msg"               />
+		<result property="msgEn"           column="msg_en"               />
 		<result property="accessTime"    column="access_time"       />
 	</resultMap>
 
 	<insert id="insertLogininfor" parameterType="com.hxhq.system.api.domain.SysLogininfor">
-		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())
 	</insert>
 	
 	<select id="selectLogininforList" parameterType="com.hxhq.system.api.domain.SysLogininfor" resultMap="SysLogininforResult">
-		select info_id, user_name,nick_name, ipaddr, status, msg, access_time from sys_logininfor
+		select info_id, user_name,nick_name, ipaddr, status, msg, msg_en, access_time from sys_logininfor
 		<where>
 			<if test="ipaddr != null and ipaddr != ''">
 				AND ipaddr like concat('%', #{ipaddr}, '%')