Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OrionLi/douyin-backend
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.15
Choose a base ref
...
head repository: OrionLi/douyin-backend
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Aug 27, 2023

  1. 完成Relation功能

    OrionLi committed Aug 27, 2023
    Copy the full SHA
    8b8068d View commit details

Commits on Aug 28, 2023

  1. 添加cache

    OriTsuruHime committed Aug 28, 2023
    Copy the full SHA
    d677044 View commit details
  2. 添加cache

    OriTsuruHime committed Aug 28, 2023
    Copy the full SHA
    654de15 View commit details
  3. Merge pull request #33 from OriTsuruHime/develop

    添加投稿数量cache
    OriTsuruHime authored Aug 28, 2023
    Copy the full SHA
    593449a View commit details
  4. Copy the full SHA
    fc82d2f View commit details
  5. Copy the full SHA
    5210698 View commit details
  6. Copy the full SHA
    8aeb5aa View commit details
  7. Copy the full SHA
    b6f95c7 View commit details
  8. Copy the full SHA
    ef1aed3 View commit details
  9. Copy the full SHA
    24b816e View commit details
  10. Merge pull request #35 from OriTsuruHime/develop

    添加gin-video的feed、PublishList的缓存
    OriTsuruHime authored Aug 28, 2023
    Copy the full SHA
    f324b90 View commit details
  11. Copy the full SHA
    5a07211 View commit details
  12. 删除多余文件

    ygxiaobai111 committed Aug 28, 2023
    Copy the full SHA
    e580169 View commit details

Commits on Aug 29, 2023

  1. Copy the full SHA
    ac0a31c View commit details
  2. Copy the full SHA
    1602940 View commit details
  3. 改user下bug

    ygxiaobai111 committed Aug 29, 2023
    Copy the full SHA
    a0b79f9 View commit details
  4. Copy the full SHA
    b7321cd View commit details
  5. Copy the full SHA
    ec2e4da View commit details
  6. Copy the full SHA
    16ba834 View commit details
  7. Copy the full SHA
    a48d861 View commit details
  8. 封装userInfo

    Rapha-29 committed Aug 29, 2023
    Copy the full SHA
    54dd230 View commit details
  9. 改了个bug

    ygxiaobai111 committed Aug 29, 2023
    Copy the full SHA
    8489918 View commit details
  10. Copy the full SHA
    ff3c73b View commit details
  11. Copy the full SHA
    3249b39 View commit details
  12. 删除.idea

    OrionLi committed Aug 29, 2023
    Copy the full SHA
    b9c13cf View commit details
  13. Copy the full SHA
    b9032a0 View commit details

Commits on Aug 30, 2023

  1. Copy the full SHA
    cc3d783 View commit details
  2. Merge pull request #36 from OriTsuruHime/develop

    修改游客状态的feed
    OriTsuruHime authored Aug 30, 2023
    Copy the full SHA
    49a2f33 View commit details
  3. Copy the full SHA
    654e75a View commit details
  4. Merge pull request #37 from OriTsuruHime/develop

    修复视频博主user获取错误Bug
    OriTsuruHime authored Aug 30, 2023
    Copy the full SHA
    00bef84 View commit details
  5. 调用grpcClient时传token参数

    Rapha-29 committed Aug 30, 2023
    Copy the full SHA
    56ff656 View commit details
  6. Copy the full SHA
    1298be8 View commit details
  7. Copy the full SHA
    3cc71e9 View commit details
  8. Merge remote-tracking branch 'origin/master'

    Rapha-29 committed Aug 30, 2023
    Copy the full SHA
    525e284 View commit details
  9. Copy the full SHA
    56874d0 View commit details
  10. Copy the full SHA
    0f6f47e View commit details
  11. grpcClientInit

    ygxiaobai111 committed Aug 30, 2023
    Copy the full SHA
    3d4666b View commit details
  12. Copy the full SHA
    60dbb40 View commit details
  13. Copy the full SHA
    87f6c1d View commit details
  14. Copy the full SHA
    1e5a9ac View commit details
  15. Copy the full SHA
    e6ca8c5 View commit details
  16. 更新relation逻辑

    OrionLi committed Aug 30, 2023
    Copy the full SHA
    abe9755 View commit details
  17. Merge remote-tracking branch 'origin/master'

    # Conflicts:
    #	server/user-center/conf/config.go
    #	server/user-center/conf/config.yml
    #	server/video-center/logs/2023-08-30.log
    OrionLi committed Aug 30, 2023
    Copy the full SHA
    0250ce8 View commit details
  18. Copy the full SHA
    7c1b7b9 View commit details
  19. Copy the full SHA
    ad94d23 View commit details
  20. 修改返回信息

    Rapha-29 committed Aug 30, 2023
    Copy the full SHA
    f1282e7 View commit details
  21. Copy the full SHA
    181d8f3 View commit details
  22. merge

    OriTsuruHime committed Aug 30, 2023
    Copy the full SHA
    99d6cf8 View commit details
  23. Copy the full SHA
    80624c8 View commit details
  24. 修复Feed返沪的user

    OriTsuruHime committed Aug 30, 2023
    Copy the full SHA
    de2a9d8 View commit details
Showing with 1,911 additions and 9,344 deletions.
  1. +0 −12 .idea/dataSources.xml
  2. +1 −6 .idea/douyin-backend.iml
  3. +0 −8 .idea/modules.xml
  4. +0 −17 .idea/protoeditor.xml
  5. +0 −1 .idea/vcs.xml
  6. +38 −1 README.md
  7. +0 −3 server/chat-center/README.md
  8. +0 −95 server/chat-center/Web/controller/chat_controller.go
  9. +0 −14 server/chat-center/Web/middleware/log_middleware.go
  10. +0 −31 server/chat-center/Web/rpc/client/chat_client.go
  11. +0 −82 server/chat-center/Web/rpc/client/init.go
  12. +1 −1 server/chat-center/cmd/main.go
  13. +3 −18 server/chat-center/conf/config.go
  14. +4 −9 server/chat-center/conf/config.yml
  15. +7 −7 server/chat-center/dao/chat_dao.go
  16. +3 −0 server/chat-center/dao/init.go
  17. +1 −3 server/chat-center/go.mod
  18. +2 −19 server/chat-center/go.sum
  19. 0 server/{gateway-center/logs/2023-08-27.log → chat-center/logs/2023-08-29.log}
  20. 0 server/{user-center/Web/logs/2023-08-22.log → chat-center/logs/2023-08-31.log}
  21. 0 server/chat-center/logs/2023-09-03.log
  22. +0 −30 server/chat-center/main.go
  23. +9 −0 server/chat-center/model/message.go
  24. +3 −7 server/chat-center/pkg/common/msg.go
  25. +0 −19 server/chat-center/pkg/common/response.go
  26. +0 −13 server/chat-center/pkg/utils/convert.go
  27. +0 −47 server/chat-center/pkg/utils/jwt.go
  28. 0 server/chat-center/{Web/rpc → }/server/chat_server.go
  29. +12 −5 server/chat-center/{Web/rpc → }/server/init.go
  30. +5 −6 server/chat-center/service/chat_service.go
  31. +109 −0 server/gateway-center/cache/init.go
  32. +11 −0 server/gateway-center/conf/config.go
  33. +4 −1 server/gateway-center/conf/config.yml
  34. +8 −3 server/gateway-center/controller/chatController.go
  35. +131 −0 server/gateway-center/controller/relationController.go
  36. +9 −6 server/gateway-center/controller/userController.go
  37. +150 −26 server/gateway-center/controller/videoController.go
  38. +3 −1 server/gateway-center/go.mod
  39. +11 −18 server/gateway-center/go.sum
  40. +10 −9 server/gateway-center/grpcClient/Init.go
  41. +0 −32 server/gateway-center/grpcClient/VideoClient.go
  42. +35 −0 server/gateway-center/grpcClient/relationClient.go
  43. +0 −66 server/gateway-center/log/logger.go
  44. +10 −0 server/gateway-center/logs/2023-08-30.log
  45. 0 server/gateway-center/logs/2023-08-31.log
  46. +2 −0 server/gateway-center/logs/2023-09-03.log
  47. +2 −1 server/gateway-center/main.go
  48. +6 −3 server/gateway-center/middleware/middleware.go
  49. +44 −0 server/gateway-center/response/RelationResponse.go
  50. +10 −6 server/gateway-center/response/chatResponse.go
  51. +3 −3 server/gateway-center/response/userResponse.go
  52. +9 −9 server/gateway-center/response/videoBasicResponse.go
  53. +16 −14 server/gateway-center/router.go
  54. +20 −1 server/gateway-center/util/convert.go
  55. +394 −0 server/key/openssl.cfg
  56. +21 −0 server/key/server.crt
  57. +16 −0 server/key/server.csr
  58. +28 −0 server/key/server.key
  59. +1 −0 server/key/server.srl
  60. +17 −0 server/key/test.csr
  61. +28 −0 server/key/test.key
  62. +21 −0 server/key/test.pem
  63. +0 −8 server/user-center/.idea/.gitignore
  64. +0 −8 server/user-center/.idea/modules.xml
  65. +0 −6 server/user-center/.idea/vcs.xml
  66. +51 −0 server/user-center/.idea/workspace.xml
  67. +0 −46 server/user-center/Web/api/api.go
  68. +0 −40 server/user-center/Web/go.mod
  69. +0 −98 server/user-center/Web/go.sum
  70. +0 −31 server/user-center/Web/grpcClient/init.go
  71. +0 −52 server/user-center/Web/grpcClient/userClient.go
  72. +0 −16 server/user-center/Web/main.go
  73. +0 −37 server/user-center/Web/middleware/middleware.go
  74. +0 −86 server/user-center/Web/pkg/util/jwt.go
  75. +0 −66 server/user-center/Web/pkg/util/logger.go
  76. +0 −31 server/user-center/Web/router.go
  77. +0 −36 server/user-center/Web/serializer/user.go
  78. +0 −144 server/user-center/Web/servic/user.go
  79. +0 −1 server/user-center/Web/调用方大致逻辑.drawio
  80. +8 −4 server/user-center/cache/key.go
  81. +0 −27 server/user-center/cache/relationCache.go
  82. +56 −0 server/user-center/cache/relation_cache.go
  83. +18 −11 server/user-center/cache/userCache.go
  84. +48 −0 server/user-center/cache/videoCountsCache.go
  85. +24 −43 server/user-center/cmd/main.go
  86. +7 −28 server/user-center/conf/config.go
  87. +5 −10 server/user-center/conf/config.yml
  88. +0 −17 server/user-center/constant/const.go
  89. +68 −45 server/user-center/dao/relation.go
  90. +0 −5 server/user-center/dao/user.go
  91. +2 −3 server/user-center/go.mod
  92. +2 −7 server/user-center/go.sum
  93. +7 −5 server/user-center/grpc/init.go
  94. +0 −4 server/user-center/http-test/config.json
  95. +0 −20 server/user-center/logs/2023-08-18.log
  96. +0 −1 server/user-center/logs/2023-08-19.log
  97. +0 −6 server/user-center/logs/2023-08-20.log
  98. +0 −15 server/user-center/logs/2023-08-21.log
  99. +0 −1 server/user-center/logs/2023-08-22.log
  100. +0 −7 server/user-center/logs/2023-08-27.log
  101. 0 server/user-center/logs/2023-09-03.log
  102. +4 −0 server/user-center/pkg/util/convert.go
  103. +2 −2 server/user-center/pkg/util/validate.go
  104. +63 −6 server/user-center/server/init.go
  105. +100 −56 server/user-center/server/relationServer.go
  106. +32 −4 server/user-center/server/userServer.go
  107. +12 −9 server/user-center/service/getUserById.go
  108. +0 −36 server/user-center/service/relationFollowList.go
  109. +77 −53 server/user-center/service/relation_service.go
  110. +0 −1 server/video-center/README.md
  111. +0 −131 server/video-center/Web/controller/CommentController.go
  112. +0 −100 server/video-center/Web/controller/FavoriteController.go
  113. +0 −111 server/video-center/Web/controller/FeedController.go
  114. +0 −84 server/video-center/Web/controller/PublishActionController.go
  115. +0 −82 server/video-center/Web/controller/PublishListController.go
  116. +0 −43 server/video-center/Web/main.go
  117. +0 −14 server/video-center/Web/middleware/loggerMiddleware.go
  118. +0 −58 server/video-center/Web/middleware/validationFeedRequest.go
  119. +0 −95 server/video-center/Web/pkg/baseResponse/base.go
  120. +0 −14 server/video-center/Web/rpc/Comment.go
  121. +0 −24 server/video-center/Web/rpc/Favorite.go
  122. +0 −21 server/video-center/Web/rpc/Feed.go
  123. +0 −221 server/video-center/Web/rpc/Init.go
  124. +0 −16 server/video-center/Web/rpc/IsFan.go
  125. +0 −24 server/video-center/Web/rpc/PublishAction.go
  126. +0 −21 server/video-center/Web/rpc/PublishList.go
  127. +0 −16 server/video-center/Web/rpc/UserInfo.go
  128. +22 −0 server/video-center/baseResponse/base.go
  129. +1 −1 server/video-center/cache/videoCache.go
  130. +8 −1 server/video-center/cmd/main.go
  131. +1 −1 server/video-center/go.mod
  132. +2 −2 server/video-center/go.sum
  133. +2 −8 server/video-center/handler/videoHandler.go
  134. +1 −1 server/video-center/handler/videoInteractionHandler.go
  135. +0 −14 server/video-center/logs/2023-08-22.log
  136. +0 −7 server/video-center/logs/2023-08-25.log
  137. +0 −6,395 server/video-center/logs/2023-08-26.log
  138. +0 −23 server/video-center/logs/2023-08-27.log
  139. 0 server/video-center/logs/2023-09-03.log
  140. +2 −2 server/video-center/oss/OssConf.yaml
  141. +1 −1 server/video-center/pkg/errno/erron.go
  142. +0 −4 server/video-center/service/commentService.go
  143. +2 −3 server/video-center/service/favoriteService.go
  144. +11 −21 server/video-center/service/videoService.go
  145. +54 −0 start.sh
12 changes: 0 additions & 12 deletions .idea/dataSources.xml

This file was deleted.

7 changes: 1 addition & 6 deletions .idea/douyin-backend.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

17 changes: 0 additions & 17 deletions .idea/protoeditor.xml

This file was deleted.

1 change: 0 additions & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 38 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,38 @@
# 字节青训营大项目
# 字节青训营大项目

本项目为你摆你🐴呢队字节青训营结营项目 抖音精简版后端程序



## 项目介绍

本项目使用gRPC框架实现微服务架构的抖音精简版后端程序



## 项目分工

* [@OrionLi](https://github.com/OrionLi):用户关系相关接口
* [@ygxiaobai111](https://github.com/ygxiaobai111):用户注册、登录,用户信息接口
* [@OriTsuruHime](https://github.com/OriTsuruHime):视频流、投稿、发布列表接口
* [@Raqtpie](https://github.com/Raqtpie):点赞操作、聊天接口
* [@Howe](https://github.com/Cinta-i29):点赞列表、评论接口

> 运行前需要安装JDK8及以上用于部署Nacos
> 运行前需要ffmpeg


## 启动项目

```bash
cd your_directory/douyin-backend
bash ./start.sh
```

> sh文件中为绝对路径,请自行更改相关路径
>
> 安装jdk环境命令为nix包管理,如为yum或apt请自行更换
>
> 启动nacos的命令请自行更换路径
3 changes: 0 additions & 3 deletions server/chat-center/README.md

This file was deleted.

95 changes: 0 additions & 95 deletions server/chat-center/Web/controller/chat_controller.go

This file was deleted.

14 changes: 0 additions & 14 deletions server/chat-center/Web/middleware/log_middleware.go

This file was deleted.

31 changes: 0 additions & 31 deletions server/chat-center/Web/rpc/client/chat_client.go

This file was deleted.

82 changes: 0 additions & 82 deletions server/chat-center/Web/rpc/client/init.go

This file was deleted.

2 changes: 1 addition & 1 deletion server/chat-center/cmd/main.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package main

import (
"chat-center/Web/rpc/server"
"chat-center/conf"
"chat-center/dao"
"chat-center/server"
)

func main() {
21 changes: 3 additions & 18 deletions server/chat-center/conf/config.go
Original file line number Diff line number Diff line change
@@ -12,21 +12,15 @@ var (
ESPassword string
)

var (
WebPort string
)

var (
GRPCAddress string
GRPCPort int
)

var (
NacosAddress string
NacosPort int
NacosNamespaceId string
NacosGroup string
NacosServerName string
NacosAddress string
NacosPort int
NacosServerName string
)

func InitConf() {
@@ -48,13 +42,6 @@ func InitConf() {
ESUser = elasticsearchConfig.GetString("user")
ESPassword = elasticsearchConfig.GetString("password")

// 解析 Gin 配置
ginConfig := viper.Sub("gin")
if ginConfig == nil {
log.Fatal("Missing 'gin' configuration section")
}
WebPort = ginConfig.GetString("port")

// 解析 gRPC 配置
gRPCConfig := viper.Sub("gRPC")
if gRPCConfig == nil {
@@ -70,7 +57,5 @@ func InitConf() {
}
NacosAddress = nacosConfig.GetString("address")
NacosPort = nacosConfig.GetInt("port")
NacosNamespaceId = nacosConfig.GetString("namespaceId")
NacosGroup = nacosConfig.GetString("group")
NacosServerName = nacosConfig.GetString("server-name")
}
Loading