init

2c61cd9b · 郑云飞 · 02814976 · 2c61cd9b · 2c61cd9b · 2c61cd9b
Commit 2c61cd9b authored Mar 01, 2023 by 郑云飞
7 changed files
--- a/xinrenli/pom.xml
+++ b/xinrenli/pom.xml
@@ -7,7 +7,7 @@
        <groupId>com.ruoyi</groupId>
        <version>4.5.0</version>
    </parent>
-    <modelVersion>4.5.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
    <artifactId>xinrenli</artifactId>

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/entity/Coupon.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/entity/Coupon.java
@@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,32 +22,30 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("by_coupon")
-@ApiModel(value="Coupon对象", description="优惠卷表")
+@Schema(name="Coupon对象", description="优惠卷表")
 public class Coupon implements Serializable {
    private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "自增id")
+    @Schema(name = "自增id")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    private Integer userId;
-    @ApiModelProperty(value = "券类型")
+    @Schema(name = "券类型")
    private Integer couponType;
-    @ApiModelProperty(value = "优惠内容：满减")
+    @Schema(name = "优惠内容：满减")
    private Integer fullSubtraction;
-    @ApiModelProperty(value = "使用门槛：
+    @Schema(name = "使用门槛： 最低消费")
-最低消费")
    private Integer minUsed;
-    @ApiModelProperty(value = "生效时间")
+    @Schema(name = "生效时间")
    private LocalDateTime effectiveTime;
-    @ApiModelProperty(value = "失效时间")
+    @Schema(name = "失效时间")
    private LocalDateTime failureTime;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/entity/Order.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/entity/Order.java
@@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,49 +22,49 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("by_order")
-@ApiModel(value="Order对象", description="订单表")
+@Schema(name="Order对象", description="订单表")
 public class Order implements Serializable {
    private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "自增id")
+    @Schema(name = "自增id")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
-    @ApiModelProperty(value = "用户id")
+    @Schema(name = "用户id")
    private Long userId;
-    @ApiModelProperty(value = "标题")
+    @Schema(name = "标题")
    private String title;
-    @ApiModelProperty(value = "联系人")
+    @Schema(name = "联系人")
    private String linkman;
-    @ApiModelProperty(value = "联系电话")
+    @Schema(name = "联系电话")
    private String phone;
-    @ApiModelProperty(value = "维修时间")
+    @Schema(name = "维修时间")
    private LocalDateTime repairTime;
-    @ApiModelProperty(value = "维修地址")
+    @Schema(name = "维修地址")
    private String repairAddress;
-    @ApiModelProperty(value = "预算金额")
+    @Schema(name = "预算金额")
    private Double budget;
-    @ApiModelProperty(value = "图片地址")
+    @Schema(name = "图片地址")
    private String imageSrc;
-    @ApiModelProperty(value = "视频地址")
+    @Schema(name = "视频地址")
    private String videoSrc;
-    @ApiModelProperty(value = "语音地址")
+    @Schema(name = "语音地址")
    private String audioSrc;
-    @ApiModelProperty(value = "备注说明")
+    @Schema(name = "备注说明")
    private String remark;
-    @ApiModelProperty(value = "订单状态：0 已发布；1 已驳回；2 待支付；3 已接单；4 退款中；5 已退款")
+    @Schema(name = "订单状态：0 已发布；1 已驳回；2 待支付；3 已接单；4 退款中；5 已退款")
    private Integer status;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/entity/UserComment.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/entity/UserComment.java
@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -22,22 +21,22 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("by_user_comment")
-@ApiModel(value="UserComment对象", description="用户评论表")
+@Schema(name="UserComment对象", description="用户评论表")
 public class UserComment implements Serializable {
    private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "id自增")
+    @Schema(name = "id自增")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
-    @ApiModelProperty(value = "文章id")
+    @Schema(name = "文章id")
    private Integer articleId;
-    @ApiModelProperty(value = "用户id")
+    @Schema(name = "用户id")
    private Long userId;
-    @ApiModelProperty(value = "用户评论内容")
+    @Schema(name = "用户评论内容")
    private String content;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/entity/UserFeedback.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/entity/UserFeedback.java
@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -22,22 +21,22 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("by_user_feedback")
-@ApiModel(value="UserFeedback对象", description="用户反馈表")
+@Schema(name="UserFeedback对象", description="用户反馈表")
 public class UserFeedback implements Serializable {
    private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "自增id")
+    @Schema(name = "自增id")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
-    @ApiModelProperty(value = "用户id")
+    @Schema(name = "用户id")
    private Long userId;
-    @ApiModelProperty(value = "反馈标题")
+    @Schema(name = "反馈标题")
    private String title;
-    @ApiModelProperty(value = "反馈内容")
+    @Schema(name = "反馈内容")
    private String content;

--- a/xinrenli/src/main/java/com/yongqi/xinrenli/entity/WxUser.java
+++ b/xinrenli/src/main/java/com/yongqi/xinrenli/entity/WxUser.java
@@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,93 +23,93 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("by_wx_user")
-@ApiModel(value="WxUser对象", description="微信用户")
+@Schema(name="WxUser对象", description="微信用户")
 public class WxUser implements Serializable {
    private static final long serialVersionUID = 1L;
-    @ApiModelProperty(value = "主键标识")
+    @Schema(name = "主键标识")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
-    @ApiModelProperty(value = "微信用户的唯一标识")
+    @Schema(name = "微信用户的唯一标识")
    private String openId;
-    @ApiModelProperty(value = "是否是团长：1：是，2：否")
+    @Schema(name = "是否是团长：1：是，2：否")
    private Boolean headOrNot;
-    @ApiModelProperty(value = "用户昵称")
+    @Schema(name = "用户昵称")
    private String nickname;
-    @ApiModelProperty(value = "用户的性别，值为1时是男性，值为2时是女性，值为0时是未知")
+    @Schema(name = "用户的性别，值为1时是男性，值为2时是女性，值为0时是未知")
    private Integer sex;
-    @ApiModelProperty(value = "用户个人资料填写的省份")
+    @Schema(name = "用户个人资料填写的省份")
    private String province;
-    @ApiModelProperty(value = "普通用户个人资料填写的城市")
+    @Schema(name = "普通用户个人资料填写的城市")
    private String city;
-    @ApiModelProperty(value = "国家，如中国为CN")
+    @Schema(name = "国家，如中国为CN")
    private String country;
-    @ApiModelProperty(value = "用户头像")
+    @Schema(name = "用户头像")
    private String headImgUrl;
-    @ApiModelProperty(value = "只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段。")
+    @Schema(name = "只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段。")
    private String unionId;
-    @ApiModelProperty(value = "手机号")
+    @Schema(name = "手机号")
    private String mobile;
-    @ApiModelProperty(value = "授权手机号")
+    @Schema(name = "授权手机号")
    private String authMobile;
-    @ApiModelProperty(value = "商场编码")
+    @Schema(name = "商场编码")
    private String mallCode;
-    @ApiModelProperty(value = "会员卡号")
+    @Schema(name = "会员卡号")
    private String userCode;
    private String sessionKey;
-    @ApiModelProperty(value = "是否关注微信(1:关注，0：取消关注)")
+    @Schema(name = "是否关注微信(1:关注，0：取消关注)")
    private Integer wechatSubscribe;
-    @ApiModelProperty(value = "是否取消关注(关注后又取消，和oauth取得的会员区别)(1:取消，0：未取消)")
+    @Schema(name = "是否取消关注(关注后又取消，和oauth取得的会员区别)(1:取消，0：未取消)")
    private Integer cancelSubscribe;
-    @ApiModelProperty(value = "微信原始ID")
+    @Schema(name = "微信原始ID")
    private String wechatOriginalId;
-    @ApiModelProperty(value = "下单次数")
+    @Schema(name = "下单次数")
    private Integer orderNum;
-    @ApiModelProperty(value = "累计消费")
+    @Schema(name = "累计消费")
    private BigDecimal cumulativeConsumption;
-    @ApiModelProperty(value = "最近消费时间")
+    @Schema(name = "最近消费时间")
    private LocalDateTime lastConsumptionTime;
-    @ApiModelProperty(value = "创建时间")
+    @Schema(name = "创建时间")
    private LocalDateTime createTime;
-    @ApiModelProperty(value = "创建者")
+    @Schema(name = "创建者")
    private String createBy;
-    @ApiModelProperty(value = "创建人Code")
+    @Schema(name = "创建人Code")
    private String createCode;
-    @ApiModelProperty(value = "更新时间")
+    @Schema(name = "更新时间")
    private LocalDateTime modifyTime;
-    @ApiModelProperty(value = "更新者")
+    @Schema(name = "更新者")
    private String modifyBy;
-    @ApiModelProperty(value = "更新者code")
+    @Schema(name = "更新者code")
    private String modifyCode;
-    @ApiModelProperty(value = "删除状态  0：未删除 1：删除")
+    @Schema(name = "删除状态  0：未删除 1：删除")
    private Boolean deleteFlag;

--- a/xinrenli/src/test/java/com/yongqi/xinrenli/XinrenliApplicationTests.java
+++ b/xinrenli/src/test/java/com/yongqi/xinrenli/XinrenliApplicationTests.java
-package com.yongqi.xinrenli;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-@SpringBootTest
-class XinrenliApplicationTests {
-    @Test
-    void contextLoads() {
-    }
-}