change XXid to id and update blog config

Author: martin-bian

dimple-api/dimple-api-system/src/main/java/com/dimple/system/api/model/LoginUser.java

@@ -42,7 +42,7 @@ public class LoginUser implements Serializable {
     /**
      * 登录IP地址
      */
-    private String ipaddr;
+    private String ip;
 
     /**
      * 权限列表

dimple-api/dimple-api-system/src/main/java/com/dimple/system/api/model/SysDictDataBO.java

@@ -15,7 +15,7 @@ public class SysDictDataBO extends BaseEntity {
     /**
      * 字典编码
      */
-    private Long dictCode;
+    private Long id;
 
     /**
      * 字典排序

dimple-api/dimple-api-system/src/main/java/com/dimple/system/api/model/SysLogininforBO.java

@@ -17,7 +17,7 @@ public class SysLogininforBO extends BaseEntity {
     /**
      * ID
      */
-    private Long infoId;
+    private Long id;
 
     /**
      * 用户账号
@@ -32,7 +32,7 @@ public class SysLogininforBO extends BaseEntity {
     /**
      * 地址
      */
-    private String ipaddr;
+    private String ip;
 
     /**
      * 描述

dimple-api/dimple-api-system/src/main/java/com/dimple/system/api/model/SysOperLogBO.java

@@ -17,7 +17,7 @@ public class SysOperLogBO extends BaseEntity {
     /**
      * 日志主键
      */
-    private Long operId;
+    private Long id;
 
     /**
      * 操作模块
@@ -62,7 +62,7 @@ public class SysOperLogBO extends BaseEntity {
     /**
      * 操作地址
      */
-    private String operIp;
+    private String ip;
 
     /**
      * 请求参数
@@ -87,5 +87,5 @@ public class SysOperLogBO extends BaseEntity {
     /**
      * 操作时间
      */
-    private Date operTime;
+    private Date createTme;
 }

dimple-auth/src/main/java/com/dimple/auth/service/SysRecordLogService.java

@@ -31,7 +31,7 @@ public class SysRecordLogService {
     public void recordLogininfor(String username, String status, String message) {
         SysLogininforBO logininfor = new SysLogininforBO();
         logininfor.setUserName(username);
-        logininfor.setIpaddr(IpUtils.getIpAddr(ServletUtils.getRequest()));
+        logininfor.setIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
         logininfor.setMsg(message);
         // 日志状态
         if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {

dimple-common/dimple-common-log/src/main/java/com/dimple/common/log/aspect/OperateLogAspect.java

@@ -61,7 +61,7 @@ protected void handleLog(final JoinPoint joinPoint, OperationLog controllerLog,
             operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
             // 请求的地址
             String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
-            operLog.setOperIp(ip);
+            operLog.setIp(ip);
             operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
             String username = SecurityUtils.getUsername();
             if (StringUtils.isNotBlank(username)) {

dimple-common/dimple-common-security/src/main/java/com/dimple/common/security/service/TokenService.java

@@ -1,12 +1,12 @@
 package com.dimple.common.security.service;
 
-import com.dimple.common.redis.constants.CacheConstants;
 import com.dimple.common.core.constant.SecurityConstants;
 import com.dimple.common.core.utils.JwtUtils;
 import com.dimple.common.core.utils.ServletUtils;
 import com.dimple.common.core.utils.StringUtils;
 import com.dimple.common.core.utils.ip.IpUtils;
 import com.dimple.common.core.utils.uuid.IdUtils;
+import com.dimple.common.redis.constants.CacheConstants;
 import com.dimple.common.redis.core.RedisKeyDefine;
 import com.dimple.common.redis.service.RedisService;
 import com.dimple.common.security.utils.SecurityUtils;
@@ -17,7 +17,6 @@
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 /**
  * token验证处理
@@ -43,7 +42,7 @@ public Map<String, Object> createToken(LoginUser loginUser) {
         loginUser.setToken(token);
         loginUser.setUserid(userId);
         loginUser.setUsername(userName);
-        loginUser.setIpaddr(IpUtils.getIpAddr(ServletUtils.getRequest()));
+        loginUser.setIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
         refreshToken(loginUser);
 
         // Jwt存储信息

dimple-modules/dimple-log/dimple-log-service/src/main/java/com/dimple/log/service/entity/SysLogininfor.java

@@ -17,7 +17,7 @@ public class SysLogininfor extends BaseEntity {
     /**
      * ID
      */
-    private Long infoId;
+    private Long id;
 
     /**
      * 用户账号
@@ -32,7 +32,7 @@ public class SysLogininfor extends BaseEntity {
     /**
      * 地址
      */
-    private String ipaddr;
+    private String ip;
 
     /**
      * 描述

dimple-modules/dimple-log/dimple-log-service/src/main/java/com/dimple/log/service/entity/SysOperLog.java

@@ -17,7 +17,7 @@ public class SysOperLog extends BaseEntity {
     /**
      * 日志主键
      */
-    private Long operId;
+    private Long id;
 
     /**
      * 操作模块
@@ -62,7 +62,7 @@ public class SysOperLog extends BaseEntity {
     /**
      * 操作地址
      */
-    private String operIp;
+    private String ip;
 
     /**
      * 请求参数
@@ -87,5 +87,5 @@ public class SysOperLog extends BaseEntity {
     /**
      * 操作时间
      */
-    private Date operTime;
+    private Date createTme;
 }

dimple-modules/dimple-log/dimple-log-service/src/main/java/com/dimple/log/service/mapper/SysLogininforMapper.java

@@ -30,10 +30,10 @@ public interface SysLogininforMapper {
     /**
      * 批量删除系统登录日志
      *
-     * @param infoIds 需要删除的登录日志ID
+     * @param ids 需要删除的登录日志ID
      * @return affected lines
      */
-     int deleteLogininforByIds(Long[] infoIds);
+     int deleteLogininforByIds(Long[] ids);
 
     /**
      * 清空系统登录日志