From 4e3dce703de1fc7811e1d8f5b3dcbaaa8256ada7 Mon Sep 17 00:00:00 2001 From: YangPeng <3074487626@qq.com> Date: Mon, 7 Oct 2024 19:52:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix():=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/common/core/domain/Result.java | 7 ++++--- .../muyu/service/impl/CarFenceServiceMybaitsImpl.java | 9 ++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/domain/Result.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/domain/Result.java index 70faa40..78453ac 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/domain/Result.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/domain/Result.java @@ -3,9 +3,9 @@ package com.muyu.common.core.domain; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.HttpStatus; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.io.Serializable; @@ -15,7 +15,7 @@ import java.io.Serializable; * @author muyu */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor public class Result implements Serializable { @@ -33,6 +33,7 @@ public class Result implements Serializable { public static final int WARN = HttpStatus.WARN; private static final long serialVersionUID = 1L; + private int code; private String msg; @@ -96,8 +97,8 @@ public class Result implements Serializable { private static Result restResult (T data, int code, String msg) { return Result.builder() .code(code) - .data(data) .msg(msg) + .data(data) .build(); } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java index 533555f..23bf0b0 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java @@ -53,8 +53,15 @@ public class CarFenceServiceMybaitsImpl extends ServiceImpl Date: Mon, 7 Oct 2024 20:05:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix():=E4=BF=AE=E5=A4=8Denterpise-cache?= =?UTF-8?q?=E7=9A=84pom=E5=90=8D=E7=A7=B0=E5=86=B2=E7=AA=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{enterprise-cache => enterpise-cache}/pom.xml | 2 +- .../java/com/muyu/enterprise/cache/VehicleCacheService.java | 0 ...springframework.boot.autoconfigure.AutoConfiguration.imports | 0 cloud-modules/cloud-modules-enterprise/pom.xml | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) rename cloud-modules/cloud-modules-enterprise/{enterprise-cache => enterpise-cache}/pom.xml (96%) rename cloud-modules/cloud-modules-enterprise/{enterprise-cache => enterpise-cache}/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java (100%) rename cloud-modules/cloud-modules-enterprise/{enterprise-cache => enterpise-cache}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) diff --git a/cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml similarity index 96% rename from cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml index b710426..5086d3c 100644 --- a/cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml @@ -9,7 +9,7 @@ 3.6.3 - enterprise-cache + enterpise-cache 17 diff --git a/cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java diff --git a/cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/cloud-modules/cloud-modules-enterprise/pom.xml b/cloud-modules/cloud-modules-enterprise/pom.xml index 50e87e6..ba3a479 100644 --- a/cloud-modules/cloud-modules-enterprise/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/pom.xml @@ -22,6 +22,7 @@ + enterpise-cache enterpise-common enterpise-remote enterpise-service