From 6cadf25368a8856846f5955ffe9661a1896f7730 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 14 Mar 2023 16:13:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mdd/common/entity/Crontab.java | 2 +- .../com/mdd/common/entity/DecoratePage.java | 12 +++---- .../com/mdd/common/entity/DecorateTabbar.java | 14 ++++---- .../mdd/common/entity/album/AlbumCate.java | 2 +- .../common/entity/notice/NoticeRecord.java | 36 +++++++++---------- .../java/com/mdd/common/entity/user/User.java | 2 +- .../com/mdd/common/entity/user/UserAuth.java | 2 +- .../com/mdd/front/LikeFrontInterceptor.java | 1 - .../com/mdd/front/config/SwaggerConfig.java | 2 -- .../front/vo/article/ArticleCollectVo.java | 17 +++++---- .../mdd/front/vo/article/ArticleDetailVo.java | 23 ++++++------ ...itional-spring-configuration-metadata.json | 10 ------ .../src/main/resources/application.yml | 6 +--- 13 files changed, 59 insertions(+), 70 deletions(-) delete mode 100644 server/like-front/src/main/java/com/mdd/front/config/SwaggerConfig.java diff --git a/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java b/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java index e706e656..f0c31f3e 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/Crontab.java @@ -17,7 +17,7 @@ public class Crontab implements Serializable { @TableId(value="id", type= IdType.AUTO) private Integer id; // 主键 private String name; // 任务名称 - private String types; // 任务分组 + private String types; // 任务分组 private String command; // 执行命令 private String rules; // 执行规则 private String remark; // 备注信息 diff --git a/server/like-common/src/main/java/com/mdd/common/entity/DecoratePage.java b/server/like-common/src/main/java/com/mdd/common/entity/DecoratePage.java index 6a4dffc0..1832814e 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/DecoratePage.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/DecoratePage.java @@ -15,11 +15,11 @@ public class DecoratePage implements Serializable { private static final long serialVersionUID = 1L; @TableId(value="id", type= IdType.AUTO) - private Integer id; - private Integer pageType; - private String pageName; - private String pageData; - private Long createTime; - private Long updateTime; + private Integer id; // 主键 + private Integer pageType; // 页面类型 + private String pageName; // 页面名称 + private String pageData; // 页面数据 + private Long createTime; // 创建时间 + private Long updateTime; // 更新时间 } diff --git a/server/like-common/src/main/java/com/mdd/common/entity/DecorateTabbar.java b/server/like-common/src/main/java/com/mdd/common/entity/DecorateTabbar.java index 3e20b158..3b35367b 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/DecorateTabbar.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/DecorateTabbar.java @@ -15,12 +15,12 @@ public class DecorateTabbar implements Serializable { private static final long serialVersionUID = 1L; @TableId(value="id", type= IdType.AUTO) - private Integer id; - private String name; - private String selected; - private String unselected; - private String link; - private Long createTime; - private Long updateTime; + private Integer id; // 主键 + private String name; // 导航名称 + private String selected; // 未选图标 + private String unselected; // 已选图标 + private String link; // 链接地址 + private Long createTime; // 创建时间 + private Long updateTime; // 更新时间 } diff --git a/server/like-common/src/main/java/com/mdd/common/entity/album/AlbumCate.java b/server/like-common/src/main/java/com/mdd/common/entity/album/AlbumCate.java index 4c9e9397..b6ea048b 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/album/AlbumCate.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/album/AlbumCate.java @@ -19,7 +19,7 @@ public class AlbumCate implements Serializable { private Integer pid; // 父级ID private Integer type; // 分类类型: [10=图片,20=视频] private String name; // 分类名称 - private Integer isDelete; // 是否删除: 0=否，1=是 + private Integer isDelete; // 是否删除: [0=否,1=是] private Long createTime; // 创建时间 private Long updateTime; // 更新时间 private Long deleteTime; // 删除时间 diff --git a/server/like-common/src/main/java/com/mdd/common/entity/notice/NoticeRecord.java b/server/like-common/src/main/java/com/mdd/common/entity/notice/NoticeRecord.java index 1221e7ee..a0b37177 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/notice/NoticeRecord.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/notice/NoticeRecord.java @@ -15,23 +15,23 @@ public class NoticeRecord implements Serializable { private static final long serialVersionUID = 1L; @TableId(value="id", type= IdType.AUTO) - private Integer id; - private Integer scene; - private Integer userId; - private String account; - private String title; - private String code; - private String content; - private String error; - private Integer sender; - private Integer receiver; - private Integer status; - private Integer isRead; - private Integer isCaptcha; - private Integer isDelete; - private Long expireTime; - private Long createTime; - private Long updateTime; - private Long deleteTime; + private Integer id; // 主键 + private Integer scene; // 场景 + private Integer userId; // 用户 + private String account; // 账号 + private String title; // 标题 + private String code; // 编码 + private String content; // 内容 + private String error; // 错误 + private Integer sender; // 发送类型: [1=系统, 2=短信, 3=公众号, 4=小程序] + private Integer receiver; // 接收对象: [1=用户, 2=平台] + private Integer status; // 通知状态: [0=等待, 1=成功, 2=失败] + private Integer isRead; // 已读状态: [0=未读, 1=已读] + private Integer isCaptcha; // 是验证码: [0=否的, 1=是的] + private Integer isDelete; // 是否删除: [0=否的, 1=是的] + private Long expireTime; // 失效时间 + private Long createTime; // 创建时间 + private Long updateTime; // 更新时间 + private Long deleteTime; // 删除时间 } diff --git a/server/like-common/src/main/java/com/mdd/common/entity/user/User.java b/server/like-common/src/main/java/com/mdd/common/entity/user/User.java index 48b03c65..8ed0f55d 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/user/User.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/user/User.java @@ -16,7 +16,7 @@ public class User implements Serializable { @TableId(value="id", type= IdType.AUTO) private Integer id; // 主键 - private Integer sn; // 编号 + private Integer sn; // 编号 private String avatar; // 用户头像 private String realName; // 真实姓名 private String nickname; // 用户昵称 diff --git a/server/like-common/src/main/java/com/mdd/common/entity/user/UserAuth.java b/server/like-common/src/main/java/com/mdd/common/entity/user/UserAuth.java index 8667165f..2ad93519 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/user/UserAuth.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/user/UserAuth.java @@ -19,7 +19,7 @@ public class UserAuth implements Serializable { private Integer userId; // 用户Id private String openid; // Openid private String unionid; // Unionid - private Integer terminal; // 客户端类型: [1=微信小程序, 2=微信公众号, 3=手机H5；4=电脑PC, 5=苹果APP, 6=安卓APP] + private Integer terminal; // 客户端类型: [1=微信小程序, 2=微信公众号, 3=手机H5；4=电脑PC, 5=苹果APP, 6=安卓APP] private Long createTime; // 创建时间 private Long updateTime; // 更新时间 diff --git a/server/like-front/src/main/java/com/mdd/front/LikeFrontInterceptor.java b/server/like-front/src/main/java/com/mdd/front/LikeFrontInterceptor.java index a3758e2b..f581f201 100644 --- a/server/like-front/src/main/java/com/mdd/front/LikeFrontInterceptor.java +++ b/server/like-front/src/main/java/com/mdd/front/LikeFrontInterceptor.java @@ -10,7 +10,6 @@ import com.mdd.common.enums.HttpEnum; import com.mdd.common.exception.LoginException; import com.mdd.common.mapper.user.UserMapper; import com.mdd.common.util.StringUtils; -import io.swagger.models.auth.In; import org.jetbrains.annotations.NotNull; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; diff --git a/server/like-front/src/main/java/com/mdd/front/config/SwaggerConfig.java b/server/like-front/src/main/java/com/mdd/front/config/SwaggerConfig.java deleted file mode 100644 index 30f83156..00000000 --- a/server/like-front/src/main/java/com/mdd/front/config/SwaggerConfig.java +++ /dev/null @@ -1,2 +0,0 @@ -package com.mdd.front.config;public class SwaggerConfig { -} diff --git a/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleCollectVo.java b/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleCollectVo.java index de6f269a..c0f2b25a 100644 --- a/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleCollectVo.java +++ b/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleCollectVo.java @@ -4,17 +4,20 @@ import lombok.Data; import java.io.Serializable; +/** + * 文章收藏Vo + */ @Data public class ArticleCollectVo implements Serializable { private static final long serialVersionUID = 1L; - private Integer id; - private Integer articleId; - private String title; - private String image; - private String intro; - private Integer visit; - private String createTime; + private Integer id; // 主键 + private Integer articleId; // 文章ID + private String title; // 文章标题 + private String image; // 文章封面 + private String intro; // 文章简介 + private Integer visit; // 浏览数量 + private String createTime; // 创建时间 } diff --git a/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleDetailVo.java b/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleDetailVo.java index 573580c2..22a02c65 100644 --- a/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleDetailVo.java +++ b/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleDetailVo.java @@ -4,20 +4,23 @@ import lombok.Data; import java.io.Serializable; +/** + * 文章详情Vo + */ @Data public class ArticleDetailVo implements Serializable { private static final long serialVersionUID = 1L; - private Integer id; - private String title; - private String image; - private String intro; - private String summary; - private Integer visit; - private String author; - private Boolean collect; - private String content; - private String createTime; + private Integer id; // 主键 + private String title; // 文章标题 + private String image; // 文章封面 + private String intro; // 文章简介 + private String summary; // 文章描述 + private Integer visit; // 浏览数量 + private String author; // 作者名称 + private Boolean collect; // 是否收藏 + private String content; // 文章内容 + private String createTime; // 创建时间 } diff --git a/server/like-front/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/server/like-front/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 75beb488..6a59a7b2 100644 --- a/server/like-front/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/server/like-front/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -4,16 +4,6 @@ "name": "like.upload-directory", "type": "java.lang.String", "description": "Description for like.upload-directory." - }, - { - "name": "like.token-valid-time", - "type": "java.lang.String", - "description": "Description for like.token-valid-time." - }, - { - "name": "like.token-renew-time", - "type": "java.lang.String", - "description": "Description for like.token-renew-time." } ] } \ No newline at end of file diff --git a/server/like-front/src/main/resources/application.yml b/server/like-front/src/main/resources/application.yml index 4adcd0e5..57137437 100644 --- a/server/like-front/src/main/resources/application.yml +++ b/server/like-front/src/main/resources/application.yml @@ -2,10 +2,6 @@ like: # 上传目录 upload-directory: /www/uploads/likeadmin-java/ - # 登录有效时间 (单位秒) - token-valid-time: 7200 - # 登录续签时间 (不足以下秒数续签) - token-renew-time: 1800 # 服务配置 server: @@ -69,7 +65,7 @@ mybatis-plus: # Sa-token配置 sa-token: - token-name: token # token的名称 + token-name: like-token # token的名称 timeout: 2592000 # token有效期单位s(默认30天,-1代表永不过期) activity-timeout: -1 # token临时有效期(指定时间无操作掉线) is-concurrent: true # 是否允许同一账号并发登录