宝象购修复
This commit is contained in:
+2
-2
@@ -21,9 +21,9 @@ public enum ApiCode {
|
||||
**/
|
||||
SUCCESS(200, "操作成功"),
|
||||
/**
|
||||
* 非法访问
|
||||
* 登录状态失效 请重新登录
|
||||
**/
|
||||
UNAUTHORIZED(401, "非法访问"),
|
||||
UNAUTHORIZED(401, "登录状态失效 请重新登录"),
|
||||
/**
|
||||
* 没有权限
|
||||
**/
|
||||
|
||||
+231
@@ -0,0 +1,231 @@
|
||||
/**
|
||||
* Copyright (C) 2018-2022
|
||||
* All rights reserved, Designed By www.yixiang.co
|
||||
* 注意：
|
||||
* 本软件为www.yixiang.co开发研制，未经购买不得使用
|
||||
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
|
||||
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
|
||||
*/
|
||||
package cn.iocoder.yudao.framework.common.pojo;
|
||||
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.iocoder.yudao.framework.common.exception.ApiCode;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* API 返回结果
|
||||
* @author hupeng
|
||||
* @date 2020-04-30
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
public class ApiResult<T> implements Serializable {
|
||||
private static final long serialVersionUID = 8004487252556526569L;
|
||||
|
||||
/**
|
||||
* 响应码
|
||||
*/
|
||||
@ApiModelProperty(value = "响应码")
|
||||
private int status;
|
||||
|
||||
/**
|
||||
* 是否成功
|
||||
*/
|
||||
@ApiModelProperty(value = "是否成功：成功true，失败false")
|
||||
private boolean success;
|
||||
|
||||
/**
|
||||
* 响应消息
|
||||
*/
|
||||
@ApiModelProperty(value = "响应消息")
|
||||
private String msg;
|
||||
|
||||
/**
|
||||
* 总条数
|
||||
*/
|
||||
@ApiModelProperty(value = "总条数")
|
||||
private Integer total;
|
||||
|
||||
/**
|
||||
* 总页数
|
||||
*/
|
||||
@ApiModelProperty(value = "总页数")
|
||||
private Integer totalPage;
|
||||
|
||||
/**
|
||||
* 响应数据
|
||||
*/
|
||||
@ApiModelProperty(value = "响应数据")
|
||||
private T data;
|
||||
|
||||
/**
|
||||
* 响应时间
|
||||
*/
|
||||
@ApiModelProperty(value = "响应时间")
|
||||
//@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date time;
|
||||
|
||||
public ApiResult() {
|
||||
time = new Date();
|
||||
}
|
||||
|
||||
public static ApiResult<Boolean> result(boolean flag){
|
||||
if (flag){
|
||||
return ok();
|
||||
}
|
||||
return fail();
|
||||
}
|
||||
|
||||
public static ApiResult<Boolean> result(ApiCode apiCode){
|
||||
return result(apiCode,null);
|
||||
}
|
||||
|
||||
public static <T> ApiResult<T> result(ApiCode apiCode, T data){
|
||||
return result(apiCode,null,data);
|
||||
}
|
||||
|
||||
public static <T> ApiResult<T> resultPage(Integer total, Integer totalPage, T data){
|
||||
return (ApiResult<T>) ApiResult.builder()
|
||||
.total(total)
|
||||
.totalPage(totalPage)
|
||||
.status(200)
|
||||
.msg(null)
|
||||
.data(data)
|
||||
.success(true)
|
||||
.time(new Date())
|
||||
.build();
|
||||
}
|
||||
|
||||
|
||||
public static <T> ApiResult<T> result(ApiCode apiCode, String message, T data){
|
||||
boolean success = false;
|
||||
if (apiCode.getCode() == ApiCode.SUCCESS.getCode()){
|
||||
success = true;
|
||||
}
|
||||
if (StrUtil.isBlank(message)){
|
||||
message = apiCode.getMessage();
|
||||
}
|
||||
return (ApiResult<T>) ApiResult.builder()
|
||||
.status(apiCode.getCode())
|
||||
.msg(message)
|
||||
.data(data)
|
||||
.success(success)
|
||||
.time(new Date())
|
||||
.build();
|
||||
}
|
||||
|
||||
public static ApiResult<Boolean> ok(){
|
||||
return ok(null);
|
||||
}
|
||||
|
||||
public static <T> ApiResult<T> ok(T data){
|
||||
return result(ApiCode.SUCCESS,data);
|
||||
}
|
||||
|
||||
public static <T> ApiResult<T> ok(T data, String message){
|
||||
return result(ApiCode.SUCCESS,message,data);
|
||||
}
|
||||
|
||||
public static ApiResult<Map<String,Object>> okMap(String key, Object value){
|
||||
Map<String,Object> map = new HashMap<>(1);
|
||||
map.put(key,value);
|
||||
return ok(map);
|
||||
}
|
||||
|
||||
public static ApiResult<Boolean> fail(ApiCode apiCode){
|
||||
return result(apiCode,null);
|
||||
}
|
||||
|
||||
public static ApiResult<String> fail(String message){
|
||||
return result(ApiCode.FAIL,message,null);
|
||||
|
||||
}
|
||||
|
||||
public static <T> ApiResult<T> fail(ApiCode apiCode, T data){
|
||||
if (ApiCode.SUCCESS == apiCode){
|
||||
throw new RuntimeException("失败结果状态码不能为" + ApiCode.SUCCESS.getCode());
|
||||
}
|
||||
return result(apiCode,data);
|
||||
|
||||
}
|
||||
|
||||
public static ApiResult<String> fail(Integer errorCode, String message){
|
||||
return new ApiResult<String>()
|
||||
.setSuccess(false)
|
||||
.setStatus(errorCode)
|
||||
.setMsg(message);
|
||||
}
|
||||
|
||||
public static ApiResult<Map<String,Object>> fail(String key, Object value){
|
||||
Map<String,Object> map = new HashMap<>(1);
|
||||
map.put(key,value);
|
||||
return result(ApiCode.FAIL,map);
|
||||
}
|
||||
|
||||
public static <T> ApiResult<T> resultPage(T t, int limit){
|
||||
List<Object> list = (List<Object>) t;
|
||||
int count = list.size() / limit;
|
||||
if (list.size() == 0) {
|
||||
return (ApiResult<T>) ApiResult.builder()
|
||||
.total(0)
|
||||
.totalPage(0)
|
||||
.status(200)
|
||||
.msg(null)
|
||||
.data(list)
|
||||
.success(true)
|
||||
.time(new Date())
|
||||
.build();
|
||||
}
|
||||
if (list.size() <= limit) {
|
||||
return (ApiResult<T>) ApiResult.builder()
|
||||
.total(list.size())
|
||||
.totalPage(1)
|
||||
.status(200)
|
||||
.msg(null)
|
||||
.data(list)
|
||||
.success(true)
|
||||
.time(new Date())
|
||||
.build();
|
||||
} else if (count % limit == 0) {
|
||||
return (ApiResult<T>) ApiResult.builder()
|
||||
.total(list.size())
|
||||
.totalPage(count)
|
||||
.status(200)
|
||||
.msg(null)
|
||||
.data(list)
|
||||
.success(true)
|
||||
.time(new Date())
|
||||
.build();
|
||||
} else {
|
||||
return (ApiResult<T>) ApiResult.builder()
|
||||
.total(list.size())
|
||||
.totalPage(count+1)
|
||||
.status(200)
|
||||
.msg(null)
|
||||
.data(list)
|
||||
.success(true)
|
||||
.time(new Date())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
public static ApiResult<Boolean> fail() {
|
||||
return fail(ApiCode.FAIL);
|
||||
}
|
||||
}
|
||||
+4
-2
@@ -5,6 +5,7 @@ import cn.hutool.core.map.MapUtil;
|
||||
import cn.hutool.extra.servlet.ServletUtil;
|
||||
import cn.iocoder.yudao.framework.common.exception.ServiceException;
|
||||
import cn.iocoder.yudao.framework.common.exception.YshopException;
|
||||
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService;
|
||||
import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateReqDTO;
|
||||
@@ -217,9 +218,10 @@ public class GlobalExceptionHandler {
|
||||
}
|
||||
|
||||
@ExceptionHandler(value = YshopException.class)
|
||||
public CommonResult<?> yshopException(YshopException ex){
|
||||
public ApiResult<?> yshopException(YshopException ex){
|
||||
log.info("[YshopException]",ex);
|
||||
return CommonResult.error(ex.getErrorCode(), ex.getMessage());
|
||||
return ApiResult.fail(ex.getErrorCode(),ex.getMessage());
|
||||
//return CommonResult.error(ex.getErrorCode(), ex.getMessage());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user