diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkInsertEsConsumer.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkInsertEsConsumer.java index 6d40f0f..f37001a 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkInsertEsConsumer.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkInsertEsConsumer.java @@ -6,7 +6,7 @@ import com.fanxb.bookmark.business.bookmark.entity.BookmarkEs; import com.fanxb.bookmark.common.annotation.MqConsumer; import com.fanxb.bookmark.common.constant.EsConstant; import com.fanxb.bookmark.common.constant.RedisConstant; -import com.fanxb.bookmark.common.entity.Bookmark; +import com.fanxb.bookmark.common.entity.po.Bookmark; import com.fanxb.bookmark.common.entity.EsEntity; import com.fanxb.bookmark.common.entity.redis.RedisConsumer; import com.fanxb.bookmark.common.util.EsUtil; diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/controller/BookmarkController.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/controller/BookmarkController.java index dfab71e..440acd6 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/controller/BookmarkController.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/controller/BookmarkController.java @@ -7,7 +7,7 @@ import com.fanxb.bookmark.business.bookmark.entity.MoveNodeBody; import com.fanxb.bookmark.business.bookmark.service.BookmarkBackupService; import com.fanxb.bookmark.business.bookmark.service.BookmarkService; import com.fanxb.bookmark.business.bookmark.service.PinYinService; -import com.fanxb.bookmark.common.entity.Bookmark; +import com.fanxb.bookmark.common.entity.po.Bookmark; import com.fanxb.bookmark.common.entity.Result; import com.fanxb.bookmark.common.util.UserContextHolder; import org.springframework.beans.factory.annotation.Autowired; @@ -210,13 +210,4 @@ public class BookmarkController { } - /** - * 获取首页固定的书签 - * - * @author fanxb - */ - public Result getHomePin() { - - } - } diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java index 0486089..38913d2 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java @@ -3,7 +3,7 @@ package com.fanxb.bookmark.business.bookmark.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fanxb.bookmark.business.bookmark.entity.BookmarkEs; import com.fanxb.bookmark.business.bookmark.entity.redis.VisitNumPlus; -import com.fanxb.bookmark.common.entity.Bookmark; +import com.fanxb.bookmark.common.entity.po.Bookmark; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; @@ -57,7 +57,7 @@ public interface BookmarkDao extends BaseMapper { * Description: 根据用户id获取其所有数据 * * @param userId userid - * @return java.util.List + * @return java.util.List * @author fanxb * @date 2019/7/9 18:55 */ @@ -68,7 +68,7 @@ public interface BookmarkDao extends BaseMapper { * * @param userId userId * @param path path - * @return java.util.List + * @return java.util.List * @author fanxb * @date 2019/7/17 14:48 */ @@ -219,7 +219,7 @@ public interface BookmarkDao extends BaseMapper { * * @param userId 用户id * @param num num - * @return java.util.List + * @return java.util.List * @author fanxb * @date 2021/8/20 上午11:52 */ @@ -232,7 +232,7 @@ public interface BookmarkDao extends BaseMapper { * @param userId userId * @param start 开始 * @param size 数量 - * @return java.util.List + * @return java.util.List * @author fanxb * @date 2021/8/20 下午12:02 */ @@ -254,7 +254,7 @@ public interface BookmarkDao extends BaseMapper { * 查询一个用户全部的书签路径 * * @param userId userId - * @return java.util.List + * @return java.util.List * @author fanxb * @date 2021/8/20 上午11:58 */ diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/entity/BookmarkEs.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/entity/BookmarkEs.java index bf36075..a4a83f3 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/entity/BookmarkEs.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/entity/BookmarkEs.java @@ -1,6 +1,6 @@ package com.fanxb.bookmark.business.bookmark.entity; -import com.fanxb.bookmark.common.entity.Bookmark; +import com.fanxb.bookmark.common.entity.po.Bookmark; import lombok.Data; /** diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java index a390bcb..9e21f06 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java @@ -2,7 +2,7 @@ package com.fanxb.bookmark.business.bookmark.service; import com.fanxb.bookmark.business.bookmark.entity.BookmarkEs; import com.fanxb.bookmark.business.bookmark.entity.MoveNodeBody; -import com.fanxb.bookmark.common.entity.Bookmark; +import com.fanxb.bookmark.common.entity.po.Bookmark; import java.io.InputStream; import java.util.List; @@ -28,7 +28,7 @@ public interface BookmarkService { * * @param userId userId * @param path path - * @return java.util.List + * @return java.util.List * @author fanxb * @date 2019/7/15 13:40 */ @@ -38,7 +38,7 @@ public interface BookmarkService { * 功能描述: 获取某个用户的书签map * * @param userId userId - * @return java.util.Map> + * @return java.util.Map> * @author fanxb * @date 2019/12/14 0:02 */ @@ -60,7 +60,7 @@ public interface BookmarkService { * Description: 详情 * * @param bookmark 插入一条记录 - * @return com.fanxb.bookmark.common.entity.Bookmark + * @return com.fanxb.bookmark.common.entity.po.Bookmark * @author fanxb * @date 2019/7/12 17:18 */ @@ -122,7 +122,7 @@ public interface BookmarkService { * 功能描述: 获取用户访问次数前num的书签数据 * * @param num 获取条数 - * @return java.util.List + * @return java.util.List * @author fanxb * @date 2020/8/26 15:54 */ diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/PinYinService.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/PinYinService.java index 32521fe..0e0c5ba 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/PinYinService.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/PinYinService.java @@ -1,6 +1,6 @@ package com.fanxb.bookmark.business.bookmark.service; -import com.fanxb.bookmark.common.entity.Bookmark; +import com.fanxb.bookmark.common.entity.po.Bookmark; import java.util.List; @@ -38,7 +38,7 @@ public interface PinYinService { * 处理bookmark searchKey * * @param bookmark 处理单个 - * @return java.util.List + * @return java.util.List * @author fanxb * @date 2021/3/13 **/ @@ -48,7 +48,7 @@ public interface PinYinService { * 处理bookmarks searchKey * * @param bookmarks 待处理舒淇啊你列表 - * @return java.util.List + * @return java.util.List * @author fanxb * @date 2021/3/13 **/ diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkBackupServiceImpl.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkBackupServiceImpl.java index 693d5ef..e401d92 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkBackupServiceImpl.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkBackupServiceImpl.java @@ -4,7 +4,7 @@ import com.fanxb.bookmark.business.bookmark.dao.BookmarkDao; import com.fanxb.bookmark.business.bookmark.entity.BookmarkEs; import com.fanxb.bookmark.business.bookmark.service.BookmarkBackupService; import com.fanxb.bookmark.common.constant.EsConstant; -import com.fanxb.bookmark.common.entity.Bookmark; +import com.fanxb.bookmark.common.entity.po.Bookmark; import com.fanxb.bookmark.common.entity.EsEntity; import com.fanxb.bookmark.common.util.EsUtil; import org.elasticsearch.index.query.TermQueryBuilder; diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java index e6f62fd..4e4e32d 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java @@ -3,7 +3,6 @@ package com.fanxb.bookmark.business.bookmark.service.impl; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fanxb.bookmark.business.api.UserApi; import com.fanxb.bookmark.business.bookmark.dao.BookmarkDao; import com.fanxb.bookmark.business.bookmark.entity.BookmarkEs; @@ -13,7 +12,7 @@ import com.fanxb.bookmark.business.bookmark.service.BookmarkService; import com.fanxb.bookmark.business.bookmark.service.PinYinService; import com.fanxb.bookmark.common.constant.EsConstant; import com.fanxb.bookmark.common.constant.RedisConstant; -import com.fanxb.bookmark.common.entity.Bookmark; +import com.fanxb.bookmark.common.entity.po.Bookmark; import com.fanxb.bookmark.common.util.*; import lombok.extern.slf4j.Slf4j; import org.elasticsearch.index.query.BoolQueryBuilder; diff --git a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/PinYinServiceImpl.java b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/PinYinServiceImpl.java index 076f38e..7e09766 100644 --- a/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/PinYinServiceImpl.java +++ b/bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/PinYinServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.fanxb.bookmark.business.api.UserApi; import com.fanxb.bookmark.business.bookmark.dao.BookmarkDao; import com.fanxb.bookmark.business.bookmark.service.PinYinService; -import com.fanxb.bookmark.common.entity.Bookmark; +import com.fanxb.bookmark.common.entity.po.Bookmark; import com.fanxb.bookmark.common.exception.CustomException; import com.fanxb.bookmark.common.util.UserContextHolder; import com.github.houbb.pinyin.constant.enums.PinyinStyleEnum; diff --git a/bookMarkService/business/bookmark/src/main/resources/mapper/bookmark-bookmarkMapper.xml b/bookMarkService/business/bookmark/src/main/resources/mapper/bookmark-bookmarkMapper.xml index 7f7ad48..85d04ae 100644 --- a/bookMarkService/business/bookmark/src/main/resources/mapper/bookmark-bookmarkMapper.xml +++ b/bookMarkService/business/bookmark/src/main/resources/mapper/bookmark-bookmarkMapper.xml @@ -22,7 +22,7 @@ where userId = #{userId} and path = #{path} - select bookmarkId, path, @@ -37,7 +37,7 @@ order by path, sort - select bookmarkId, path, @@ -75,7 +75,7 @@ - + update bookmark set name = #{name}, url = #{url},searchKey = #{searchKey},icon=#{icon} where bookmarkId = #{bookmarkId} and userId = #{userId} diff --git a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/controller/BaseInfoController.java b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/controller/BaseInfoController.java index 5a05dcd..93de738 100644 --- a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/controller/BaseInfoController.java +++ b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/controller/BaseInfoController.java @@ -5,7 +5,7 @@ import com.fanxb.bookmark.business.user.vo.EmailUpdateBody; import com.fanxb.bookmark.business.user.vo.UpdatePasswordBody; import com.fanxb.bookmark.business.user.vo.UsernameBody; import com.fanxb.bookmark.common.entity.Result; -import com.fanxb.bookmark.common.entity.User; +import com.fanxb.bookmark.common.entity.po.User; import com.fanxb.bookmark.common.util.UserContextHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/dao/UserDao.java b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/dao/UserDao.java index ba7ad8f..3ce6b63 100644 --- a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/dao/UserDao.java +++ b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/dao/UserDao.java @@ -1,7 +1,6 @@ package com.fanxb.bookmark.business.user.dao; -import com.fanxb.bookmark.common.entity.User; -import com.fanxb.bookmark.common.entity.redis.UserBookmarkUpdate; +import com.fanxb.bookmark.common.entity.po.User; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; @@ -33,7 +32,7 @@ public interface UserDao { * * @param name username * @param email email - * @return com.fanxb.bookmark.common.entity.User + * @return com.fanxb.bookmark.common.entity.po.User * @author fanxb * @date 2019/7/6 16:45 */ @@ -64,7 +63,7 @@ public interface UserDao { * * @param userId userId * @param githubId githubId - * @return com.fanxb.bookmark.common.entity.User + * @return com.fanxb.bookmark.common.entity.po.User * @author fanxb * @date 2019/7/30 16:08 */ diff --git a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/BaseInfoService.java b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/BaseInfoService.java index 837cc46..e5cd833 100644 --- a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/BaseInfoService.java +++ b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/BaseInfoService.java @@ -2,7 +2,7 @@ package com.fanxb.bookmark.business.user.service; import com.fanxb.bookmark.business.user.vo.EmailUpdateBody; import com.fanxb.bookmark.business.user.vo.UpdatePasswordBody; -import com.fanxb.bookmark.common.entity.User; +import com.fanxb.bookmark.common.entity.po.User; /** * 个人信息修改 diff --git a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/BaseInfoServiceImpl.java b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/BaseInfoServiceImpl.java index 70c04ca..4c7dd1c 100644 --- a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/BaseInfoServiceImpl.java +++ b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/BaseInfoServiceImpl.java @@ -8,7 +8,7 @@ import com.fanxb.bookmark.business.user.vo.EmailUpdateBody; import com.fanxb.bookmark.business.user.vo.UpdatePasswordBody; import com.fanxb.bookmark.common.constant.CommonConstant; import com.fanxb.bookmark.common.entity.MailInfo; -import com.fanxb.bookmark.common.entity.User; +import com.fanxb.bookmark.common.entity.po.User; import com.fanxb.bookmark.common.exception.CustomException; import com.fanxb.bookmark.common.util.*; import lombok.extern.slf4j.Slf4j; diff --git a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/OauthServiceImpl.java b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/OauthServiceImpl.java index 54faaec..1d802ab 100644 --- a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/OauthServiceImpl.java +++ b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/OauthServiceImpl.java @@ -7,7 +7,7 @@ import com.fanxb.bookmark.business.user.service.OauthService; import com.fanxb.bookmark.business.user.service.UserService; import com.fanxb.bookmark.business.user.vo.OauthBody; import com.fanxb.bookmark.common.constant.CommonConstant; -import com.fanxb.bookmark.common.entity.User; +import com.fanxb.bookmark.common.entity.po.User; import com.fanxb.bookmark.common.exception.CustomException; import com.fanxb.bookmark.common.util.HttpUtil; import com.fanxb.bookmark.common.util.JwtUtil; diff --git a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/UserServiceImpl.java b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/UserServiceImpl.java index ded2686..2e37790 100644 --- a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/UserServiceImpl.java +++ b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/UserServiceImpl.java @@ -12,7 +12,7 @@ import com.fanxb.bookmark.common.constant.CommonConstant; import com.fanxb.bookmark.common.constant.NumberConstant; import com.fanxb.bookmark.common.constant.RedisConstant; import com.fanxb.bookmark.common.entity.MailInfo; -import com.fanxb.bookmark.common.entity.User; +import com.fanxb.bookmark.common.entity.po.User; import com.fanxb.bookmark.common.exception.CustomException; import com.fanxb.bookmark.common.exception.FormDataException; import com.fanxb.bookmark.common.util.*; @@ -159,7 +159,7 @@ public class UserServiceImpl implements UserService { * Description: 根据userId获取用户信息 * * @param userId userId - * @return com.fanxb.bookmark.common.entity.User + * @return com.fanxb.bookmark.common.entity.po.User * @author fanxb * @date 2019/7/30 15:57 */ diff --git a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/vo/LoginRes.java b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/vo/LoginRes.java index 634fe17..2fb3f35 100644 --- a/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/vo/LoginRes.java +++ b/bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/vo/LoginRes.java @@ -1,6 +1,6 @@ package com.fanxb.bookmark.business.user.vo; -import com.fanxb.bookmark.common.entity.User; +import com.fanxb.bookmark.common.entity.po.User; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/bookMarkService/business/user/src/main/resources/mapper/userMapper.xml b/bookMarkService/business/user/src/main/resources/mapper/userMapper.xml index 344df24..8e54970 100644 --- a/bookMarkService/business/user/src/main/resources/mapper/userMapper.xml +++ b/bookMarkService/business/user/src/main/resources/mapper/userMapper.xml @@ -9,7 +9,7 @@ (#{username}, #{email}, #{icon}, #{password}, #{createTime}, #{lastLoginTime}, #{version}) - select * from user where username = #{name} @@ -29,7 +29,7 @@ where email = #{email} - select * from user where userId = #{userId} diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/dao/UrlDao.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/dao/UrlDao.java index 7543089..c5a5d4e 100644 --- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/dao/UrlDao.java +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/dao/UrlDao.java @@ -1,6 +1,6 @@ package com.fanxb.bookmark.common.dao; -import com.fanxb.bookmark.common.entity.Url; +import com.fanxb.bookmark.common.entity.po.Url; import org.springframework.stereotype.Component; import java.util.List; @@ -20,7 +20,7 @@ public interface UrlDao { * * @author fanxb * @date 2019/7/9 14:52 - * @return java.util.List + * @return java.util.List */ List getPublicUrl(); } diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/Bookmark.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/Bookmark.java similarity index 97% rename from bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/Bookmark.java rename to bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/Bookmark.java index 73645af..31975f4 100644 --- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/Bookmark.java +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/Bookmark.java @@ -1,4 +1,4 @@ -package com.fanxb.bookmark.common.entity; +package com.fanxb.bookmark.common.entity.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/Url.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/Url.java similarity index 84% rename from bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/Url.java rename to bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/Url.java index 9704038..0e6f132 100644 --- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/Url.java +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/Url.java @@ -1,4 +1,4 @@ -package com.fanxb.bookmark.common.entity; +package com.fanxb.bookmark.common.entity.po; import lombok.Data; diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/User.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/User.java similarity index 91% rename from bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/User.java rename to bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/User.java index cd5ee81..3f95199 100644 --- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/User.java +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/User.java @@ -1,50 +1,50 @@ -package com.fanxb.bookmark.common.entity; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -/** - * 类功能简述： - * 类功能详述： - * - * @author fanxb - * @date 2019/7/4 20:14 - */ -@Data -public class User { - - private int userId; - /** - * 第三方github登陆id,-1说明非github登陆 - */ - private Long githubId; - private String username; - private String email; - private String newEmail; - private String icon; - /** - * 是否未设置密码 - */ - private Boolean noPassword; - @JSONField(serialize = false) - private String password; - private long createTime; - /** - * 上次登录时间 - */ - private long lastLoginTime; - /** - * 书签同步版本 - */ - private int version; - /** - * 默认搜索引擎 - */ - private String defaultSearchEngine; - -} +package com.fanxb.bookmark.common.entity.po; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.util.HashMap; +import java.util.Map; + +/** + * 类功能简述： + * 类功能详述： + * + * @author fanxb + * @date 2019/7/4 20:14 + */ +@Data +public class User { + + private int userId; + /** + * 第三方github登陆id,-1说明非github登陆 + */ + private Long githubId; + private String username; + private String email; + private String newEmail; + private String icon; + /** + * 是否未设置密码 + */ + private Boolean noPassword; + @JSONField(serialize = false) + private String password; + private long createTime; + /** + * 上次登录时间 + */ + private long lastLoginTime; + /** + * 书签同步版本 + */ + private int version; + /** + * 默认搜索引擎 + */ + private String defaultSearchEngine; + +} diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/filter/LoginFilter.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/filter/LoginFilter.java index 639e492..db81d00 100644 --- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/filter/LoginFilter.java +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/filter/LoginFilter.java @@ -5,7 +5,7 @@ import com.auth0.jwt.interfaces.Claim; import com.fanxb.bookmark.common.constant.CommonConstant; import com.fanxb.bookmark.common.dao.UrlDao; import com.fanxb.bookmark.common.entity.Result; -import com.fanxb.bookmark.common.entity.Url; +import com.fanxb.bookmark.common.entity.po.Url; import com.fanxb.bookmark.common.entity.UserContext; import com.fanxb.bookmark.common.exception.NoLoginException; import com.fanxb.bookmark.common.util.JwtUtil; diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/RedisUtil.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/RedisUtil.java index 73aa235..a2a8fea 100644 --- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/RedisUtil.java +++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/RedisUtil.java @@ -1,9 +1,6 @@ package com.fanxb.bookmark.common.util; import com.alibaba.fastjson.JSON; -import com.fanxb.bookmark.common.constant.RedisConstant; -import com.fanxb.bookmark.common.entity.User; -import com.fanxb.bookmark.common.entity.redis.UserBookmarkUpdate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; diff --git a/bookMarkService/common/src/main/resources/mapper/common-urlMapper.xml b/bookMarkService/common/src/main/resources/mapper/common-urlMapper.xml index 5d3f254..c7f6c88 100644 --- a/bookMarkService/common/src/main/resources/mapper/common-urlMapper.xml +++ b/bookMarkService/common/src/main/resources/mapper/common-urlMapper.xml @@ -3,7 +3,7 @@ - select * from url where type = 0