From f38d69d70e3e126d2f58971d0b4854f2aa144fc1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 22 八月 2025 14:40:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-competition/src/main/java/com/dsh/competition/util/ResultUtil.java |   54 ++++++++++++++++++++++++++++++++----------------------
 1 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/util/ResultUtil.java b/cloud-server-competition/src/main/java/com/dsh/competition/util/ResultUtil.java
index 13d8eb8..6ec3420 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/util/ResultUtil.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/util/ResultUtil.java
@@ -3,7 +3,6 @@
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 定义统一返回对象
@@ -37,7 +36,6 @@
     private T data;//返回数据
 
 
-
     public String getMsg() {
         return msg;
     }
@@ -51,7 +49,7 @@
         return code;
     }
 
-    private ResultUtil(Integer code, String msg) {
+    public ResultUtil(Integer code, String msg) {
         this.code = code;
         this.msg = msg;
     }
@@ -63,128 +61,140 @@
     }
 
 
-    public static <T> ResultUtil<T> getResult(Integer code, String msg){
+    public static <T> ResultUtil<T> getResult(Integer code, String msg) {
         return new ResultUtil<>(code, msg);
     }
 
-    public static <T> ResultUtil<T> getResult(Integer code, String msg, T data){
+    public static <T> ResultUtil<T> getResult(Integer code, String msg, T data) {
         return new ResultUtil<>(code, msg, data);
     }
 
     /**
      * 错误信息
+     *
      * @return
      */
-    public static ResultUtil error(String mag){
+    public static ResultUtil error(String mag) {
         return ResultUtil.getResult(ResultUtil.ERROR, mag, new JSONObject());
     }
 
     /**
      * 错误信息
+     *
      * @return
      */
-    public static <T> ResultUtil <T> error(String mag, T obj){
+    public static <T> ResultUtil<T> error(String mag, T obj) {
         return ResultUtil.getResult(ResultUtil.ERROR, mag, obj);
     }
 
     /**
      * token失效
+     *
      * @return
      */
-    public static ResultUtil tokenErr(){
+    public static ResultUtil tokenErr() {
         return ResultUtil.getResult(ResultUtil.TOKEN_ERROR, ResultUtil.Token, new JSONObject());
     }
 
     /**
      * token失效
+     *
      * @return
      */
-    public static ResultUtil tokenErr(String msg){
+    public static ResultUtil tokenErr(String msg) {
         return ResultUtil.getResult(ResultUtil.TOKEN_ERROR, msg, new JSONObject());
     }
 
     /**
      * 参数异常
+     *
      * @return
      */
-    public static  ResultUtil paranErr(){
-        return ResultUtil.getResult(ResultUtil.PARAM_ERROR, "PARAM_ERROR", new JSONObject());
+    public static ResultUtil paranErr(String ages) {
+        return ResultUtil.getResult(ResultUtil.PARAM_ERROR, "【" + ages + "】参数异常", new JSONObject());
     }
 
     /**
      * 参数异常
+     *
      * @return
      */
-    public static <T> ResultUtil<T> paranErr(T data){
-        return ResultUtil.getResult(ResultUtil.PARAM_ERROR, "SYSTEM_RUN_ERROR", data);
+    public static <T> ResultUtil<T> paranErr(T data) {
+        return ResultUtil.getResult(ResultUtil.PARAM_ERROR, "PARAM_ERROR", data);
     }
 
-    @Autowired
-    private static MessageUtils messageUtils;
+
     /**
      * 运行异常
+     *
      * @return
      */
-    public static ResultUtil runErr(){
+    public static ResultUtil runErr() {
         return ResultUtil.getResult(ResultUtil.RUNTIME_ERROR, "SYSTEM_RUN_ERROR", new JSONObject());
     }
 
 
     /**
      * 运行异常
+     *
      * @return
      */
-    public static <T>ResultUtil<T> runErr(T data){
+    public static <T> ResultUtil<T> runErr(T data) {
         return ResultUtil.getResult(ResultUtil.RUNTIME_ERROR, "SYSTEM_RUN_ERROR", data);
     }
 
     /**
      * 运行异常
+     *
      * @return
      */
-    public static <T>ResultUtil<T> runErr(T data, String msg){
+    public static <T> ResultUtil<T> runErr(T data, String msg) {
         return ResultUtil.getResult(ResultUtil.RUNTIME_ERROR, msg, data);
     }
 
 
     /**
      * 返回成功
+     *
      * @param
      * @return
      */
-    public static ResultUtil success(){
+    public static ResultUtil success() {
         return ResultUtil.getResult(ResultUtil.SUCCESS, "SUCCESS", new JSONObject());
     }
 
 
     /**
      * 返回成功
+     *
      * @param data
      * @param <T>
      * @return
      */
-    public static <T> ResultUtil<T> success(T data){
+    public static <T> ResultUtil<T> success(T data) {
         return ResultUtil.getResult(ResultUtil.SUCCESS, "SUCCESS", data);
     }
 
     /**
      * 返回成功
+     *
      * @param msg
      * @param data
      * @param <T>
      * @return
      */
-    public static <T> ResultUtil<T> success(String msg, T data){
+    public static <T> ResultUtil<T> success(String msg, T data) {
         return ResultUtil.getResult(ResultUtil.SUCCESS, msg, data);
     }
 
 
     /**
      * 签名无效
+     *
      * @param <T>
      * @return
      */
-    public static <T> ResultUtil<T> sign(){
+    public static <T> ResultUtil<T> sign() {
         return ResultUtil.getResult(ResultUtil.SIGN_ERROR, SIGN);
     }
 

--
Gitblit v1.7.1