From a7a1a2e3b7577617dc4a3312a49c1e2e970b7aed Mon Sep 17 00:00:00 2001 From: Yehyeok Bang Date: Tue, 20 Feb 2024 14:53:24 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20DB=20Timezone=20Aisa/Seoul=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- global/config/Setup.go | 2 +- global/router/pb_router.go | 29 ----------------------------- main.go | 16 ++++++++++++++-- 3 files changed, 15 insertions(+), 32 deletions(-) delete mode 100644 global/router/pb_router.go diff --git a/global/config/Setup.go b/global/config/Setup.go index f065ab0..f9cedd9 100644 --- a/global/config/Setup.go +++ b/global/config/Setup.go @@ -21,7 +21,7 @@ func ConnectDatabase() (*gorm.DB, error) { MYSQL_PASSWORD := os.Getenv("MYSQL_PASSWORD") MYSQL_DATABASE := os.Getenv("MYSQL_DATABASE") - dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=True&loc=Local", + dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=True&loc=Asia%%2FSeoul", MYSQL_USER, MYSQL_PASSWORD, MYSQL_HOST, MYSQL_PORT, MYSQL_DATABASE) database, err := gorm.Open(mysql.Open(dsn), &gorm.Config{}) diff --git a/global/router/pb_router.go b/global/router/pb_router.go deleted file mode 100644 index 4489323..0000000 --- a/global/router/pb_router.go +++ /dev/null @@ -1,29 +0,0 @@ -package router - -import ( - userapp "gdsc/baro/app/user/pb" - videoapp "gdsc/baro/app/video/pb" - - userrepo "gdsc/baro/app/user/repositories" - videorepo "gdsc/baro/app/video/repositories" - - userpb "gdsc/baro/protos/user" - videopb "gdsc/baro/protos/video" - - "gdsc/baro/global/auth" - "gdsc/baro/global/utils" - - "google.golang.org/grpc" -) - -func NewInitApp(userRepository userrepo.UserRepositoryInterface, userUtil utils.UserUtilInterface, videoRepository videorepo.VideoRepositoryInterface) *grpc.Server { - server := grpc.NewServer(grpc.UnaryInterceptor(auth.UnaryAuthInterceptor)) - - userPbApp := userapp.NewUserPbApp(userRepository, userUtil) - videoPbApp := videoapp.NewVideoPbApp(videoRepository) - - userpb.RegisterUserServiceServer(server, userPbApp) - videopb.RegisterVideoServiceServer(server, videoPbApp) - - return server -} diff --git a/main.go b/main.go index 4ce5ff2..e562238 100644 --- a/main.go +++ b/main.go @@ -5,16 +5,21 @@ import ( reportRepository "gdsc/baro/app/report/repositories" reportService "gdsc/baro/app/report/services" userController "gdsc/baro/app/user/controllers" + userapp "gdsc/baro/app/user/pb" userRepository "gdsc/baro/app/user/repositories" userService "gdsc/baro/app/user/services" videoController "gdsc/baro/app/video/controllers" + videoapp "gdsc/baro/app/video/pb" videoRepository "gdsc/baro/app/video/repositories" videoService "gdsc/baro/app/video/services" + + userpb "gdsc/baro/protos/user" + videopb "gdsc/baro/protos/video" + "gdsc/baro/docs" "gdsc/baro/global" "gdsc/baro/global/auth" "gdsc/baro/global/config" - pbrouter "gdsc/baro/global/router" "gdsc/baro/global/utils" "log" "net" @@ -24,6 +29,7 @@ import ( "github.com/soheilhy/cmux" swaggerFiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" + "google.golang.org/grpc" ) type App struct { @@ -46,7 +52,13 @@ func (app *App) InitDocs() { } func (app *App) RunGrpcServer(l net.Listener, userRepository userRepository.UserRepositoryInterface, userUtil utils.UserUtilInterface, videoRepository videoRepository.VideoRepositoryInterface) { - grpcServer := pbrouter.NewInitApp(userRepository, userUtil, videoRepository) + grpcServer := grpc.NewServer(grpc.UnaryInterceptor(auth.UnaryAuthInterceptor)) + + userPbApp := userapp.NewUserPbApp(userRepository, userUtil) + videoPbApp := videoapp.NewVideoPbApp(videoRepository) + + userpb.RegisterUserServiceServer(grpcServer, userPbApp) + videopb.RegisterVideoServiceServer(grpcServer, videoPbApp) if err := grpcServer.Serve(l); err != nil { log.Fatalf("failed to serve: %v", err)