diff --git a/src/main/java/io/linfeng/common/response/AppChildrenCommentResponse.java b/src/main/java/io/linfeng/common/vo/AppChildrenCommentResponse.java similarity index 96% rename from src/main/java/io/linfeng/common/response/AppChildrenCommentResponse.java rename to src/main/java/io/linfeng/common/vo/AppChildrenCommentResponse.java index 05736fe..893490f 100644 --- a/src/main/java/io/linfeng/common/response/AppChildrenCommentResponse.java +++ b/src/main/java/io/linfeng/common/vo/AppChildrenCommentResponse.java @@ -9,7 +9,7 @@ * 版权所有 ,侵权必究! * ----------------------------------- */ -package io.linfeng.common.response; +package io.linfeng.common.vo; import com.baomidou.mybatisplus.annotation.TableId; import io.linfeng.modules.admin.entity.AppUserEntity; @@ -17,7 +17,6 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; -import java.util.List; /** * diff --git a/src/main/java/io/linfeng/common/response/AppCommentResponse.java b/src/main/java/io/linfeng/common/vo/AppCommentResponse.java similarity index 94% rename from src/main/java/io/linfeng/common/response/AppCommentResponse.java rename to src/main/java/io/linfeng/common/vo/AppCommentResponse.java index be6a3db..610b95f 100644 --- a/src/main/java/io/linfeng/common/response/AppCommentResponse.java +++ b/src/main/java/io/linfeng/common/vo/AppCommentResponse.java @@ -9,10 +9,9 @@ * 版权所有 ,侵权必究! * ----------------------------------- */ -package io.linfeng.common.response; +package io.linfeng.common.vo; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import io.linfeng.modules.admin.entity.AppUserEntity; import lombok.Data; diff --git a/src/main/java/io/linfeng/common/response/AppUserInfoResponse.java b/src/main/java/io/linfeng/common/vo/AppUserInfoResponse.java similarity index 97% rename from src/main/java/io/linfeng/common/response/AppUserInfoResponse.java rename to src/main/java/io/linfeng/common/vo/AppUserInfoResponse.java index 465763c..e430393 100644 --- a/src/main/java/io/linfeng/common/response/AppUserInfoResponse.java +++ b/src/main/java/io/linfeng/common/vo/AppUserInfoResponse.java @@ -9,7 +9,7 @@ * 版权所有 ,侵权必究! * ----------------------------------- */ -package io.linfeng.common.response; +package io.linfeng.common.vo; import lombok.Data; diff --git a/src/main/java/io/linfeng/common/response/AppUserRankResponse.java b/src/main/java/io/linfeng/common/vo/AppUserRankResponse.java similarity index 96% rename from src/main/java/io/linfeng/common/response/AppUserRankResponse.java rename to src/main/java/io/linfeng/common/vo/AppUserRankResponse.java index 219a231..35b37b8 100644 --- a/src/main/java/io/linfeng/common/response/AppUserRankResponse.java +++ b/src/main/java/io/linfeng/common/vo/AppUserRankResponse.java @@ -10,7 +10,7 @@ * 版权所有 ,侵权必究! * ----------------------------------- */ -package io.linfeng.common.response; +package io.linfeng.common.vo; import lombok.Data; diff --git a/src/main/java/io/linfeng/common/response/AppUserResponse.java b/src/main/java/io/linfeng/common/vo/AppUserResponse.java similarity index 97% rename from src/main/java/io/linfeng/common/response/AppUserResponse.java rename to src/main/java/io/linfeng/common/vo/AppUserResponse.java index bbbd5c8..5b96184 100644 --- a/src/main/java/io/linfeng/common/response/AppUserResponse.java +++ b/src/main/java/io/linfeng/common/vo/AppUserResponse.java @@ -9,7 +9,7 @@ * 版权所有 ,侵权必究! * ----------------------------------- */ -package io.linfeng.common.response; +package io.linfeng.common.vo; import lombok.Data; diff --git a/src/main/java/io/linfeng/common/response/HomeRateResponse.java b/src/main/java/io/linfeng/common/vo/HomeRateResponse.java similarity index 85% rename from src/main/java/io/linfeng/common/response/HomeRateResponse.java rename to src/main/java/io/linfeng/common/vo/HomeRateResponse.java index 82290be..a21adcb 100644 --- a/src/main/java/io/linfeng/common/response/HomeRateResponse.java +++ b/src/main/java/io/linfeng/common/vo/HomeRateResponse.java @@ -9,15 +9,7 @@ * 版权所有 ,侵权必究! * ----------------------------------- */ -package io.linfeng.common.response; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; +package io.linfeng.common.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/common/response/PostDetailResponse.java b/src/main/java/io/linfeng/common/vo/PostDetailResponse.java similarity index 98% rename from src/main/java/io/linfeng/common/response/PostDetailResponse.java rename to src/main/java/io/linfeng/common/vo/PostDetailResponse.java index f7053ea..afb2e91 100644 --- a/src/main/java/io/linfeng/common/response/PostDetailResponse.java +++ b/src/main/java/io/linfeng/common/vo/PostDetailResponse.java @@ -9,7 +9,7 @@ * 版权所有 ,侵权必究! * ----------------------------------- */ -package io.linfeng.common.response; +package io.linfeng.common.vo; import io.linfeng.modules.admin.entity.AppUserEntity; import lombok.Data; diff --git a/src/main/java/io/linfeng/common/response/PostListResponse.java b/src/main/java/io/linfeng/common/vo/PostListResponse.java similarity index 98% rename from src/main/java/io/linfeng/common/response/PostListResponse.java rename to src/main/java/io/linfeng/common/vo/PostListResponse.java index 56f6744..97d56d2 100644 --- a/src/main/java/io/linfeng/common/response/PostListResponse.java +++ b/src/main/java/io/linfeng/common/vo/PostListResponse.java @@ -9,7 +9,7 @@ * 版权所有 ,侵权必究! * ----------------------------------- */ -package io.linfeng.common.response; +package io.linfeng.common.vo; import io.linfeng.modules.admin.entity.AppUserEntity; import lombok.Data; diff --git a/src/main/java/io/linfeng/common/response/TopicUserResponse.java b/src/main/java/io/linfeng/common/vo/TopicUserResponse.java similarity index 95% rename from src/main/java/io/linfeng/common/response/TopicUserResponse.java rename to src/main/java/io/linfeng/common/vo/TopicUserResponse.java index 741f9d0..9ea96aa 100644 --- a/src/main/java/io/linfeng/common/response/TopicUserResponse.java +++ b/src/main/java/io/linfeng/common/vo/TopicUserResponse.java @@ -9,10 +9,9 @@ * 版权所有 ,侵权必究! * ----------------------------------- */ -package io.linfeng.common.response; +package io.linfeng.common.vo; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/src/main/java/io/linfeng/common/xss/HTMLFilter.java b/src/main/java/io/linfeng/common/xss/HTMLFilter.java index 6ddc588..c6a2567 100644 --- a/src/main/java/io/linfeng/common/xss/HTMLFilter.java +++ b/src/main/java/io/linfeng/common/xss/HTMLFilter.java @@ -258,7 +258,7 @@ public final class HTMLFilter { private String balanceHTML(String s) { if (alwaysMakeTags) { // - // try and form html + // try and param html // s = regexReplace(P_END_ARROW, "", s); s = regexReplace(P_BODY_TO_END, "<$1>", s); diff --git a/src/main/java/io/linfeng/modules/admin/service/AppUserService.java b/src/main/java/io/linfeng/modules/admin/service/AppUserService.java index 25d6da1..dadc1b6 100644 --- a/src/main/java/io/linfeng/modules/admin/service/AppUserService.java +++ b/src/main/java/io/linfeng/modules/admin/service/AppUserService.java @@ -13,14 +13,14 @@ package io.linfeng.modules.admin.service; import com.baomidou.mybatisplus.extension.service.IService; -import io.linfeng.common.response.AppUserInfoResponse; -import io.linfeng.common.response.AppUserRankResponse; -import io.linfeng.common.response.AppUserResponse; -import io.linfeng.common.response.HomeRateResponse; +import io.linfeng.common.vo.AppUserInfoResponse; +import io.linfeng.common.vo.AppUserRankResponse; +import io.linfeng.common.vo.AppUserResponse; +import io.linfeng.common.vo.HomeRateResponse; import io.linfeng.common.utils.AppPageUtils; import io.linfeng.common.utils.PageUtils; import io.linfeng.modules.admin.entity.AppUserEntity; -import io.linfeng.modules.app.form.*; +import io.linfeng.modules.app.param.*; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/src/main/java/io/linfeng/modules/admin/service/CommentService.java b/src/main/java/io/linfeng/modules/admin/service/CommentService.java index e6488db..ae755fe 100644 --- a/src/main/java/io/linfeng/modules/admin/service/CommentService.java +++ b/src/main/java/io/linfeng/modules/admin/service/CommentService.java @@ -15,9 +15,7 @@ package io.linfeng.modules.admin.service; import com.baomidou.mybatisplus.extension.service.IService; import io.linfeng.common.utils.AppPageUtils; import io.linfeng.common.utils.PageUtils; -import io.linfeng.modules.admin.entity.AppUserEntity; import io.linfeng.modules.admin.entity.CommentEntity; -import io.linfeng.modules.app.form.DelCommentForm; import java.util.List; import java.util.Map; diff --git a/src/main/java/io/linfeng/modules/admin/service/LinkService.java b/src/main/java/io/linfeng/modules/admin/service/LinkService.java index ace1d57..ab3a102 100644 --- a/src/main/java/io/linfeng/modules/admin/service/LinkService.java +++ b/src/main/java/io/linfeng/modules/admin/service/LinkService.java @@ -13,10 +13,8 @@ package io.linfeng.modules.admin.service; import com.baomidou.mybatisplus.extension.service.IService; -import io.linfeng.common.utils.AppPageUtils; import io.linfeng.common.utils.PageUtils; import io.linfeng.modules.admin.entity.LinkEntity; -import io.linfeng.modules.app.form.LinkListForm; import java.util.Map; diff --git a/src/main/java/io/linfeng/modules/admin/service/PostService.java b/src/main/java/io/linfeng/modules/admin/service/PostService.java index efba1b8..650b24b 100644 --- a/src/main/java/io/linfeng/modules/admin/service/PostService.java +++ b/src/main/java/io/linfeng/modules/admin/service/PostService.java @@ -13,13 +13,12 @@ package io.linfeng.modules.admin.service; import com.baomidou.mybatisplus.extension.service.IService; -import io.linfeng.common.response.PostDetailResponse; +import io.linfeng.common.vo.PostDetailResponse; import io.linfeng.common.utils.AppPageUtils; import io.linfeng.common.utils.PageUtils; import io.linfeng.modules.admin.entity.AppUserEntity; import io.linfeng.modules.admin.entity.PostEntity; -import io.linfeng.modules.app.form.*; -import io.swagger.models.auth.In; +import io.linfeng.modules.app.param.*; import java.util.List; import java.util.Map; diff --git a/src/main/java/io/linfeng/modules/admin/service/impl/AppUserServiceImpl.java b/src/main/java/io/linfeng/modules/admin/service/impl/AppUserServiceImpl.java index 83cd0c9..b77331f 100644 --- a/src/main/java/io/linfeng/modules/admin/service/impl/AppUserServiceImpl.java +++ b/src/main/java/io/linfeng/modules/admin/service/impl/AppUserServiceImpl.java @@ -20,14 +20,14 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.linfeng.common.exception.LinfengException; -import io.linfeng.common.response.*; +import io.linfeng.common.vo.*; import io.linfeng.common.utils.*; import io.linfeng.modules.admin.entity.PostEntity; import io.linfeng.modules.admin.entity.SystemEntity; import io.linfeng.modules.admin.service.*; import io.linfeng.modules.app.dao.FollowDao; import io.linfeng.modules.app.entity.FollowEntity; -import io.linfeng.modules.app.form.*; +import io.linfeng.modules.app.param.*; import io.linfeng.modules.app.service.FollowService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/io/linfeng/modules/admin/service/impl/CommentServiceImpl.java b/src/main/java/io/linfeng/modules/admin/service/impl/CommentServiceImpl.java index bd5b3d4..f1ff345 100644 --- a/src/main/java/io/linfeng/modules/admin/service/impl/CommentServiceImpl.java +++ b/src/main/java/io/linfeng/modules/admin/service/impl/CommentServiceImpl.java @@ -14,7 +14,7 @@ package io.linfeng.modules.admin.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.linfeng.common.response.AppCommentResponse; +import io.linfeng.common.vo.AppCommentResponse; import io.linfeng.common.utils.AppPageUtils; import io.linfeng.modules.admin.entity.AppUserEntity; import io.linfeng.modules.admin.service.AppUserService; diff --git a/src/main/java/io/linfeng/modules/admin/service/impl/PostServiceImpl.java b/src/main/java/io/linfeng/modules/admin/service/impl/PostServiceImpl.java index d845167..e445c29 100644 --- a/src/main/java/io/linfeng/modules/admin/service/impl/PostServiceImpl.java +++ b/src/main/java/io/linfeng/modules/admin/service/impl/PostServiceImpl.java @@ -16,13 +16,13 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.linfeng.common.exception.LinfengException; -import io.linfeng.common.response.PostDetailResponse; -import io.linfeng.common.response.PostListResponse; +import io.linfeng.common.vo.PostDetailResponse; +import io.linfeng.common.vo.PostListResponse; import io.linfeng.common.utils.*; import io.linfeng.modules.admin.entity.*; import io.linfeng.modules.admin.service.*; import io.linfeng.modules.app.entity.PostCollectionEntity; -import io.linfeng.modules.app.form.*; +import io.linfeng.modules.app.param.*; import io.linfeng.modules.app.service.*; import io.linfeng.modules.app.utils.LocalUser; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/io/linfeng/modules/app/controller/AppCommentController.java b/src/main/java/io/linfeng/modules/app/controller/AppCommentController.java index 32634c3..9f00a26 100644 --- a/src/main/java/io/linfeng/modules/app/controller/AppCommentController.java +++ b/src/main/java/io/linfeng/modules/app/controller/AppCommentController.java @@ -18,7 +18,7 @@ import io.linfeng.modules.admin.entity.AppUserEntity; import io.linfeng.modules.admin.service.CommentService; import io.linfeng.modules.app.annotation.Login; import io.linfeng.modules.app.annotation.LoginUser; -import io.linfeng.modules.app.form.AddThumbsForm; +import io.linfeng.modules.app.param.AddThumbsForm; import io.linfeng.modules.app.service.CommentThumbsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/io/linfeng/modules/app/controller/AppPostController.java b/src/main/java/io/linfeng/modules/app/controller/AppPostController.java index aff77c2..b4411e9 100644 --- a/src/main/java/io/linfeng/modules/app/controller/AppPostController.java +++ b/src/main/java/io/linfeng/modules/app/controller/AppPostController.java @@ -12,7 +12,7 @@ package io.linfeng.modules.app.controller; import cn.hutool.core.util.ObjectUtil; -import io.linfeng.common.response.PostDetailResponse; +import io.linfeng.common.vo.PostDetailResponse; import io.linfeng.common.utils.AppPageUtils; import io.linfeng.common.utils.R; import io.linfeng.common.validator.ValidatorUtils; @@ -20,10 +20,10 @@ import io.linfeng.modules.admin.entity.AppUserEntity; import io.linfeng.modules.admin.service.PostService; import io.linfeng.modules.app.annotation.Login; import io.linfeng.modules.app.annotation.LoginUser; -import io.linfeng.modules.app.form.AddCollectionForm; -import io.linfeng.modules.app.form.AddCommentForm; -import io.linfeng.modules.app.form.AddPostForm; -import io.linfeng.modules.app.form.PostListForm; +import io.linfeng.modules.app.param.AddCollectionForm; +import io.linfeng.modules.app.param.AddCommentForm; +import io.linfeng.modules.app.param.AddPostForm; +import io.linfeng.modules.app.param.PostListForm; import io.linfeng.modules.app.service.PostCollectionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/io/linfeng/modules/app/controller/AppUserInfoController.java b/src/main/java/io/linfeng/modules/app/controller/AppUserInfoController.java index 15c5b52..97f4ac8 100644 --- a/src/main/java/io/linfeng/modules/app/controller/AppUserInfoController.java +++ b/src/main/java/io/linfeng/modules/app/controller/AppUserInfoController.java @@ -11,17 +11,16 @@ */ package io.linfeng.modules.app.controller; -import io.linfeng.common.response.AppUserInfoResponse; -import io.linfeng.common.response.AppUserRankResponse; -import io.linfeng.common.response.AppUserResponse; +import io.linfeng.common.vo.AppUserInfoResponse; +import io.linfeng.common.vo.AppUserRankResponse; +import io.linfeng.common.vo.AppUserResponse; import io.linfeng.common.utils.AppPageUtils; import io.linfeng.common.utils.R; -import io.linfeng.common.validator.ValidatorUtils; import io.linfeng.modules.admin.entity.AppUserEntity; import io.linfeng.modules.admin.service.AppUserService; import io.linfeng.modules.app.annotation.Login; import io.linfeng.modules.app.annotation.LoginUser; -import io.linfeng.modules.app.form.*; +import io.linfeng.modules.app.param.*; import io.linfeng.modules.app.utils.JwtUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/io/linfeng/modules/app/form/AddCollectionForm.java b/src/main/java/io/linfeng/modules/app/param/AddCollectionForm.java similarity index 95% rename from src/main/java/io/linfeng/modules/app/form/AddCollectionForm.java rename to src/main/java/io/linfeng/modules/app/param/AddCollectionForm.java index f4494a1..da0138f 100644 --- a/src/main/java/io/linfeng/modules/app/form/AddCollectionForm.java +++ b/src/main/java/io/linfeng/modules/app/param/AddCollectionForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/AddCommentForm.java b/src/main/java/io/linfeng/modules/app/param/AddCommentForm.java similarity index 96% rename from src/main/java/io/linfeng/modules/app/form/AddCommentForm.java rename to src/main/java/io/linfeng/modules/app/param/AddCommentForm.java index 374ab1e..fae586e 100644 --- a/src/main/java/io/linfeng/modules/app/form/AddCommentForm.java +++ b/src/main/java/io/linfeng/modules/app/param/AddCommentForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/AddFollowForm.java b/src/main/java/io/linfeng/modules/app/param/AddFollowForm.java similarity index 94% rename from src/main/java/io/linfeng/modules/app/form/AddFollowForm.java rename to src/main/java/io/linfeng/modules/app/param/AddFollowForm.java index af9254d..1b4e77d 100644 --- a/src/main/java/io/linfeng/modules/app/form/AddFollowForm.java +++ b/src/main/java/io/linfeng/modules/app/param/AddFollowForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/AddPostDeleteForm.java b/src/main/java/io/linfeng/modules/app/param/AddPostDeleteForm.java similarity index 94% rename from src/main/java/io/linfeng/modules/app/form/AddPostDeleteForm.java rename to src/main/java/io/linfeng/modules/app/param/AddPostDeleteForm.java index a9cf504..b42256d 100644 --- a/src/main/java/io/linfeng/modules/app/form/AddPostDeleteForm.java +++ b/src/main/java/io/linfeng/modules/app/param/AddPostDeleteForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/AddPostForm.java b/src/main/java/io/linfeng/modules/app/param/AddPostForm.java similarity index 97% rename from src/main/java/io/linfeng/modules/app/form/AddPostForm.java rename to src/main/java/io/linfeng/modules/app/param/AddPostForm.java index 1c2a327..b0a62ae 100644 --- a/src/main/java/io/linfeng/modules/app/form/AddPostForm.java +++ b/src/main/java/io/linfeng/modules/app/param/AddPostForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/src/main/java/io/linfeng/modules/app/form/AddThumbsForm.java b/src/main/java/io/linfeng/modules/app/param/AddThumbsForm.java similarity index 94% rename from src/main/java/io/linfeng/modules/app/form/AddThumbsForm.java rename to src/main/java/io/linfeng/modules/app/param/AddThumbsForm.java index f8a310a..1efaa3c 100644 --- a/src/main/java/io/linfeng/modules/app/form/AddThumbsForm.java +++ b/src/main/java/io/linfeng/modules/app/param/AddThumbsForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/AppUserInfoForm.java b/src/main/java/io/linfeng/modules/app/param/AppUserInfoForm.java similarity index 95% rename from src/main/java/io/linfeng/modules/app/form/AppUserInfoForm.java rename to src/main/java/io/linfeng/modules/app/param/AppUserInfoForm.java index 89b48ac..fa8d8f6 100644 --- a/src/main/java/io/linfeng/modules/app/form/AppUserInfoForm.java +++ b/src/main/java/io/linfeng/modules/app/param/AppUserInfoForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/AppUserUpdateForm.java b/src/main/java/io/linfeng/modules/app/param/AppUserUpdateForm.java similarity index 84% rename from src/main/java/io/linfeng/modules/app/form/AppUserUpdateForm.java rename to src/main/java/io/linfeng/modules/app/param/AppUserUpdateForm.java index 68f2f1a..22ac73d 100644 --- a/src/main/java/io/linfeng/modules/app/form/AppUserUpdateForm.java +++ b/src/main/java/io/linfeng/modules/app/param/AppUserUpdateForm.java @@ -9,15 +9,11 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.hibernate.validator.constraints.Length; - -import javax.validation.constraints.NotBlank; -import java.util.List; /** * app用户信息修改 diff --git a/src/main/java/io/linfeng/modules/app/form/ChatListForm.java b/src/main/java/io/linfeng/modules/app/param/ChatListForm.java similarity index 95% rename from src/main/java/io/linfeng/modules/app/form/ChatListForm.java rename to src/main/java/io/linfeng/modules/app/param/ChatListForm.java index 51ae1e3..67aa18b 100644 --- a/src/main/java/io/linfeng/modules/app/form/ChatListForm.java +++ b/src/main/java/io/linfeng/modules/app/param/ChatListForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/ChatSendForm.java b/src/main/java/io/linfeng/modules/app/param/ChatSendForm.java similarity index 96% rename from src/main/java/io/linfeng/modules/app/form/ChatSendForm.java rename to src/main/java/io/linfeng/modules/app/param/ChatSendForm.java index 44f2227..066da64 100644 --- a/src/main/java/io/linfeng/modules/app/form/ChatSendForm.java +++ b/src/main/java/io/linfeng/modules/app/param/ChatSendForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/DelCommentForm.java b/src/main/java/io/linfeng/modules/app/param/DelCommentForm.java similarity index 95% rename from src/main/java/io/linfeng/modules/app/form/DelCommentForm.java rename to src/main/java/io/linfeng/modules/app/param/DelCommentForm.java index 3239e22..cefc047 100644 --- a/src/main/java/io/linfeng/modules/app/form/DelCommentForm.java +++ b/src/main/java/io/linfeng/modules/app/param/DelCommentForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/DiscussAddForm.java b/src/main/java/io/linfeng/modules/app/param/DiscussAddForm.java similarity index 96% rename from src/main/java/io/linfeng/modules/app/form/DiscussAddForm.java rename to src/main/java/io/linfeng/modules/app/param/DiscussAddForm.java index b6241b9..572ba3f 100644 --- a/src/main/java/io/linfeng/modules/app/form/DiscussAddForm.java +++ b/src/main/java/io/linfeng/modules/app/param/DiscussAddForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/DiscussDeleteForm.java b/src/main/java/io/linfeng/modules/app/param/DiscussDeleteForm.java similarity index 94% rename from src/main/java/io/linfeng/modules/app/form/DiscussDeleteForm.java rename to src/main/java/io/linfeng/modules/app/param/DiscussDeleteForm.java index ab384ab..25f5640 100644 --- a/src/main/java/io/linfeng/modules/app/form/DiscussDeleteForm.java +++ b/src/main/java/io/linfeng/modules/app/param/DiscussDeleteForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/DiscussListForm.java b/src/main/java/io/linfeng/modules/app/param/DiscussListForm.java similarity index 95% rename from src/main/java/io/linfeng/modules/app/form/DiscussListForm.java rename to src/main/java/io/linfeng/modules/app/param/DiscussListForm.java index 6b25e92..8ffc6db 100644 --- a/src/main/java/io/linfeng/modules/app/form/DiscussListForm.java +++ b/src/main/java/io/linfeng/modules/app/param/DiscussListForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/LinkListForm.java b/src/main/java/io/linfeng/modules/app/param/LinkListForm.java similarity index 95% rename from src/main/java/io/linfeng/modules/app/form/LinkListForm.java rename to src/main/java/io/linfeng/modules/app/param/LinkListForm.java index e4004c0..f0b1557 100644 --- a/src/main/java/io/linfeng/modules/app/form/LinkListForm.java +++ b/src/main/java/io/linfeng/modules/app/param/LinkListForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/LoginForm.java b/src/main/java/io/linfeng/modules/app/param/LoginForm.java similarity index 96% rename from src/main/java/io/linfeng/modules/app/form/LoginForm.java rename to src/main/java/io/linfeng/modules/app/param/LoginForm.java index 3265806..6685e79 100644 --- a/src/main/java/io/linfeng/modules/app/form/LoginForm.java +++ b/src/main/java/io/linfeng/modules/app/param/LoginForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/PostListForm.java b/src/main/java/io/linfeng/modules/app/param/PostListForm.java similarity index 96% rename from src/main/java/io/linfeng/modules/app/form/PostListForm.java rename to src/main/java/io/linfeng/modules/app/param/PostListForm.java index 81d3325..6cc25b0 100644 --- a/src/main/java/io/linfeng/modules/app/form/PostListForm.java +++ b/src/main/java/io/linfeng/modules/app/param/PostListForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/RegisterForm.java b/src/main/java/io/linfeng/modules/app/param/RegisterForm.java similarity index 96% rename from src/main/java/io/linfeng/modules/app/form/RegisterForm.java rename to src/main/java/io/linfeng/modules/app/param/RegisterForm.java index 6ffd6aa..8857efa 100644 --- a/src/main/java/io/linfeng/modules/app/form/RegisterForm.java +++ b/src/main/java/io/linfeng/modules/app/param/RegisterForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/SendCodeForm.java b/src/main/java/io/linfeng/modules/app/param/SendCodeForm.java similarity index 95% rename from src/main/java/io/linfeng/modules/app/form/SendCodeForm.java rename to src/main/java/io/linfeng/modules/app/param/SendCodeForm.java index f5de6f0..ddd5337 100644 --- a/src/main/java/io/linfeng/modules/app/form/SendCodeForm.java +++ b/src/main/java/io/linfeng/modules/app/param/SendCodeForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; /** * @author linfeng diff --git a/src/main/java/io/linfeng/modules/app/form/SetAdminForm.java b/src/main/java/io/linfeng/modules/app/param/SetAdminForm.java similarity index 95% rename from src/main/java/io/linfeng/modules/app/form/SetAdminForm.java rename to src/main/java/io/linfeng/modules/app/param/SetAdminForm.java index 745c2c3..175774b 100644 --- a/src/main/java/io/linfeng/modules/app/form/SetAdminForm.java +++ b/src/main/java/io/linfeng/modules/app/param/SetAdminForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/SmsLoginForm.java b/src/main/java/io/linfeng/modules/app/param/SmsLoginForm.java similarity index 95% rename from src/main/java/io/linfeng/modules/app/form/SmsLoginForm.java rename to src/main/java/io/linfeng/modules/app/param/SmsLoginForm.java index cab7ac6..f9fdbad 100644 --- a/src/main/java/io/linfeng/modules/app/form/SmsLoginForm.java +++ b/src/main/java/io/linfeng/modules/app/param/SmsLoginForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/UpdateChatStatusForm.java b/src/main/java/io/linfeng/modules/app/param/UpdateChatStatusForm.java similarity index 95% rename from src/main/java/io/linfeng/modules/app/form/UpdateChatStatusForm.java rename to src/main/java/io/linfeng/modules/app/param/UpdateChatStatusForm.java index 8893ef9..7c71c17 100644 --- a/src/main/java/io/linfeng/modules/app/form/UpdateChatStatusForm.java +++ b/src/main/java/io/linfeng/modules/app/param/UpdateChatStatusForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/UpdateSystemNoticeStatusForm.java b/src/main/java/io/linfeng/modules/app/param/UpdateSystemNoticeStatusForm.java similarity index 95% rename from src/main/java/io/linfeng/modules/app/form/UpdateSystemNoticeStatusForm.java rename to src/main/java/io/linfeng/modules/app/param/UpdateSystemNoticeStatusForm.java index 4b39e68..8cf39d0 100644 --- a/src/main/java/io/linfeng/modules/app/form/UpdateSystemNoticeStatusForm.java +++ b/src/main/java/io/linfeng/modules/app/param/UpdateSystemNoticeStatusForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/form/WxLoginForm.java b/src/main/java/io/linfeng/modules/app/param/WxLoginForm.java similarity index 96% rename from src/main/java/io/linfeng/modules/app/form/WxLoginForm.java rename to src/main/java/io/linfeng/modules/app/param/WxLoginForm.java index c1beb3a..158fc08 100644 --- a/src/main/java/io/linfeng/modules/app/form/WxLoginForm.java +++ b/src/main/java/io/linfeng/modules/app/param/WxLoginForm.java @@ -9,7 +9,7 @@ * 版权所有,侵权必究! * ----------------------------------- */ -package io.linfeng.modules.app.form; +package io.linfeng.modules.app.param; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/io/linfeng/modules/app/service/CommentThumbsService.java b/src/main/java/io/linfeng/modules/app/service/CommentThumbsService.java index dffd87e..dcb0242 100644 --- a/src/main/java/io/linfeng/modules/app/service/CommentThumbsService.java +++ b/src/main/java/io/linfeng/modules/app/service/CommentThumbsService.java @@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import io.linfeng.common.utils.PageUtils; import io.linfeng.modules.admin.entity.AppUserEntity; import io.linfeng.modules.app.entity.CommentThumbsEntity; -import io.linfeng.modules.app.form.AddThumbsForm; +import io.linfeng.modules.app.param.AddThumbsForm; import java.util.Map; diff --git a/src/main/java/io/linfeng/modules/app/service/PostCollectionService.java b/src/main/java/io/linfeng/modules/app/service/PostCollectionService.java index 679089e..95abf81 100644 --- a/src/main/java/io/linfeng/modules/app/service/PostCollectionService.java +++ b/src/main/java/io/linfeng/modules/app/service/PostCollectionService.java @@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import io.linfeng.common.utils.PageUtils; import io.linfeng.modules.admin.entity.AppUserEntity; import io.linfeng.modules.app.entity.PostCollectionEntity; -import io.linfeng.modules.app.form.AddCollectionForm; +import io.linfeng.modules.app.param.AddCollectionForm; import java.util.List; import java.util.Map; diff --git a/src/main/java/io/linfeng/modules/app/service/impl/CommentThumbsServiceImpl.java b/src/main/java/io/linfeng/modules/app/service/impl/CommentThumbsServiceImpl.java index 768d328..a50e13b 100644 --- a/src/main/java/io/linfeng/modules/app/service/impl/CommentThumbsServiceImpl.java +++ b/src/main/java/io/linfeng/modules/app/service/impl/CommentThumbsServiceImpl.java @@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.linfeng.common.exception.LinfengException; import io.linfeng.common.utils.DateUtil; import io.linfeng.modules.admin.entity.AppUserEntity; -import io.linfeng.modules.app.form.AddThumbsForm; +import io.linfeng.modules.app.param.AddThumbsForm; import org.springframework.stereotype.Service; import java.util.Map; import java.util.Optional; diff --git a/src/main/java/io/linfeng/modules/app/service/impl/PostCollectionServiceImpl.java b/src/main/java/io/linfeng/modules/app/service/impl/PostCollectionServiceImpl.java index 29f3d8d..f0d7fc6 100644 --- a/src/main/java/io/linfeng/modules/app/service/impl/PostCollectionServiceImpl.java +++ b/src/main/java/io/linfeng/modules/app/service/impl/PostCollectionServiceImpl.java @@ -13,7 +13,7 @@ package io.linfeng.modules.app.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.linfeng.modules.admin.entity.AppUserEntity; -import io.linfeng.modules.app.form.AddCollectionForm; +import io.linfeng.modules.app.param.AddCollectionForm; import org.springframework.stereotype.Service; import java.util.List;