From abaaa409655e59026a17400ee3c1418bfe8562e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moshow=E9=83=91=E9=94=B4?= <moshowgame@126.com>
Date: Sun, 7 Dec 2025 00:03:29 +0800
Subject: [PATCH] fix GlobalDefaultExceptionHandler

---
 .../config/GlobalDefaultExceptionHandler.java |  9 ++-
 .../system/generator/entity/ReturnT.java      | 65 -------------------
 2 files changed, 4 insertions(+), 70 deletions(-)
 delete mode 100644 generator-web/src/main/java/com/softdev/system/generator/entity/ReturnT.java

diff --git a/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java b/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java
index 837df06..0687f9a 100644
--- a/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java
+++ b/generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java
@@ -1,12 +1,11 @@
 package com.softdev.system.generator.config;
 
-import com.softdev.system.generator.entity.ReturnT;
+import com.softdev.system.generator.entity.vo.ResultVo;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import jakarta.servlet.http.HttpServletRequest;
-
 /**
  * @author zhengkai.blog.csdn.net
  */
@@ -15,9 +14,9 @@ public class GlobalDefaultExceptionHandler {
 
     @ExceptionHandler(Exception.class)
     @ResponseBody
-    public ReturnT defaultExceptionHandler(HttpServletRequest req, Exception e) {
+    public ResultVo defaultExceptionHandler(HttpServletRequest req, Exception e) {
         e.printStackTrace();
-        return ReturnT.error("代码生成失败:"+e.getMessage());
+        return ResultVo.error("代码生成失败:"+e.getMessage());
     }
 
 }
diff --git a/generator-web/src/main/java/com/softdev/system/generator/entity/ReturnT.java b/generator-web/src/main/java/com/softdev/system/generator/entity/ReturnT.java
deleted file mode 100644
index 5b8b3c6..0000000
--- a/generator-web/src/main/java/com/softdev/system/generator/entity/ReturnT.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.softdev.system.generator.entity;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * common returnT:公共返回封装类
- *
- * @author zhengkai.blog.csdn.net
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class ReturnT extends HashMap<String, Object> {
-    private static final long serialVersionUID = 1L;
-
-    public ReturnT() {
-        put("code", 0);
-        put("msg", "success");
-    }
-
-    public static ReturnT error() {
-        return error(500, "未知异常，请联系管理员");
-    }
-
-    public static ReturnT error(String msg) {
-        return error(500, msg);
-    }
-
-    public static ReturnT error(int code, String msg) {
-        ReturnT r = new ReturnT();
-        r.put("code", code);
-        r.put("msg", msg);
-        return r;
-    }
-    public static ReturnT define(int code, String msg) {
-        ReturnT r = new ReturnT();
-        r.put("code", code);
-        r.put("msg", msg);
-        return r;
-    }
-    public static ReturnT ok(String msg) {
-        ReturnT r = new ReturnT();
-        r.put("msg", msg);
-        return r;
-    }
-
-    public static ReturnT ok(Map<String, Object> map) {
-        ReturnT r = new ReturnT();
-        r.putAll(map);
-        return r;
-    }
-
-    public static ReturnT ok() {
-        return new ReturnT();
-    }
-
-    @Override
-    public ReturnT put(String key, Object value) {
-        super.put(key, value);
-        return this;
-    }
-}