diff --git a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/Result.java b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/Result.java index f3bd3e5..58f2fcb 100644 --- a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/Result.java +++ b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/Result.java @@ -39,19 +39,19 @@ public class Result implements Serializable { this.time = System.currentTimeMillis(); } - private Result(IResultCode resultCode) { + private Result(ResultCode resultCode) { this(resultCode, null, resultCode.getMsg()); } - private Result(IResultCode resultCode, String msg) { + private Result(ResultCode resultCode, String msg) { this(resultCode, null, msg); } - private Result(IResultCode resultCode, T data) { + private Result(ResultCode resultCode, T data) { this(resultCode, data, resultCode.getMsg()); } - private Result(IResultCode resultCode, T data, String msg) { + private Result(ResultCode resultCode, T data, String msg) { this(resultCode.getCode(), data, msg); } @@ -69,7 +69,7 @@ public class Result implements Serializable { * @param 泛型标识 * @return ApiResult */ - public static Result success(IResultCode resultCode) { + public static Result success(ResultCode resultCode) { return new Result<>(resultCode); } @@ -81,7 +81,7 @@ public class Result implements Serializable { return new Result<>(ResultCode.SUCCESS); } - public static Result success(IResultCode resultCode, String msg) { + public static Result success(ResultCode resultCode, String msg) { return new Result<>(resultCode, msg); } @@ -90,7 +90,7 @@ public class Result implements Serializable { } public static Result data(T data, String msg) { - return data(ResultCode.SUCCESS.code, data, msg); + return data(ResultCode.SUCCESS.getCode(), data, msg); } public static Result data(int code, T data, String msg) { @@ -109,11 +109,11 @@ public class Result implements Serializable { return new Result<>(code, null, msg); } - public static Result fail(IResultCode resultCode) { + public static Result fail(ResultCode resultCode) { return new Result<>(resultCode); } - public static Result fail(IResultCode resultCode, String msg) { + public static Result fail(ResultCode resultCode, String msg) { return new Result<>(resultCode, msg); } diff --git a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/ResultCode.java b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/ResultCode.java index 750625f..d94a88c 100644 --- a/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/ResultCode.java +++ b/cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/api/ResultCode.java @@ -11,7 +11,7 @@ import lombok.Getter; @Getter @AllArgsConstructor -public enum ResultCode implements IResultCode { +public enum ResultCode { /** * 操作成功 @@ -335,9 +335,9 @@ public enum ResultCode implements IResultCode { /** * 状态码 */ - final int code; + private final int code; /** * 消息内容 */ - final String msg; + private final String msg; } diff --git a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokLabelOrganizeController.java b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokLabelOrganizeController.java index 1720fd5..5c220e7 100644 --- a/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokLabelOrganizeController.java +++ b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/src/main/java/com/baiye/controller/TiktokLabelOrganizeController.java @@ -32,7 +32,7 @@ public class TiktokLabelOrganizeController { @PostMapping("/save") @ApiOperation("标签组新增") public Result add(@Validated({AddGroup.class}) @RequestBody TiktokLabelOrganizeEntity labelOrganizeEntity) { - labelOrganizeService.saveLabelOrganize(labelOrganizeEntity); + labelOrganizeService.save(labelOrganizeEntity); return Result.success(); } diff --git a/pom.xml b/pom.xml index 218b8fa..a2408f8 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.3.2.RELEASE @@ -119,6 +119,7 @@ + org.springframework.cloud