diff --git a/book-api/src/main/resources/application-dev.yml b/book-api/src/main/resources/application-dev.yml index 9d99d97..62d7911 100644 --- a/book-api/src/main/resources/application-dev.yml +++ b/book-api/src/main/resources/application-dev.yml @@ -13,9 +13,9 @@ spring: minimum-idle: 5 # 最小连接数 maximum-pool-size: 20 # 最大连接数 auto-commit: true # 自动提交 - idle-timeout: 600000 # 连接超时的最大时长（毫秒），超时则会被释放（retired） + idle-timeout: 300000 # 连接超时的最大时长（毫秒），超时则会被释放（retired） pool-name: DataSourceHikariCP # 连接池的名字 - max-lifetime: 18000000 # 连接池的最大生命时长（毫秒），超时则会被释放（retired） + max-lifetime: 540000 # 连接池的最大生命时长（毫秒），超时则会被释放（retired） connection-test-query: SELECT 1 redis: host: 82.156.121.2 @@ -24,11 +24,11 @@ spring: database: 1 # 使用的数据库编号 jedis: pool: - max-idle: 200 # 最大空闲连接 + max-idle: 50 # 最大空闲连接 max-active: 200 # 连接池最大连接数 - max-wait: 100 # 连接池最大阻塞等待时间, -1表示没有限制 + max-wait: 5000 # 连接池最大阻塞等待时间, -1表示没有限制 min-idle: 4 # 最小空闲连接 - timeout: 50000 + timeout: 60000 data: mongodb: # uri: mongodb://root:root@192.168.1.202:27017 diff --git a/book-mapper/src/main/java/com/imooc/mapper/FansMapper.java b/book-mapper/src/main/java/com/imooc/mapper/FansMapper.java index a6a9b88..d47f335 100644 --- a/book-mapper/src/main/java/com/imooc/mapper/FansMapper.java +++ b/book-mapper/src/main/java/com/imooc/mapper/FansMapper.java @@ -6,4 +6,5 @@ import org.springframework.stereotype.Repository; @Repository public interface FansMapper extends MyMapper { + int updateByPrimaryKeySelective(Fans record); } \ No newline at end of file diff --git a/book-mapper/src/main/resources/mapper/FansMapper.xml b/book-mapper/src/main/resources/mapper/FansMapper.xml index 0bc9b0b..09a414a 100644 --- a/book-mapper/src/main/resources/mapper/FansMapper.xml +++ b/book-mapper/src/main/resources/mapper/FansMapper.xml @@ -10,4 +10,13 @@ + + UPDATE t_fans + + vloger_id = #{vlogerId}, + fan_id = #{fanId}, + is_fan_friend_of_mine = #{isFanFriendOfMine}, + + WHERE id = #{id} + \ No newline at end of file diff --git a/book-mapper/src/main/resources/mapper/FansMapperCustom.xml b/book-mapper/src/main/resources/mapper/FansMapperCustom.xml index 789dfa3..a822bd8 100644 --- a/book-mapper/src/main/resources/mapper/FansMapperCustom.xml +++ b/book-mapper/src/main/resources/mapper/FansMapperCustom.xml @@ -7,7 +7,9 @@ SELECT u.id as vlogerId, u.nickname as nickname, - u.face as face + u.face as face, + f.is_fan_friend_of_mine as bothFriend, + f.created_time as createdTime FROM t_fans f LEFT JOIN @@ -17,7 +19,7 @@ WHERE f.fan_id = #{paramMap.myId} ORDER BY - u.nickname + f.created_time ASC @@ -27,7 +29,9 @@ SELECT u.id as fanId, u.nickname as nickname, - u.face as face + u.face as face, + f.is_fan_friend_of_mine as bothFriend, + f.created_time as createdTime FROM t_fans f LEFT JOIN diff --git a/book-model/src/main/java/com/imooc/vo/FansVO.java b/book-model/src/main/java/com/imooc/vo/FansVO.java index f741355..40947be 100644 --- a/book-model/src/main/java/com/imooc/vo/FansVO.java +++ b/book-model/src/main/java/com/imooc/vo/FansVO.java @@ -14,4 +14,6 @@ public class FansVO { private String nickname; private String face; private boolean isFriend = false; + private int bothFriend; + private String createdTime; } \ No newline at end of file diff --git a/book-model/src/main/java/com/imooc/vo/VlogerVO.java b/book-model/src/main/java/com/imooc/vo/VlogerVO.java index 82bd507..c65d52a 100644 --- a/book-model/src/main/java/com/imooc/vo/VlogerVO.java +++ b/book-model/src/main/java/com/imooc/vo/VlogerVO.java @@ -14,4 +14,7 @@ public class VlogerVO { private String nickname; private String face; private boolean isFollowed = true; + private int bothFriend; + private String createdTime; + } \ No newline at end of file diff --git a/book-service/src/main/java/com/imooc/service/impl/FansServiceImpl.java b/book-service/src/main/java/com/imooc/service/impl/FansServiceImpl.java index 4db8105..af60bfc 100644 --- a/book-service/src/main/java/com/imooc/service/impl/FansServiceImpl.java +++ b/book-service/src/main/java/com/imooc/service/impl/FansServiceImpl.java @@ -63,6 +63,7 @@ public class FansServiceImpl extends BaseInfoProperties implements FansService { vloger.setIsFanFriendOfMine(YesOrNo.YES.type); fansMapper.updateByPrimaryKeySelective(vloger); + System.out.println(vloger.getIsFanFriendOfMine()); } else { fans.setIsFanFriendOfMine(YesOrNo.NO.type); } @@ -86,7 +87,6 @@ public class FansServiceImpl extends BaseInfoProperties implements FansService { Example.Criteria criteria = example.createCriteria(); criteria.andEqualTo("vlogerId", vlogerId); criteria.andEqualTo("fanId", fanId); - List list = fansMapper.selectByExample(example); Fans fan = null; @@ -107,6 +107,7 @@ public class FansServiceImpl extends BaseInfoProperties implements FansService { // 抹除双方的朋友关系，自己的关系删除即可 Fans pendingFan = queryFansRelationship(vlogerId, myId); pendingFan.setIsFanFriendOfMine(YesOrNo.NO.type); + System.out.println(pendingFan.getIsFanFriendOfMine()); fansMapper.updateByPrimaryKeySelective(pendingFan); }