fanxb/bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

refactor:实体类移动到po包下

Browse Source
This commit is contained in:
fanxb 2022-03-24 10:24:33 +08:00
parent 6e2948ab9c
commit 974f8c18b4
25 changed files with 91 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/consumer/BookmarkInsertEsConsumer.java
View File

@ -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;

11
bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/controller/BookmarkController.java
View File

@ -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() {
}
}

12
bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/dao/BookmarkDao.java
View File

@ -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<Bookmark> {
* Description: 根据用户id获取其所有数据
*
* @param userId userid
* @return java.util.List<com.fanxb.bookmark.common.entity.Bookmark>
* @return java.util.List<com.fanxb.bookmark.common.entity.po.Bookmark>
* @author fanxb
* @date 2019/7/9 18:55
*/
@ -68,7 +68,7 @@ public interface BookmarkDao extends BaseMapper<Bookmark> {
*
* @param userId userId
* @param path path
* @return java.util.List<com.fanxb.bookmark.common.entity.Bookmark>
* @return java.util.List<com.fanxb.bookmark.common.entity.po.Bookmark>
* @author fanxb
* @date 2019/7/17 14:48
*/
@ -219,7 +219,7 @@ public interface BookmarkDao extends BaseMapper<Bookmark> {
*
* @param userId 用户id
* @param num num
* @return java.util.List<com.fanxb.bookmark.common.entity.Bookmark>
* @return java.util.List<com.fanxb.bookmark.common.entity.po.Bookmark>
* @author fanxb
* @date 2021/8/20 上午11:52
*/
@ -232,7 +232,7 @@ public interface BookmarkDao extends BaseMapper<Bookmark> {
* @param userId userId
* @param start 开始
* @param size 数量
* @return java.util.List<com.fanxb.bookmark.common.entity.Bookmark>
* @return java.util.List<com.fanxb.bookmark.common.entity.po.Bookmark>
* @author fanxb
* @date 2021/8/20 下午12:02
*/
@ -254,7 +254,7 @@ public interface BookmarkDao extends BaseMapper<Bookmark> {
* 查询一个用户全部的书签路径
*
* @param userId userId
* @return java.util.List<com.fanxb.bookmark.common.entity.Bookmark>
* @return java.util.List<com.fanxb.bookmark.common.entity.po.Bookmark>
* @author fanxb
* @date 2021/8/20 上午11:58
*/

2
bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/entity/BookmarkEs.java
View File

@ -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;
/**

10
bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/BookmarkService.java
View File

@ -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<com.fanxb.bookmark.common.entity.Bookmark>
* @return java.util.List<com.fanxb.bookmark.common.entity.po.Bookmark>
* @author fanxb
* @date 2019/7/15 13:40
*/
@ -38,7 +38,7 @@ public interface BookmarkService {
* 功能描述: 获取某个用户的书签map
*
* @param userId userId
* @return java.util.Map<java.lang.String, java.util.List < com.fanxb.bookmark.common.entity.Bookmark>>
* @return java.util.Map<java.lang.String, java.util.List < com.fanxb.bookmark.common.entity.po.Bookmark>>
* @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<com.fanxb.bookmark.common.entity.Bookmark>
* @return java.util.List<com.fanxb.bookmark.common.entity.po.Bookmark>
* @author fanxb
* @date 2020/8/26 15:54
*/

6
bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/PinYinService.java
View File

@ -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<com.fanxb.bookmark.common.entity.Bookmark>
* @return java.util.List<com.fanxb.bookmark.common.entity.po.Bookmark>
* @author fanxb
* @date 2021/3/13
**/
@ -48,7 +48,7 @@ public interface PinYinService {
* 处理bookmarks searchKey
*
* @param bookmarks 待处理舒淇啊你列表
* @return java.util.List<com.fanxb.bookmark.common.entity.Bookmark>
* @return java.util.List<com.fanxb.bookmark.common.entity.po.Bookmark>
* @author fanxb
* @date 2021/3/13
**/

2
bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkBackupServiceImpl.java
View File

@ -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;

3
bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/BookmarkServiceImpl.java
View File

@ -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;

2
bookMarkService/business/bookmark/src/main/java/com/fanxb/bookmark/business/bookmark/service/impl/PinYinServiceImpl.java
View File

@ -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;

6
bookMarkService/business/bookmark/src/main/resources/mapper/bookmark-bookmarkMapper.xml
View File

@ -22,7 +22,7 @@
where userId = #{userId} and path = #{path}
</select>
<select id="getListByUserId" resultType="com.fanxb.bookmark.common.entity.Bookmark">
<select id="getListByUserId" resultType="com.fanxb.bookmark.common.entity.po.Bookmark">
select
bookmarkId,
path,
@ -37,7 +37,7 @@
order by path, sort
</select>
<select id="getListByUserIdAndPath" resultType="com.fanxb.bookmark.common.entity.Bookmark">
<select id="getListByUserIdAndPath" resultType="com.fanxb.bookmark.common.entity.po.Bookmark">
select
bookmarkId,
path,
@ -75,7 +75,7 @@
</foreach>
</delete>
<update id="editBookmark" parameterType="com.fanxb.bookmark.common.entity.Bookmark">
<update id="editBookmark" parameterType="com.fanxb.bookmark.common.entity.po.Bookmark">
update bookmark
set name = #{name}, url = #{url},searchKey = #{searchKey},icon=#{icon}
where bookmarkId = #{bookmarkId} and userId = #{userId}

2
bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/controller/BaseInfoController.java
View File

@ -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;

7
bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/dao/UserDao.java
View File

@ -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
*/

2
bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/BaseInfoService.java
View File

@ -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;
/**
* 个人信息修改

2
bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/BaseInfoServiceImpl.java
View File

@ -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;

2
bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/OauthServiceImpl.java
View File

@ -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;

4
bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/service/impl/UserServiceImpl.java
View File

@ -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
*/

2
bookMarkService/business/user/src/main/java/com/fanxb/bookmark/business/user/vo/LoginRes.java
View File

@ -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;

4
bookMarkService/business/user/src/main/resources/mapper/userMapper.xml
View File

@ -9,7 +9,7 @@
(#{username}, #{email}, #{icon}, #{password}, #{createTime}, #{lastLoginTime}, #{version})
</insert>
<select id="selectByUsernameOrEmail" resultType="com.fanxb.bookmark.common.entity.User">
<select id="selectByUsernameOrEmail" resultType="com.fanxb.bookmark.common.entity.po.User">
select *
from user
where username = #{name}
@ -29,7 +29,7 @@
where email = #{email}
</update>
<select id="selectByUserIdOrGithubId" resultType="com.fanxb.bookmark.common.entity.User">
<select id="selectByUserIdOrGithubId" resultType="com.fanxb.bookmark.common.entity.po.User">
select *
from user
where userId = #{userId}

4
bookMarkService/common/src/main/java/com/fanxb/bookmark/common/dao/UrlDao.java
View File

@ -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<com.fanxb.bookmark.common.entity.Url>
* @return java.util.List<com.fanxb.bookmark.common.entity.po.Url>
*/
List<Url> getPublicUrl();
}

2
bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/Bookmark.java → bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/Bookmark.java
View File

@ -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;

2
bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/Url.java → bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/Url.java
View File

@ -1,4 +1,4 @@
package com.fanxb.bookmark.common.entity;
package com.fanxb.bookmark.common.entity.po;
import lombok.Data;

2
bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/User.java → bookMarkService/common/src/main/java/com/fanxb/bookmark/common/entity/po/User.java
View File

@ -1,4 +1,4 @@
package com.fanxb.bookmark.common.entity;
package com.fanxb.bookmark.common.entity.po;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.annotation.JSONField;

2
bookMarkService/common/src/main/java/com/fanxb/bookmark/common/filter/LoginFilter.java
View File

@ -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;

3
bookMarkService/common/src/main/java/com/fanxb/bookmark/common/util/RedisUtil.java
View File

@ -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;

2
bookMarkService/common/src/main/resources/mapper/common-urlMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.fanxb.bookmark.common.dao.UrlDao">
<select id="getPublicUrl" resultType="com.fanxb.bookmark.common.entity.Url">
<select id="getPublicUrl" resultType="com.fanxb.bookmark.common.entity.po.Url">
select *
from url
where type = 0