diff --git a/YouBili_front/src/utils/option.js b/YouBili_front/src/utils/option.js index 9a999ddd3b93f6fc0538f138569f1d13ba4b17df..582947ced61040ee0607e2e891f39f01be1beff6 100644 --- a/YouBili_front/src/utils/option.js +++ b/YouBili_front/src/utils/option.js @@ -327,3 +327,12 @@ export function uploadVideo(params) { } }) } + +// 上传视频信息 +export function uploadContent(params) { + return request({ + method: "post", + url: "/video/uploadContent", + data: params + }) +} diff --git a/YouBili_front/src/utils/request.js b/YouBili_front/src/utils/request.js index 81b26b393798a22983ef9212963022b958bff4bd..9f1e622fa3eff3765e63ec36002af7408aa9ade1 100644 --- a/YouBili_front/src/utils/request.js +++ b/YouBili_front/src/utils/request.js @@ -3,7 +3,7 @@ import axios from 'axios' const instance = axios.create({ // API接口的base_url // baseURL: 'http://youbili2303.nat300.top', - baseURL: 'http://localhost:8089', + baseURL: 'http://localhost:10001', // 超时时间 timeout: 20000, // headers配置 diff --git a/YouBili_front/src/views/contribute/contribute.vue b/YouBili_front/src/views/contribute/contribute.vue index e12434d5c1e1d3c5574bbf00770a381794bbc6c7..346a99b4e2c7b352c1a2badb48d44fd3f049ce7f 100644 --- a/YouBili_front/src/views/contribute/contribute.vue +++ b/YouBili_front/src/views/contribute/contribute.vue @@ -96,7 +96,7 @@ :file-list="fileList">
将文件拖到此处,或点击上传
-
只能上传mpe4文件,且不超过500mb
+
只能上传mpe4文件,最少上传1920*1080且不超过500mb

{{msg}}

@@ -119,7 +119,7 @@

标签

- + import { uploadVideo, // 上传视频 + uploadContent, // 提交视频信息 } from "@/utils/option" export default { name: "contribute", @@ -155,7 +156,7 @@ export default { videoImgUrl: "", // 视频封面 videoSrcUrl: "", type: "", // 分类 - tag: "" // 标签 + tag: [] // 标签 }, msg: "", /*文本框*/ @@ -164,35 +165,38 @@ export default { /*文本框*/ /*视频分类*/ options: [{ - value: '选项1', - label: '综艺' - }, { - value: '选项2', + value: '2', label: '电影' }, { - value: '选项3', + value: '3', label: '电视剧' }, { - value: '选项4', + value: '4', + label: '综艺' + }, { + value: '5', label: '动漫' }, { - value: '选项5', - label: '鬼畜' + value: '6', + label: '自制' + }, { + value: '7', + label: '搬运' }], tagList: [{ - value: '选项1', + value: '1', label: '鬼畜' }, { - value: '选项2', + value: '2', label: '搞笑' }, { - value: '选项3', + value: '3', label: '热血' }, { - value: '选项4', + value: '4', label: '恐怖' }, { - value: '选项5', + value: '5', label: '睡眠' }], value: '', @@ -210,7 +214,11 @@ export default { // 上传给后台管理视频信息 uploadInformation() { console.log(this.video); - + uploadContent(this.video).then(res => { + if (res.success) { + alert("成了") + } + }) }, // 上传视频 uploadVideoFile(param) { diff --git a/YouBili_front/src/views/personal/follow.vue b/YouBili_front/src/views/personal/follow.vue index ac7b16da4f10d7cf461706a59aceac97c538e167..f2c90cb2a0377d9422d03e0dd58b4b86a2ba1785 100644 --- a/YouBili_front/src/views/personal/follow.vue +++ b/YouBili_front/src/views/personal/follow.vue @@ -162,30 +162,7 @@ export default { }) console.log(arr) } - // toggleFollow(event) { - // console.log(111) - // // 获取点击的按钮对应的用户 id - // let id = event.target.value; - // // 在 number 数组中找到对应的用户对象 - // let user = this.number.find(v => v.id == id); - // // 切换用户的关注状态 - // this.user.type = !this.user.type; - // if (this.user.type) { - // // 弹出关注成功的框框 - // Notification(this.$notify)({ - // title: '关注成功', - // offset: 100, - // type: "success" - // }); - // } else { - // // 弹出取消关注成功的框框 - // Notification(this.$notify)({ - // title: '取消关注', - // offset: 100, - // type: "error" - // }); - // } - // }, + }, created() { diff --git a/YouBili_front/src/views/personal/otherSpace.vue b/YouBili_front/src/views/personal/otherSpace.vue index 8725190cb4650aded972cb11a6cabc7f08e39e37..45664b947894eee6bf31bf63cd763251a55e3964 100644 --- a/YouBili_front/src/views/personal/otherSpace.vue +++ b/YouBili_front/src/views/personal/otherSpace.vue @@ -47,7 +47,7 @@
-
diff --git a/YouBili_front/src/views/personal/personalCenter.vue b/YouBili_front/src/views/personal/personalCenter.vue index bc75f6e3a5fe26832f5f0b3483dfa019e9b85f81..e980d0e53f61d0cc6f56616d482413a934964954 100644 --- a/YouBili_front/src/views/personal/personalCenter.vue +++ b/YouBili_front/src/views/personal/personalCenter.vue @@ -4,7 +4,7 @@

- {{ this.user.nickname }}的个人中心

+ {{ user.nickname }}的个人中心
@@ -13,9 +13,9 @@
    -
  • 昵称: {{ this.user.nickname }}
  • -
  • 生日: {{ this.user.birthday }}
  • -
  • 会员等级: {{ this.user.accountLevel }}
  • +
  • 昵称: {{ user.nickname }}
  • +
  • 生日: {{ user.birthday }}
  • +
  • 会员等级: {{ user.accountLevel }}
@@ -25,15 +25,15 @@ {{ - this.user.follows + user.follows }} {{ - this.user.fans + user.fans }} {{ - this.user.totalLikes + user.totalLikes }} @@ -51,7 +51,7 @@

{{ c }}

- +
@@ -91,6 +91,7 @@ import Sidebar from "@/components/sidebar.vue"; import Handder from "@/components/Handder.vue"; import {getPersonalCenterInfo} from "@/utils/option"; + export default { name: "personalCenter", components: {Handder, Sidebar}, @@ -126,13 +127,24 @@ export default { }, methods: {}, created() { - getPersonalCenterInfo(1).then(response => { - if (response.status == 20000) { - this.user = response.data; - } else { - this.$message.error(response.message) - } - }) + // this.$nextTick(() => { + getPersonalCenterInfo(1).then(response => { + if (response.success) { + // console.log(response.data) + this.user = response.data; + console.log(this.user) + } else { + this.$message.error(response.message) + } + }) + // }) + + }, + mounted() { + setTimeout(()=> { + console.log(this.user) + },200) + } } diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/common/cacheUtils/classification/dao/cache/impl/ClssificationCacheImpl.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/common/cacheUtils/classification/dao/cache/impl/ClssificationCacheImpl.java index a2c5748e3e365c84c659277c2089a56d23e17c9f..9ee95868a38c01db69eba6dbc7182f1e0b0bdea9 100644 --- a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/common/cacheUtils/classification/dao/cache/impl/ClssificationCacheImpl.java +++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/common/cacheUtils/classification/dao/cache/impl/ClssificationCacheImpl.java @@ -1,7 +1,6 @@ package cn.tedu.youbiliprojectbackend.common.cacheUtils.classification.dao.cache.impl; import cn.tedu.youbiliprojectbackend.common.cacheUtils.classification.dao.cache.ClassificationCache; -import cn.tedu.youbiliprojectbackend.modules.tag.classification.dao.repository.ICategoryRepository; import cn.tedu.youbiliprojectbackend.modules.tag.classification.pojo.vo.CategoryTitleVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -13,6 +12,7 @@ import java.util.List; /** * 实现类 + * * @author 赵錾 */ @Repository @@ -20,6 +20,7 @@ public class ClssificationCacheImpl implements ClassificationCache { @Autowired RedisTemplate template; + /** * 将分类信息放入缓存之中; */ diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/count/dao/cache/UserCountCacheRepository.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/count/dao/cache/UserCountCacheRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..33e1d2f5feba3368248c50bb0a5bef5016cdf5ca --- /dev/null +++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/count/dao/cache/UserCountCacheRepository.java @@ -0,0 +1,31 @@ +package cn.tedu.youbiliprojectbackend.modules.user.count.dao.cache; + +import cn.tedu.youbiliprojectbackend.common.consts.UserCacheConsts; + +public interface UserCountCacheRepository extends UserCacheConsts { + /** + * 向redis之中的计数字段添加粉丝数+1; + * @param userID + */ + void addFans(Long userID); + + /** + * 向redis之中的计数字段粉丝数-1; + * @param userID + */ + void removeFans(Long userID); + + /** + * 向redis之中的计数字段关注数+1; + * @param userID + */ + void addFollow (Long userID); + + + /** + * 向redis之中的计数字段粉丝数-1; + * @param userID + */ + void removeFollow(Long userID); + +} diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/count/dao/cache/impl/UserCountCacheRepositoryImpl.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/count/dao/cache/impl/UserCountCacheRepositoryImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..d8b82612f005fbfb1b73b5cf5f92c61e044b19ad --- /dev/null +++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/count/dao/cache/impl/UserCountCacheRepositoryImpl.java @@ -0,0 +1,133 @@ +package cn.tedu.youbiliprojectbackend.modules.user.count.dao.cache.impl; + +import cn.tedu.youbiliprojectbackend.common.cacheUtils.count.user.pojo.vo.UserCountsCacheVO; +import cn.tedu.youbiliprojectbackend.common.ex.ServiceException; +import cn.tedu.youbiliprojectbackend.common.web.response.ServiceCode; +import cn.tedu.youbiliprojectbackend.modules.user.count.dao.cache.UserCountCacheRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Repository; + +import java.io.Serializable; + +import static cn.tedu.youbiliprojectbackend.common.consts.CountConsts.USER_COUNT; + +@Repository +public class UserCountCacheRepositoryImpl implements UserCountCacheRepository { + + @Autowired + RedisTemplate redisTemplate; + + /** + * 向redis之中的计数字段添加粉丝数+1; + * + * @param userID + */ + @Override + public void addFans(Long userID) { + ValueOperations operations = redisTemplate.opsForValue(); + try{ + //当添加关注时,默认走到这里; 先认为这个字段的值未在redis之中修改过; + UserCountsCacheVO serializable = (UserCountsCacheVO) operations.get(USER_COUNT + userID+ ":" + true); + serializable.setFans(serializable.getFans()+1); + operations.set(USER_COUNT + userID + ":" + true,serializable); + redisTemplate.rename(USER_COUNT + userID+ ":" + true,USER_COUNT + userID + ":" + false); + }catch (Throwable e){ + // 在上面的try之中找不到key的值;则走到这个代码块之中 + try{ + //认为这个字段已经被修改过了; 则状态值字段为false + UserCountsCacheVO serializable = (UserCountsCacheVO) operations.get(USER_COUNT + userID + ":" + false); + System.out.println(serializable); + serializable.setFans(serializable.getFans()+1); + operations.set(USER_COUNT + userID + ":" + false,serializable); + }catch (Throwable e1){ + throw new ServiceException(ServiceCode.ERROR_CONFLICT,"用户ID错误"); + } + } + } + + /** + * 向redis之中的计数字段粉丝数-1; + * + * @param userID + */ + @Override + public void removeFans(Long userID) { + ValueOperations operations = redisTemplate.opsForValue(); + try{ + //当添加关注时,默认走到这里; 先认为这个字段的值未在redis之中修改过; + UserCountsCacheVO serializable = (UserCountsCacheVO) operations.get(USER_COUNT + userID+ ":" + true); + serializable.setFans(serializable.getFans() - 1); + operations.set(USER_COUNT + userID+ ":" + true,serializable); + redisTemplate.rename(USER_COUNT + userID+ ":" + true,USER_COUNT + userID + ":" + false); + }catch (Throwable e){ + // 在上面的try之中找不到key的值;则走到这个代码块之中 + try{ + //认为这个字段已经被修改过了; 则状态值字段为false + UserCountsCacheVO serializable = (UserCountsCacheVO) operations.get(USER_COUNT + userID + ":" + false); + System.out.println(serializable); + serializable.setFans(serializable.getFans() - 1); + operations.set(USER_COUNT + userID + ":" + false,serializable); + }catch (Throwable e1){ + throw new ServiceException(ServiceCode.ERROR_CONFLICT,"用户ID错误"); + } + } + } + + /** + * 向redis之中的计数字段关注数+1; + * + * @param userID + */ + @Override + public void addFollow(Long userID) { + ValueOperations operations = redisTemplate.opsForValue(); + try{ + //当添加关注时,默认走到这里; 先认为这个字段的值未在redis之中修改过; + UserCountsCacheVO serializable = (UserCountsCacheVO) operations.get(USER_COUNT + userID+ ":" + true); + serializable.setFans(serializable.getFollows()+1); + operations.set(USER_COUNT + userID+ ":" + true,serializable); + redisTemplate.rename(USER_COUNT + userID + ":" + true,USER_COUNT + userID + ":" + false); + }catch (Throwable e){ + // 在上面的try之中找不到key的值;则走到这个代码块之中 + try{ + //认为这个字段已经被修改过了; 则状态值字段为false + UserCountsCacheVO serializable = (UserCountsCacheVO) operations.get(USER_COUNT + userID + ":" + false); + System.out.println(serializable); + serializable.setFans(serializable.getFollows()+1); + operations.set(USER_COUNT + userID+ ":" + false,serializable); + }catch (Throwable e1){ + throw new ServiceException(ServiceCode.ERROR_CONFLICT,"用户ID错误"); + } + } + } + + /** + * 向redis之中的计数字段粉丝数-1; + * + * @param userID + */ + @Override + public void removeFollow(Long userID) { + ValueOperations operations = redisTemplate.opsForValue(); + try{ + //当添加关注时,默认走到这里; 先认为这个字段的值未在redis之中修改过; + UserCountsCacheVO serializable = (UserCountsCacheVO) operations.get(USER_COUNT + userID+ ":" + true); + serializable.setFans(serializable.getFollows()-1); + operations.set(USER_COUNT + userID + ":" + true,serializable); + redisTemplate.rename(USER_COUNT + userID+ ":" + true,USER_COUNT + userID + ":" + false); + }catch (Throwable e){ + // 在上面的try之中找不到key的值;则走到这个代码块之中 + try{ + //认为这个字段已经被修改过了; 则状态值字段为false + UserCountsCacheVO serializable = (UserCountsCacheVO) operations.get(USER_COUNT + userID + ":" + false); + System.out.println(serializable); + serializable.setFans(serializable.getFollows() - 1); + operations.set(USER_COUNT +userID+ ":" + false,serializable); + }catch (Throwable e1){ + throw new ServiceException(ServiceCode.ERROR_CONFLICT,"用户ID错误"); + } + } + } +} diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/count/service/CountSerivce.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/count/service/CountSerivce.java new file mode 100644 index 0000000000000000000000000000000000000000..8ec921cea903e54c3017a595eb12442af889476d --- /dev/null +++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/count/service/CountSerivce.java @@ -0,0 +1,4 @@ +package cn.tedu.youbiliprojectbackend.modules.user.count.service; + +public interface CountSerivce { +} diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/count/service/impl/countServiceImpl.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/count/service/impl/countServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..b3dab5a8d89f96a769c282c740f3b133945eeca1 --- /dev/null +++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/count/service/impl/countServiceImpl.java @@ -0,0 +1,4 @@ +package cn.tedu.youbiliprojectbackend.modules.user.count.service.impl; + +public class countServiceImpl { +} diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/dao/persist/mapper/FollowMapper.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/dao/persist/mapper/FollowMapper.java index 75cd38985a0b14e9bea553d6212ae3982d543a0a..513843b2506d3ce781d4d6bdd32a6a43fe2e2fa3 100644 --- a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/dao/persist/mapper/FollowMapper.java +++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/dao/persist/mapper/FollowMapper.java @@ -1,6 +1,7 @@ package cn.tedu.youbiliprojectbackend.modules.user.follow.dao.persist.mapper; import cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.entity.Follow; +import cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.entity.followedID; import cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.vo.FollowListVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Repository; @@ -38,7 +39,7 @@ public interface FollowMapper extends BaseMapper { * @param followID 关注表的ID * @return */ - int selectByUserIDAndFollowID(Long userID, Long followID); + followedID selectByUserIDAndFollowID(Long userID, Long followID); Long selectByFollowId(Long followID); diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/dao/persist/repository/IFollowRepository.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/dao/persist/repository/IFollowRepository.java index 61e5919fe9604a77df387b227c9b9ad2cfce6626..bd0ab016526bb2d0e94b8fb5f95bd05685341289 100644 --- a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/dao/persist/repository/IFollowRepository.java +++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/dao/persist/repository/IFollowRepository.java @@ -1,6 +1,7 @@ package cn.tedu.youbiliprojectbackend.modules.user.follow.dao.persist.repository; import cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.entity.Follow; +import cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.entity.followedID; import cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.vo.FollowListVO; import java.util.List; @@ -42,7 +43,7 @@ public interface IFollowRepository { * @param followID 关注表ID * @return */ - int selectByUserIDAndFollowID(Long userID, Long followID); + followedID selectByUserIDAndFollowID(Long userID, Long followID); Long selectByFollowIdRes(Long followID); } diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/dao/persist/repository/impl/FollowRepositoryImpl.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/dao/persist/repository/impl/FollowRepositoryImpl.java index e64b891a6f219afc9b70b9705611bfc96277950a..1e219539d1085ca068e8bba29386de8a5398bcbe 100644 --- a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/dao/persist/repository/impl/FollowRepositoryImpl.java +++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/dao/persist/repository/impl/FollowRepositoryImpl.java @@ -2,7 +2,7 @@ package cn.tedu.youbiliprojectbackend.modules.user.follow.dao.persist.repository import cn.tedu.youbiliprojectbackend.modules.user.follow.dao.persist.mapper.FollowMapper; import cn.tedu.youbiliprojectbackend.modules.user.follow.dao.persist.repository.IFollowRepository; -import cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.entity.Follow; +import cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.entity.followedID; import cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.vo.FollowListVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +27,7 @@ public class FollowRepositoryImpl implements IFollowRepository { /** * 添加关注 - * @param follow 关注实体 + * @param followID 关注实体 * @return */ @Override @@ -58,7 +58,7 @@ public class FollowRepositoryImpl implements IFollowRepository { } @Override - public int selectByUserIDAndFollowID(Long userID, Long followID) { + public followedID selectByUserIDAndFollowID(Long userID, Long followID) { return followMapper.selectByUserIDAndFollowID(userID,followID); } diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/pojo/entity/followedID.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/pojo/entity/followedID.java new file mode 100644 index 0000000000000000000000000000000000000000..a146732d4def352e2061dc4ced0c9ae2d6cfe706 --- /dev/null +++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/pojo/entity/followedID.java @@ -0,0 +1,10 @@ +package cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.entity; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class followedID implements Serializable { + private Long followedID; +} diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/service/impl/FollowServiceImpl.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/service/impl/FollowServiceImpl.java index 298de9f1756c5ed211557564ca2b4636979d5621..6ec623542e6a2a1229418539f3ccd4396108c60e 100644 --- a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/service/impl/FollowServiceImpl.java +++ b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/user/follow/service/impl/FollowServiceImpl.java @@ -2,8 +2,10 @@ package cn.tedu.youbiliprojectbackend.modules.user.follow.service.impl; import cn.tedu.youbiliprojectbackend.common.ex.ServiceException; import cn.tedu.youbiliprojectbackend.common.web.response.ServiceCode; +import cn.tedu.youbiliprojectbackend.modules.user.count.dao.cache.UserCountCacheRepository; import cn.tedu.youbiliprojectbackend.modules.user.follow.dao.persist.repository.IFollowRepository; import cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.entity.Follow; +import cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.entity.followedID; import cn.tedu.youbiliprojectbackend.modules.user.follow.pojo.vo.FollowListVO; import cn.tedu.youbiliprojectbackend.modules.user.follow.service.IFollowService; import lombok.extern.slf4j.Slf4j; @@ -19,6 +21,9 @@ public class FollowServiceImpl implements IFollowService { @Autowired IFollowRepository followRepository; + @Autowired + UserCountCacheRepository userCountCacheRepository; + /** * 查看关注列表 * @param userID 关注人的ID @@ -52,7 +57,8 @@ public class FollowServiceImpl implements IFollowService { System.out.println("111"+followedID + followedID); // 下面这个代码有问题 followRepository.addFollow(followerID,followedID); - + userCountCacheRepository.addFollow(followerID); + userCountCacheRepository.addFans(followedID); //todo 根据followerID 对用户表关注者的被关注者数量+1 //todo 根据followedID 对用户表被被关注者的关注者数量+1 } @@ -66,11 +72,14 @@ public class FollowServiceImpl implements IFollowService { */ @Override public void delete(Long userID,Long followID) { - int row=followRepository.selectByUserIDAndFollowID(userID,followID); - if(row<1){ + followedID followedIDs = followRepository.selectByUserIDAndFollowID(userID, followID); + log.debug(String.valueOf(followedIDs)); + if(followedIDs == null){ throw new ServiceException(ServiceCode.ERROR_CONFLICT,"您并未关注当前用户,不可进行取消关注操作!"); } followRepository.delete(userID,followID); + userCountCacheRepository.removeFollow(userID); + userCountCacheRepository.removeFans(followedIDs.getFollowedID()); //todo 根据followerID 对用户表关注者的被关注者数量-1 //todo 根据followedID 对用户表被被关注者的关注者数量-1 } diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/video/uplaod/controller/VideoUploadController.java b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/video/uplaod/controller/VideoUploadController.java deleted file mode 100644 index f698b8b960c3249adc1520e37761816cdb37cda7..0000000000000000000000000000000000000000 --- a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/video/uplaod/controller/VideoUploadController.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.tedu.youbiliprojectbackend.modules.video.uplaod.controller; - -import cn.tedu.youbiliprojectbackend.common.security.CurrentPrincipal; -import cn.tedu.youbiliprojectbackend.common.web.response.RestBean; -import cn.tedu.youbiliprojectbackend.common.web.response.ServiceCode; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.system.ApplicationHome; -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -@Slf4j -@RestController -@RequestMapping("/video") -public class VideoUploadController { - - VideoUploadController(){ - log.debug("创建控制器类:VideoUploadController"); - } - - - @PostMapping("/upload") - public RestBean uploadVideo(@AuthenticationPrincipal CurrentPrincipal principal, MultipartFile file) { - log.debug("开始处理上传视频请求: /video/upload"); - // 获取当事人id - Long id = principal.getUserID(); - log.debug("file{}",file); - System.out.println(file + "123123"); - - if (file.isEmpty() && file.getOriginalFilename().split("\\.")[1] != "mp4") { - // 返回请求参数异常 - return RestBean.failure(ServiceCode.ERROR_BAD_REQUEST); - } - //上传图片 - ApplicationHome applicationHome = new ApplicationHome(this.getClass()); - String pre = applicationHome.getDir().getParentFile().getParentFile().getAbsolutePath() + - "\\src\\main\\resources\\videos\\"; - String path = pre+file.getOriginalFilename(); - // 讲当前文件内容传输到目标文件 - try { - File file1 = new File(path); - if (!file1.exists()) { - file1.mkdirs(); - } - file.transferTo(file1); - } catch (IOException e) { - return RestBean.failure(ServiceCode.ERROR_UNKNOWN); - } - - Map map = new HashMap<>(); - map.put("videoSrcUrl", path); - map.put("userID", principal.getUserID()); -// map.put("username", principal.getUsername()); - return RestBean.success(map); - } -} diff --git a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/video/uplaod/video.md b/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/video/uplaod/video.md deleted file mode 100644 index ae0c2b302f774a3af761be5aec3a4b9d0f602df3..0000000000000000000000000000000000000000 --- a/youbili-project-backend/src/main/java/cn/tedu/youbiliprojectbackend/modules/video/uplaod/video.md +++ /dev/null @@ -1 +0,0 @@ -### 视频模块 \ No newline at end of file diff --git a/youbili-project-backend/src/main/resources/application.yaml b/youbili-project-backend/src/main/resources/application.yaml index 0328c2964470db1902502ffcc355d744b01b649e..5bfad7a2b36cf8e8673d05e97ade9c4b2ab15d08 100644 --- a/youbili-project-backend/src/main/resources/application.yaml +++ b/youbili-project-backend/src/main/resources/application.yaml @@ -1,6 +1,6 @@ #端口号 server: - port: 8089 + port: 10001 # Servlet(Java用于处理请求的组件)的配置 servlet: # 编码配置 diff --git a/youbili-project-backend/src/main/resources/mapper/user/FollowMapper.xml b/youbili-project-backend/src/main/resources/mapper/user/FollowMapper.xml index 75fad9ffc22ce47b679db00eade03d5561fb0535..be98bedd9dbe9c883ae5ba4506c9d3a93c3285c3 100644 --- a/youbili-project-backend/src/main/resources/mapper/user/FollowMapper.xml +++ b/youbili-project-backend/src/main/resources/mapper/user/FollowMapper.xml @@ -26,8 +26,8 @@ AND followedID = #{followedID} - + SELECT followedID FROM youbili_v1.follow WHERE followerID=#{userID} AND followID = #{followID} diff --git a/youbili-project-backend/src/main/resources/mapper/video/VideoCategoryMapper.xml b/youbili-project-backend/src/main/resources/mapper/video/VideoCategoryMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..057559646379b7f5a16c2bae76929ba05d09af55 --- /dev/null +++ b/youbili-project-backend/src/main/resources/mapper/video/VideoCategoryMapper.xml @@ -0,0 +1,12 @@ + + + + + INSERT INTO videocategory (videoID, categoryID) + values (#{videoID}, #{categoryID}) + + + + \ No newline at end of file diff --git a/youbili-project-backend/src/main/resources/mapper/video/VideoTagMapper.xml b/youbili-project-backend/src/main/resources/mapper/video/VideoTagMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..87a3e12f3679e4cf0c63afc22e16ae528ebfee19 --- /dev/null +++ b/youbili-project-backend/src/main/resources/mapper/video/VideoTagMapper.xml @@ -0,0 +1,11 @@ + + + + + INSERT INTO videotag (videoID, tagID) values (#{videoID}, #{tagID}) + + + + \ No newline at end of file diff --git a/youbili-project-backend/src/main/resources/mapper/video/VideoUploadMapper.xml b/youbili-project-backend/src/main/resources/mapper/video/VideoUploadMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..6f90e87b18402c6382b5560091adbf9a0d5468e2 --- /dev/null +++ b/youbili-project-backend/src/main/resources/mapper/video/VideoUploadMapper.xml @@ -0,0 +1,12 @@ + + + + + INSERT INTO video (userID, title, description, videoSrcUrl,videoImgUrl) + values (#{userID}, #{title}, #{description}, #{videoSrcUrl}, #{videoImgUrl}) + + + + \ No newline at end of file