diff --git a/README.md b/README.md index dc88793..3240cce 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
- + diff --git a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogAbstract.java b/blade-starter-log/src/main/java/org/springblade/core/log/model/LogAbstract.java index b26cf9d..538a6bc 100644 --- a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogAbstract.java +++ b/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; diff --git a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogApi.java b/blade-starter-log/src/main/java/org/springblade/core/log/model/LogApi.java index f76c170..58a2f31 100644 --- a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogApi.java +++ b/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 { diff --git a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogApiVo.java b/blade-starter-log/src/main/java/org/springblade/core/log/model/LogApiVo.java deleted file mode 100644 index 2b1aea9..0000000 --- a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogApiVo.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com). - *
- * 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 - *
- * http://www.gnu.org/licenses/lgpl.html - *
- * 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; - -} diff --git a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogError.java b/blade-starter-log/src/main/java/org/springblade/core/log/model/LogError.java index 9df5a89..484d6da 100644 --- a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogError.java +++ b/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 { diff --git a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogErrorVo.java b/blade-starter-log/src/main/java/org/springblade/core/log/model/LogErrorVo.java deleted file mode 100644 index 92a68a2..0000000 --- a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogErrorVo.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com). - *
- * 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 - *
- * http://www.gnu.org/licenses/lgpl.html - *
- * 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; - -} diff --git a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogUsual.java b/blade-starter-log/src/main/java/org/springblade/core/log/model/LogUsual.java index c39ecc0..875be41 100644 --- a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogUsual.java +++ b/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 { diff --git a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogUsualVo.java b/blade-starter-log/src/main/java/org/springblade/core/log/model/LogUsualVo.java deleted file mode 100644 index a3bdb63..0000000 --- a/blade-starter-log/src/main/java/org/springblade/core/log/model/LogUsualVo.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com). - *
- * 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 - *
- * http://www.gnu.org/licenses/lgpl.html - *
- * 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;
-
-}
diff --git a/pom.xml b/pom.xml
index 2f25c56..0064995 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@