🎉 4.4.2.RELEASE 优化日志实体类结构

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://img.shields.io/badge/Release-V4.4.1-green.svg" alt="Downloads">
+  <img src="https://img.shields.io/badge/Release-V4.4.2-green.svg" alt="Downloads">
   <img src="https://img.shields.io/badge/JDK-17+-green.svg" alt="Build Status">
   <img src="https://img.shields.io/badge/license-LGPL%20v3-blue.svg" alt="Build Status">
   <img src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg" alt="Coverage Status">

blade-starter-log/src/main/java/org/springblade/core/log/model/LogAbstract.java

@@ -19,10 +19,13 @@ package org.springblade.core.log.model;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -34,11 +37,13 @@ import java.util.Date;
 @Data
 public class LogAbstract implements Serializable {
 
-	protected static final long serialVersionUID = 1L;
+	@Serial
+	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 主键id
 	 */
+	@JsonSerialize(using = ToStringSerializer.class)
 	@TableId(value = "id", type = IdType.ASSIGN_ID)
 	protected Long id;
 

blade-starter-log/src/main/java/org/springblade/core/log/model/LogApi.java

@@ -18,6 +18,7 @@ package org.springblade.core.log.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -28,6 +29,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("blade_log_api")
 public class LogApi extends LogAbstract implements Serializable {
 

blade-starter-log/src/main/java/org/springblade/core/log/model/LogApiVo.java

@@ -1,36 +0,0 @@
-/**
- * Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springblade.core.log.model;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serial;
-
-/**
- * LogApi视图实体类
- *
- * @author Chill
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class LogApiVo extends LogApi {
-	@Serial
-	private static final long serialVersionUID = 1L;
-
-	private String strId;
-
-}

blade-starter-log/src/main/java/org/springblade/core/log/model/LogError.java

@@ -18,6 +18,7 @@ package org.springblade.core.log.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -28,6 +29,7 @@ import java.io.Serializable;
  * @author Chill
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("blade_log_error")
 public class LogError extends LogAbstract implements Serializable {
 

blade-starter-log/src/main/java/org/springblade/core/log/model/LogErrorVo.java

@@ -1,36 +0,0 @@
-/**
- * Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springblade.core.log.model;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serial;
-
-/**
- * LogError视图实体类
- *
- * @author Chill
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class LogErrorVo extends LogError {
-	@Serial
-	private static final long serialVersionUID = 1L;
-
-	private String strId;
-
-}

blade-starter-log/src/main/java/org/springblade/core/log/model/LogUsual.java

@@ -18,6 +18,7 @@ package org.springblade.core.log.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -29,6 +30,7 @@ import java.io.Serializable;
  * @since 2018-10-12
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("blade_log_usual")
 public class LogUsual extends LogAbstract implements Serializable {
 

blade-starter-log/src/main/java/org/springblade/core/log/model/LogUsualVo.java

@@ -1,36 +0,0 @@
-/**
- * Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springblade.core.log.model;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serial;
-
-/**
- * LogUsual视图实体类
- *
- * @author Chill
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class LogUsualVo extends LogUsual {
-	@Serial
-	private static final long serialVersionUID = 1L;
-
-	private String strId;
-
-}

pom.xml

@@ -36,7 +36,7 @@
 
     <properties>
         <!-- Blade-Tool Version -->
-        <revision>4.4.1</revision>
+        <revision>4.4.2</revision>
         <module.name>org.springblade.blade.tool</module.name>
         <!-- jdk Version -->
         <java.version>17</java.version>