rev:修改了日志获取IP和登录端

lms/nladmin-system/src/main/java/org/nl/modules/common/utils/StringUtils.java

@@ -146,11 +146,6 @@ public class StringUtils {
      * 获取ip地址
      */
     public static String getIp(HttpServletRequest request) {
-        // TODO 不解析IP地址
-        if(true){
-            return "127.0.0.1";
-        }
-
         String ip = request.getHeader("x-forwarded-for");
         if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) {
             ip = request.getHeader("Proxy-Client-IP");

lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java

@@ -15,6 +15,7 @@
  */
 package org.nl.modules.logging.aspect;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -90,7 +91,8 @@ public class LogAspect {
             //是否把日志存到日志表
             if (logInfo.isAddLogTable()) {
                 Log log = new Log("INFO", System.currentTimeMillis() - comming);
-                logService.save(getUsername(), StringUtils.getBrowser(request), requestIp, joinPoint, log);
+                String loginDevice = StpUtil.getLoginDevice();
+                logService.save(getUsername(), StringUtils.getBrowser(request)+"---"+loginDevice, requestIp, joinPoint, log);
             }
             if (logInfo.isInterfaceLog()) {
                 try {

lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LogServiceImpl.java

@@ -15,6 +15,7 @@
  */
 package org.nl.modules.logging.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -42,6 +43,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -103,6 +105,7 @@ public class LogServiceImpl implements LogService {
         logDto.setUsername(username);
         logDto.setParams(getParameter(method, joinPoint.getArgs()));
         logDto.setBrowser(browser);
+        logDto.setCreateTime(Timestamp.valueOf(DateUtil.now()));
         logRepository.save(logDto);
     }