From 0b077806196ceb8a68af93f00880ccc70aee50c2 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 07 七月 2022 18:08:14 +0800 Subject: [PATCH] add 整合 springdoc 移除 knife4j --- ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java index de095ec..d878006 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -7,8 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -25,14 +24,14 @@ @Data @TableName("sys_logininfor") @ExcelIgnoreUnannotated -@ApiModel("绯荤粺璁块棶璁板綍涓氬姟瀵硅薄") +@Schema(name = "绯荤粺璁块棶璁板綍涓氬姟瀵硅薄") public class SysLogininfor implements Serializable { private static final long serialVersionUID = 1L; /** * ID */ - @ApiModelProperty(value = "璁块棶ID") + @Schema(name = "璁块棶ID") @ExcelProperty(value = "搴忓彿") @TableId(value = "info_id") private Long infoId; @@ -40,14 +39,14 @@ /** * 鐢ㄦ埛璐﹀彿 */ - @ApiModelProperty(value = "鐢ㄦ埛璐﹀彿") + @Schema(name = "鐢ㄦ埛璐﹀彿") @ExcelProperty(value = "鐢ㄦ埛璐﹀彿") private String userName; /** * 鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触 */ - @ApiModelProperty(value = "鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触") + @Schema(name = "鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触") @ExcelProperty(value = "鐧诲綍鐘舵��", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_common_status") private String status; @@ -55,49 +54,49 @@ /** * 鐧诲綍IP鍦板潃 */ - @ApiModelProperty(value = "鐧诲綍IP鍦板潃") + @Schema(name = "鐧诲綍IP鍦板潃") @ExcelProperty(value = "鐧诲綍鍦板潃") private String ipaddr; /** * 鐧诲綍鍦扮偣 */ - @ApiModelProperty(value = "鐧诲綍鍦扮偣") + @Schema(name = "鐧诲綍鍦扮偣") @ExcelProperty(value = "鐧诲綍鍦扮偣") private String loginLocation; /** * 娴忚鍣ㄧ被鍨� */ - @ApiModelProperty(value = "娴忚鍣ㄧ被鍨�") + @Schema(name = "娴忚鍣ㄧ被鍨�") @ExcelProperty(value = "娴忚鍣�") private String browser; /** * 鎿嶄綔绯荤粺 */ - @ApiModelProperty(value = "鎿嶄綔绯荤粺") + @Schema(name = "鎿嶄綔绯荤粺") @ExcelProperty(value = "鎿嶄綔绯荤粺") private String os; /** * 鎻愮ず娑堟伅 */ - @ApiModelProperty(value = "鎻愮ず娑堟伅") + @Schema(name = "鎻愮ず娑堟伅") @ExcelProperty(value = "鎻愮ず娑堟伅") private String msg; /** * 璁块棶鏃堕棿 */ - @ApiModelProperty(value = "璁块棶鏃堕棿") + @Schema(name = "璁块棶鏃堕棿") @ExcelProperty(value = "璁块棶鏃堕棿") private Date loginTime; /** * 璇锋眰鍙傛暟 */ - @ApiModelProperty(value = "璇锋眰鍙傛暟") + @Schema(name = "璇锋眰鍙傛暟") @TableField(exist = false) private Map<String, Object> params = new HashMap<>(); -- Gitblit v1.9.3