From 4d86ff133acc0e02c8b9fcd58f9112dac7afca2f Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Thu, 24 Feb 2022 19:58:48 +0800
Subject: [PATCH] swagger接口返回值，显示的是object问题
---
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java | 20 ++++++++++----------
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
index a679baf..6b7724e 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
@@ -71,16 +71,16 @@ public class Result<T> implements Serializable {
}
@Deprecated
- public static Result<Object> ok() {
- Result<Object> r = new Result<Object>();
+ public static<T> Result<T> ok() {
+ Result<T> r = new Result<T>();
r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200);
return r;
}
@Deprecated
- public static Result<Object> ok(String msg) {
- Result<Object> r = new Result<Object>();
+ public static<T> Result<T> ok(String msg) {
+ Result<T> r = new Result<T>();
r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200);
r.setMessage(msg);
@@ -88,8 +88,8 @@ public class Result<T> implements Serializable {
}
@Deprecated
- public static Result<Object> ok(Object data) {
- Result<Object> r = new Result<Object>();
+ public static<T> Result<T> ok(T data) {
+ Result<T> r = new Result<T>();
r.setSuccess(true);
r.setCode(CommonConstant.SC_OK_200);
r.setResult(data);
@@ -140,12 +140,12 @@ public class Result<T> implements Serializable {
return r;
}
- public static Result<Object> error(String msg) {
+ public static<T> Result<T> error(String msg) {
return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg);
}
- public static Result<Object> error(int code, String msg) {
- Result<Object> r = new Result<Object>();
+ public static<T> Result<T> error(int code, String msg) {
+ Result<T> r = new Result<T>();
r.setCode(code);
r.setMessage(msg);
r.setSuccess(false);
@@ -162,7 +162,7 @@ public class Result<T> implements Serializable {
/**
* 无权限访问返回结果
*/
- public static Result<Object> noauth(String msg) {
+ public static<T> Result<T> noauth(String msg) {
return error(CommonConstant.SC_JEECG_NO_AUTHZ, msg);
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
index dc38911..e08b442 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
@@ -39,7 +39,7 @@ public class DuplicateCheckController {
*/
@RequestMapping(value = "/check", method = RequestMethod.GET)
@ApiOperation("重复校验接口")
- public Result<Object> doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) {
+ public Result<String> doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) {
Long num = null;
log.info("----duplicate check------："+ duplicateCheckVo.toString());
--
libgit2 0.22.2