From 7968e41aa8ef0937de5293363a6f672f4227a09b Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 7 Sep 2022 16:29:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mdd/front/config/FrontConfig.java | 1 + .../mdd/front/controller/IndexController.java | 3 +++ .../com/mdd/front/service/IUserService.java | 18 ++++++++++++++++++ .../front/service/impl/UserServiceImpl.java | 4 +++- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java b/server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java index ca932aaa..90ce5f74 100644 --- a/server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java +++ b/server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java @@ -14,6 +14,7 @@ public class FrontConfig { "/api/index", "/api/config", "/api/policy", + "/api/search", "/api/decorate", "/api/sms/send", diff --git a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java index 6cda6216..20cc214f 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java @@ -13,6 +13,9 @@ import javax.annotation.Resource; import java.util.List; import java.util.Map; +/** + * 主页管理 + */ @RestController @RequestMapping("/api") public class IndexController { diff --git a/server/like-front/src/main/java/com/mdd/front/service/IUserService.java b/server/like-front/src/main/java/com/mdd/front/service/IUserService.java index 4dc85bd8..cca15542 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/IUserService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/IUserService.java @@ -3,9 +3,27 @@ package com.mdd.front.service; import com.mdd.front.vo.user.UserCenterVo; import com.mdd.front.vo.user.UserInfoVo; +/** + * 用户服务接口类 + */ public interface IUserService { + /** + * 个人中心 + * + * @author fzr + * @param userId 用户 + * @return UserCenterVo + */ UserCenterVo center(Integer userId); + /** + * 个人信息 + * + * @author fzr + * @param userId 用户ID + * @return UserInfoVo + */ UserInfoVo info(Integer userId); + } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java index 8ef83280..b9e9159e 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java @@ -15,10 +15,12 @@ import com.mdd.front.vo.user.UserCenterVo; import com.mdd.front.vo.user.UserInfoVo; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +/** + * 用户服务实现类 + */ @Service public class UserServiceImpl implements IUserService { From 706a53193fed8f1231567288bb02201e7da0532c Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 7 Sep 2022 17:09:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mdd/front/LikeFrontInterceptor.java | 11 +++++- .../com/mdd/front/LikeFrontThreadLocal.java | 13 ++++--- .../front/controller/ArticleController.java | 4 ++- .../mdd/front/service/IArticleService.java | 3 +- .../service/impl/ArticleServiceImpl.java | 36 ++++++++++++++++++- .../mdd/front/vo/article/ArticleListVo.java | 1 + 6 files changed, 60 insertions(+), 8 deletions(-) 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 2bba32e1..260f4040 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 @@ -8,6 +8,7 @@ import com.mdd.common.entity.user.User; import com.mdd.common.enums.HttpEnum; import com.mdd.common.mapper.user.UserMapper; import com.mdd.common.utils.RedisUtil; +import com.mdd.common.utils.StringUtil; import com.mdd.front.config.FrontConfig; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; @@ -45,13 +46,21 @@ public class LikeFrontInterceptor implements HandlerInterceptor { } // 免登录接口 + String token = request.getHeader("token"); List notLoginUri = Arrays.asList(FrontConfig.notLoginUri); if (notLoginUri.contains(request.getRequestURI())) { + if (StringUtil.isNotEmpty(token)) { + Object uid = RedisUtil.get(token); + if (uid != null) { + Integer userId = Integer.parseInt(uid.toString()); + LikeFrontThreadLocal.put("userId", userId); + } + } return HandlerInterceptor.super.preHandle(request, response, handler); } // Token是否为空 - String token = request.getHeader("token"); + if (StringUtils.isBlank(token)) { AjaxResult result = AjaxResult.failed(HttpEnum.TOKEN_EMPTY.getCode(), HttpEnum.TOKEN_EMPTY.getMsg()); response.getWriter().print(JSON.toJSONString(result)); diff --git a/server/like-front/src/main/java/com/mdd/front/LikeFrontThreadLocal.java b/server/like-front/src/main/java/com/mdd/front/LikeFrontThreadLocal.java index 0a2c6855..5643bdb3 100644 --- a/server/like-front/src/main/java/com/mdd/front/LikeFrontThreadLocal.java +++ b/server/like-front/src/main/java/com/mdd/front/LikeFrontThreadLocal.java @@ -1,6 +1,7 @@ package com.mdd.front; import java.util.LinkedHashMap; +import java.util.Map; public class LikeFrontThreadLocal { @@ -31,18 +32,22 @@ public class LikeFrontThreadLocal { * 获取本地线程 */ public static Object get(String key) { - return MY_LOCAL.get().getOrDefault(key, ""); + Map map = MY_LOCAL.get(); + if (map == null) { + return null; + } + return map.getOrDefault(key, ""); } /** * 获取用户ID */ public static Integer getUserId() { - String adminId = LikeFrontThreadLocal.get("userId").toString(); - if (adminId.equals("")) { + Object adminId = LikeFrontThreadLocal.get("userId"); + if (adminId == null || adminId.toString().equals("")) { return 0; } - return Integer.parseInt(adminId); + return Integer.parseInt(adminId.toString()); } /** diff --git a/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java b/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java index 1c5c4d52..454815c5 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java @@ -3,6 +3,7 @@ package com.mdd.front.controller; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; import com.mdd.common.validator.annotation.IDMust; +import com.mdd.front.LikeFrontThreadLocal; import com.mdd.front.service.IArticleService; import com.mdd.front.validate.PageParam; import com.mdd.front.vo.article.ArticleCateVo; @@ -46,7 +47,8 @@ public class ArticleController { @GetMapping("/list") public Object list(@Validated PageParam pageParam, @RequestParam(value = "cid", defaultValue = "0") Integer cid) { - PageResult list = iArticleService.list(pageParam, cid); + Integer userId = LikeFrontThreadLocal.getUserId(); + PageResult list = iArticleService.list(pageParam, cid, userId); return AjaxResult.success(list); } diff --git a/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java b/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java index a15d6cea..9063b182 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java @@ -28,9 +28,10 @@ public interface IArticleService { * @author fzr * @param pageParam 分页参数 * @param cid 分类ID + * @param userId 用户ID * @return PageResult */ - PageResult list(PageParam pageParam, Integer cid); + PageResult list(PageParam pageParam, Integer cid, Integer userId); /** * 文章详情 diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java index 6c96016d..aaf82431 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java @@ -11,6 +11,7 @@ import com.mdd.common.entity.article.Article; import com.mdd.common.entity.article.ArticleCategory; import com.mdd.common.entity.article.ArticleCollect; import com.mdd.common.mapper.article.ArticleCategoryMapper; +import com.mdd.common.mapper.article.ArticleCollectMapper; import com.mdd.common.mapper.article.ArticleMapper; import com.mdd.common.utils.TimeUtil; import com.mdd.common.utils.UrlUtil; @@ -20,6 +21,7 @@ import com.mdd.front.vo.article.ArticleCateVo; import com.mdd.front.vo.article.ArticleCollectVo; import com.mdd.front.vo.article.ArticleDetailVo; import com.mdd.front.vo.article.ArticleListVo; +import net.sf.jsqlparser.statement.create.table.Index; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -40,6 +42,9 @@ public class ArticleServiceImpl implements IArticleService { @Resource ArticleCategoryMapper articleCategoryMapper; + @Resource + ArticleCollectMapper articleCollectMapper; + /** * 文章分类 * @@ -71,10 +76,11 @@ public class ArticleServiceImpl implements IArticleService { * @author fzr * @param pageParam 分页参数 * @param cid 分类ID + * @param userId 用户ID * @return PageResult */ @Override - public PageResult list(PageParam pageParam, Integer cid) { + public PageResult list(PageParam pageParam, Integer cid, Integer userId) { Integer pageNo = pageParam.getPageNo(); Integer pageSize = pageParam.getPageSize(); @@ -86,13 +92,34 @@ public class ArticleServiceImpl implements IArticleService { IPage
iPage = articleMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper); + List ids = new LinkedList<>(); List list = new LinkedList<>(); for (Article article : iPage.getRecords()) { ArticleListVo vo = new ArticleListVo(); BeanUtils.copyProperties(article, vo); + vo.setCollect(false); vo.setImage(UrlUtil.toAbsoluteUrl(article.getImage())); vo.setCreateTime(TimeUtil.timestampToDate(article.getCreateTime())); list.add(vo); + + ids.add(article.getId()); + } + + if (userId != null && userId > 0 && ids.size() > 0) { + List articleCollects = articleCollectMapper.selectList( + new QueryWrapper() + .eq("user_id", userId) + .eq("is_delete", 0) + .in("article_id", ids)); + + List collects = new LinkedList<>(); + for (ArticleCollect c : articleCollects) { + collects.add(c.getArticleId()); + } + + for (ArticleListVo vo : list) { + vo.setCollect(collects.contains(vo.getId())); + } } return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); @@ -123,6 +150,13 @@ public class ArticleServiceImpl implements IArticleService { return vo; } + /** + * 收藏列表 + * + * @author fzr + * @param pageParam 分页参数 + * @return PageResult + */ @Override public PageResult collect(PageParam pageParam) { Integer pageNo = pageParam.getPageNo(); diff --git a/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleListVo.java b/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleListVo.java index 6d3d5190..49fbc7cd 100644 --- a/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleListVo.java +++ b/server/like-front/src/main/java/com/mdd/front/vo/article/ArticleListVo.java @@ -14,6 +14,7 @@ public class ArticleListVo implements Serializable { private String image; private String intro; private Integer visit; + private Boolean collect; private String createTime; } From 42a0d891bce881aa7f05ea9e19e5b36fd9c02f50 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 7 Sep 2022 18:08:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mdd/front/LikeFrontInterceptor.java | 2 + .../com/mdd/front/config/FrontConfig.java | 1 - .../front/controller/ArticleController.java | 47 ++++++++++++-- .../mdd/front/service/IArticleService.java | 21 ++++++- .../service/impl/ArticleServiceImpl.java | 63 ++++++++++++++++++- .../front/service/impl/LoginServiceImpl.java | 4 +- 6 files changed, 125 insertions(+), 13 deletions(-) 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 260f4040..39ebcbb4 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 @@ -77,6 +77,8 @@ public class LikeFrontInterceptor implements HandlerInterceptor { // 用户信息缓存 Object uid = RedisUtil.get(token); + System.out.println(uid); + System.out.println("哈哈哈哈哈"); Integer userId = Integer.parseInt(uid.toString()); User user = userMapper.selectOne(new QueryWrapper() .select("id,sn,username,nickname,mobile,is_disable,is_delete") diff --git a/server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java b/server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java index 90ce5f74..6ce75792 100644 --- a/server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java +++ b/server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java @@ -23,7 +23,6 @@ public class FrontConfig { "/api/login/forgotPassword", "/api/article/category", - "/api/article/collect", "/api/article/detail", "/api/article/list", }; diff --git a/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java b/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java index 454815c5..eb61b220 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/ArticleController.java @@ -1,5 +1,6 @@ package com.mdd.front.controller; +import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; import com.mdd.common.validator.annotation.IDMust; @@ -11,14 +12,15 @@ import com.mdd.front.vo.article.ArticleCollectVo; import com.mdd.front.vo.article.ArticleDetailVo; import com.mdd.front.vo.article.ArticleListVo; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; +import java.util.Map; +/** + * 文章管理 + */ @RestController @RequestMapping("/api/article") public class ArticleController { @@ -73,7 +75,42 @@ public class ArticleController { */ @GetMapping("/collect") public Object collect(@Validated PageParam pageParam) { - PageResult list = iArticleService.collect(pageParam); + Integer userId = LikeFrontThreadLocal.getUserId(); + System.out.println(userId); + PageResult list = iArticleService.collect(pageParam, userId); return AjaxResult.success(list); } + + /** + * 加入收藏 + * + * @author fzr + * @param params 参数 + * @return Object + */ + @PostMapping("/addCollect") + public Object addCollect(@RequestBody Map params) { + Assert.notNull(params.get("articleId"), "articleId参数缺失"); + Integer articleId = Integer.parseInt(params.get("articleId")); + Integer userId = LikeFrontThreadLocal.getUserId(); + iArticleService.addCollect(articleId, userId); + return AjaxResult.success(); + } + + /** + * 取消收藏 + * + * @author fzr + * @param params 参数 + * @return Object + */ + @PostMapping("/cancelCollect") + public Object cancelCollect(@RequestBody Map params) { + Assert.notNull(params.get("id"), "id参数缺失"); + Integer id = Integer.parseInt(params.get("id")); + Integer userId = LikeFrontThreadLocal.getUserId(); + iArticleService.cancelCollect(id, userId); + return AjaxResult.success(); + } + } diff --git a/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java b/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java index 9063b182..39d16eef 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/IArticleService.java @@ -47,8 +47,27 @@ public interface IArticleService { * * @author fzr * @param pageParam 分页参数 + * @param userId 用户ID * @return PageResult */ - PageResult collect(PageParam pageParam); + PageResult collect(PageParam pageParam, Integer userId); + + /** + * 加入收藏 + * + * @author fzr + * @param articleId 文章ID + * @param userId 用户ID + */ + void addCollect(Integer articleId, Integer userId); + + /** + * 取消收藏 + * + * @author fzr + * @param id 主键 + * @param userId 用户ID + */ + void cancelCollect(Integer id, Integer userId); } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java index aaf82431..08963b5f 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java @@ -10,9 +10,11 @@ import com.mdd.common.core.PageResult; import com.mdd.common.entity.article.Article; import com.mdd.common.entity.article.ArticleCategory; import com.mdd.common.entity.article.ArticleCollect; +import com.mdd.common.entity.server.Sys; import com.mdd.common.mapper.article.ArticleCategoryMapper; import com.mdd.common.mapper.article.ArticleCollectMapper; import com.mdd.common.mapper.article.ArticleMapper; +import com.mdd.common.utils.StringUtil; import com.mdd.common.utils.TimeUtil; import com.mdd.common.utils.UrlUtil; import com.mdd.front.service.IArticleService; @@ -155,21 +157,23 @@ public class ArticleServiceImpl implements IArticleService { * * @author fzr * @param pageParam 分页参数 + * @param userId 用户ID * @return PageResult */ @Override - public PageResult collect(PageParam pageParam) { + public PageResult collect(PageParam pageParam, Integer userId) { Integer pageNo = pageParam.getPageNo(); Integer pageSize = pageParam.getPageSize(); MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper<>(); mpjQueryWrapper.select("t.id,t.article_id,a.title,a.image,a.intro,a.visit,a.create_time") - .eq("t.user_id", 1) + .eq("t.user_id", userId) .eq("t.is_delete", 0) + .eq("a.is_delete", 0) .orderByDesc("t.id") .innerJoin("?_article a ON a.id=t.article_id".replace("?_", GlobalConfig.tablePrefix)); - IPage iPage = articleMapper.selectJoinPage( + IPage iPage = articleCollectMapper.selectJoinPage( new Page<>(pageNo, pageSize), ArticleCollectVo.class, mpjQueryWrapper); @@ -182,4 +186,57 @@ public class ArticleServiceImpl implements IArticleService { return PageResult.iPageHandle(iPage); } + /** + * 加入收藏 + * + * @author fzr + * @param articleId 主键 + * @param userId 用户ID + */ + @Override + public void addCollect(Integer articleId, Integer userId) { + ArticleCollect articleCollect = articleCollectMapper.selectOne( + new QueryWrapper() + .eq("article_id", articleId) + .eq("user_id", userId) + .last("limit 1")); + + if (StringUtil.isNotNull(articleCollect)) { + articleCollect.setIsDelete(0); + articleCollect.setUpdateTime(System.currentTimeMillis() / 1000); + articleCollectMapper.updateById(articleCollect); + } else { + ArticleCollect model = new ArticleCollect(); + model.setArticleId(articleId); + model.setUserId(userId); + model.setIsDelete(0); + model.setCreateTime(System.currentTimeMillis() / 1000); + model.setUpdateTime(System.currentTimeMillis() / 1000); + articleCollectMapper.insert(model); + } + } + + /** + * 取消收藏 + * + * @author fzr + * @param id 主键 + * @param userId 用户ID + */ + @Override + public void cancelCollect(Integer id, Integer userId) { + ArticleCollect articleCollect = articleCollectMapper.selectOne( + new QueryWrapper() + .eq("id", id) + .eq("user_id", userId) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.notNull(articleCollect, "收藏不存在!"); + + articleCollect.setIsDelete(1); + articleCollect.setUpdateTime(System.currentTimeMillis() / 1000); + articleCollectMapper.updateById(articleCollect); + } + } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java index 9069a0c4..90a72b16 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java @@ -37,7 +37,6 @@ public class LoginServiceImpl implements ILoginService { @Resource UserAuthMapper userAuthMapper; - /** * 注册账号 * @@ -81,12 +80,11 @@ public class LoginServiceImpl implements ILoginService { @Transactional public Map mnpLogin(Map params) { Assert.notNull(params.get("code"), "code参数缺失!"); - String scene = params.get("scene"); String code = params.get("code"); String avatarUrl = params.getOrDefault("avatarUrl", ""); String nickName = params.getOrDefault("nickName", ""); String gender = params.getOrDefault("gender", "0"); - Integer client = ClientEnum.getCodeByType(scene); + Integer client = Integer.parseInt(params.getOrDefault("client", "1")); Map config = ConfigUtil.get("mp_channel"); WxMaService wxMaService = new WxMaServiceImpl(); From 15e20646c2f9de066ee1ddb6db492dfaf757f4c4 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 7 Sep 2022 18:28:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=AE=A2=E6=88=B7=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mdd/front/service/impl/LoginServiceImpl.java | 2 +- .../src/main/java/com/mdd/front/validate/RegParam.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java index 90a72b16..6723fad6 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java @@ -63,7 +63,7 @@ public class LoginServiceImpl implements ILoginService { user.setUsername(regParam.getUsername()); user.setPassword(pwd); user.setSalt(salt); - user.setChannel(0); + user.setChannel(regParam.getClient()); user.setCreateTime(System.currentTimeMillis() / 1000); user.setUpdateTime(System.currentTimeMillis() / 1000); userMapper.insert(user); diff --git a/server/like-front/src/main/java/com/mdd/front/validate/RegParam.java b/server/like-front/src/main/java/com/mdd/front/validate/RegParam.java index 4be02cce..ed0359ce 100644 --- a/server/like-front/src/main/java/com/mdd/front/validate/RegParam.java +++ b/server/like-front/src/main/java/com/mdd/front/validate/RegParam.java @@ -1,5 +1,6 @@ package com.mdd.front.validate; +import com.mdd.common.validator.annotation.IntegerContains; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -32,4 +33,9 @@ public class RegParam implements Serializable { @Length(min = 6, max = 12, message = "密码必须在6~12个字符内") private String password; + @NotNull(message = "client参数缺失") + @NotEmpty(message = "客户端不能为空") + @IntegerContains(values = {1, 2, 3, 4, 5, 6}, message = "不是合法客户端") + private Integer client; + }