From 8085edbfe688141e16a04b14338e980e15654443 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Wed, 8 Feb 2023 22:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E5=93=8D=E5=BA=94=E6=97=B6=E9=97=B4=E6=88=B3=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/top/charles7c/cnadmin/common/model/vo/R.java | 4 +---
continew-admin-ui/src/utils/request.ts | 2 +-
continew-admin-ui/src/utils/setup-mock.ts | 8 ++++----
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/R.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/R.java
index d9287192..644b9b78 100644
--- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/R.java
+++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/R.java
@@ -16,8 +16,6 @@
package top.charles7c.cnadmin.common.model.vo;
-import java.time.LocalDateTime;
-
import lombok.AccessLevel;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -55,7 +53,7 @@ public class R<V> {
/** 时间戳 */
@Schema(description = "时间戳")
- private LocalDateTime timestamp = LocalDateTime.now();
+ private long timestamp = System.currentTimeMillis();
/** 成功状态码 */
private static final int SUCCESS_CODE = HttpStatus.OK.value();
diff --git a/continew-admin-ui/src/utils/request.ts b/continew-admin-ui/src/utils/request.ts
index b8591a0f..8d9e7ab8 100644
--- a/continew-admin-ui/src/utils/request.ts
+++ b/continew-admin-ui/src/utils/request.ts
@@ -30,8 +30,8 @@ export interface HttpResponse<T = unknown> {
success: boolean; // 是否成功
code: number; // 状态码
msg: string; // 状态信息
- timestamp: string; // 时间戳
data: T; // 返回数据
+ timestamp: string; // 时间戳
}
// response interceptors
diff --git a/continew-admin-ui/src/utils/setup-mock.ts b/continew-admin-ui/src/utils/setup-mock.ts
index f341145c..c59f0295 100644
--- a/continew-admin-ui/src/utils/setup-mock.ts
+++ b/continew-admin-ui/src/utils/setup-mock.ts
@@ -10,20 +10,20 @@ export default ({ mock, setup }: { mock?: boolean; setup: () => void }) => {
export const successResponseWrap = (data: unknown) => {
return {
- data,
success: true,
code: 200,
msg: '操作成功',
- timestamp: new Date().toLocaleDateString().replace(/\//g, '-'),
+ data,
+ timestamp: new Date().getTime(),
};
};
export const failResponseWrap = (data: unknown, msg: string, code = 500) => {
return {
- data,
success: false,
code,
msg,
- timestamp: new Date().toLocaleDateString().replace(/\//g, '-'),
+ data,
+ timestamp: new Date().getTime(),
};
};