From 67bfacb03541ef2ee4c1496f4cc7600014cd1005 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 18 四月 2023 17:37:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/ResultUtil.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/ResultUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/ResultUtil.java
index 186b501..a779632 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/ResultUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/ResultUtil.java
@@ -21,9 +21,9 @@
public static final Integer RUNTIME_ERROR = 10050;
- public static final String Token = "TOKEN_INVALID";
+ public static final String Token = "token无效";
- public static final String SIGN = "SIGN_INVALID";
+ public static final String SIGN = "签名无效";
@ApiModelProperty(name = "code", value = "业务状态码 10000：成功，10010：参数错误，10020：系统提示, 10030：身份校验异常，10040：签名不通过，10050：系统运行异常")
private Integer code;//备用状态码
@@ -105,16 +105,16 @@
* 参数异常
* @return
*/
- public static ResultUtil paranErr(){
- return ResultUtil.getResult(ResultUtil.PARAM_ERROR, "param_error", new Object());
+ public static ResultUtil paranErr(String ages){
+ return ResultUtil.getResult(ResultUtil.PARAM_ERROR, "【" + ages + "】参数异常", new Object());
}
/**
* 参数异常
* @return
*/
- public static <T> ResultUtil<T> paranErr(T data){
- return ResultUtil.getResult(ResultUtil.PARAM_ERROR, "system_run_error", data);
+ public static ResultUtil paranErr(){
+ return ResultUtil.getResult(ResultUtil.PARAM_ERROR, "参数异常", new Object());
}
/**
@@ -122,7 +122,7 @@
* @return
*/
public static ResultUtil runErr(){
- return ResultUtil.getResult(ResultUtil.RUNTIME_ERROR, "system_run_error", new Object());
+ return ResultUtil.getResult(ResultUtil.RUNTIME_ERROR, "系统运行异常", new Object());
}
@@ -131,7 +131,7 @@
* @return
*/
public static <T>ResultUtil<T> runErr(T data){
- return ResultUtil.getResult(ResultUtil.RUNTIME_ERROR, "system_run_error", data);
+ return ResultUtil.getResult(ResultUtil.RUNTIME_ERROR, "系统运行异常", data);
}
/**
@@ -149,7 +149,7 @@
* @return
*/
public static ResultUtil success(){
- return ResultUtil.getResult(ResultUtil.SUCCESS, "ok", new Object());
+ return ResultUtil.getResult(ResultUtil.SUCCESS, "成功", new Object());
}
@@ -160,7 +160,7 @@
* @return
*/
public static <T> ResultUtil<T> success(T data){
- return ResultUtil.getResult(ResultUtil.SUCCESS, "ok", data);
+ return ResultUtil.getResult(ResultUtil.SUCCESS, "成功", data);
}
/**
--
Gitblit v1.7.1