rollback to previous (#147)

applications/comment/build.sh

@@ -10,4 +10,3 @@ if [ "$IS_SYSTEM_TEST_ENV" != "1" ]; then
 else
     go test -c -covermode=set -o output/bin/${RUN_NAME} -coverpkg=./...
 fi
-

applications/commentDomain/dal/gen.go → applications/comment/dal/gen.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/TremblingV5/DouTok/applications/commentDomain/dal/model"
+	"github.com/TremblingV5/DouTok/applications/comment/dal/model"
 	"github.com/TremblingV5/DouTok/config/configStruct"
 	"github.com/TremblingV5/DouTok/pkg/configurator"
 	"github.com/TremblingV5/DouTok/pkg/mysqlIniter"
@@ -15,11 +15,9 @@ func main() {
 	})
 
 	var config configStruct.MySQLConfig
-	if err := configurator.InitConfig(
+	configurator.InitConfig(
 		&config, "mysql.yaml",
-	); err != nil {
-		panic(err)
-	}
+	)
 
 	db, err := mysqlIniter.InitDb(
 		config.Username,

applications/comment/dal/migrate/main.go

@@ -0,0 +1,21 @@
+package main
+
+import (
+	"github.com/TremblingV5/DouTok/applications/comment/dal/model"
+	"github.com/TremblingV5/DouTok/applications/comment/misc"
+	"github.com/TremblingV5/DouTok/applications/comment/service"
+)
+
+func main() {
+	misc.InitViperConfig()
+
+	service.InitDb(
+		misc.GetConfig("MySQL.Username"),
+		misc.GetConfig("MySQL.Password"),
+		misc.GetConfig("MySQL.Host"),
+		misc.GetConfig("MySQL.Port"),
+		misc.GetConfig("MySQL.Database"),
+	)
+
+	service.DB.AutoMigrate(&model.Comment{}, &model.CommentCount{})
+}

applications/commentDomain/dal/hbModel/comment_hb.go → applications/comment/dal/model/comment_hb.go

@@ -1,4 +1,4 @@
-package hbModel
+package model
 
 import (
 	"encoding/binary"

applications/comment/handler/comment_action.go

@@ -0,0 +1,36 @@
+package handler
+
+import (
+	"context"
+
+	"github.com/TremblingV5/DouTok/applications/comment/misc"
+	"github.com/TremblingV5/DouTok/applications/comment/pack"
+	"github.com/TremblingV5/DouTok/applications/comment/service"
+	"github.com/TremblingV5/DouTok/kitex_gen/comment"
+	"github.com/TremblingV5/DouTok/pkg/utils"
+)
+
+func (s *CommentServiceImpl) CommentAction(ctx context.Context, req *comment.DouyinCommentActionRequest) (resp *comment.DouyinCommentActionResponse, err error) {
+	if result := misc.CheckCommentActionArgs(req); !result {
+		return pack.PackCommentActionResp(int32(misc.ParamsErr.ErrCode), misc.ParamsErr.ErrMsg, nil, req.UserId)
+	}
+
+	// 判断请求的动作，1为新加评论，2为删除评论
+	if req.ActionType == 1 {
+		result, err := service.AddComment(
+			req.VideoId, req.UserId, utils.GetSnowFlakeId().Int64(), 0, 0, req.CommentText,
+		)
+		if err != nil {
+			return pack.PackCommentActionResp(int32(misc.SystemErr.ErrCode), misc.SystemErr.ErrMsg, nil, req.UserId)
+		}
+		return pack.PackCommentActionResp(int32(misc.Success.ErrCode), misc.Success.ErrMsg, result, req.UserId)
+	} else if req.ActionType == 2 {
+		errNo, err := service.RmComment(req.UserId, req.CommentId)
+		if err != nil {
+			return pack.PackCommentActionResp(int32(errNo.ErrCode), errNo.ErrMsg, nil, req.UserId)
+		}
+		return pack.PackCommentActionResp(int32(misc.Success.ErrCode), misc.Success.ErrMsg, nil, req.UserId)
+	} else {
+		return pack.PackCommentActionResp(int32(misc.BindingErr.ErrCode), misc.BindingErr.ErrMsg, nil, req.UserId)
+	}
+}

applications/comment/handler/comment_count.go

@@ -0,0 +1,23 @@
+package handler
+
+import (
+	"context"
+
+	"github.com/TremblingV5/DouTok/applications/comment/misc"
+	"github.com/TremblingV5/DouTok/applications/comment/pack"
+	"github.com/TremblingV5/DouTok/applications/comment/service"
+	"github.com/TremblingV5/DouTok/kitex_gen/comment"
+)
+
+func (s *CommentServiceImpl) CommentCount(ctx context.Context, req *comment.DouyinCommentCountRequest) (resp *comment.DouyinCommentCountResponse, err error) {
+	if len(req.VideoIdList) == 0 {
+		return pack.PackCommentCountResp(int32(misc.ListEmptyErr.ErrCode), misc.ListEmptyErr.ErrMsg, nil)
+	}
+
+	res, errNo, err := service.CountComment(req.VideoIdList...)
+	if err != nil {
+		return pack.PackCommentCountResp(int32(errNo.ErrCode), errNo.ErrMsg, nil)
+	}
+
+	return pack.PackCommentCountResp(int32(errNo.ErrCode), errNo.ErrMsg, res)
+}

applications/comment/handler/comment_list.go

@@ -0,0 +1,23 @@
+package handler
+
+import (
+	"context"
+
+	"github.com/TremblingV5/DouTok/applications/comment/misc"
+	"github.com/TremblingV5/DouTok/applications/comment/pack"
+	"github.com/TremblingV5/DouTok/applications/comment/service"
+	"github.com/TremblingV5/DouTok/kitex_gen/comment"
+)
+
+func (s *CommentServiceImpl) CommentList(ctx context.Context, req *comment.DouyinCommentListRequest) (resp *comment.DouyinCommentListResponse, err error) {
+	if !misc.CheckCommentListArgs(req) {
+		return pack.PackCommentListResp(int32(misc.VideoIdErr.ErrCode), misc.VideoIdErr.ErrMsg, nil)
+	}
+
+	res, errNo, err := service.ListComment(req.VideoId)
+	if err != nil {
+		return pack.PackCommentListResp(int32(errNo.ErrCode), errNo.ErrMsg, nil)
+	}
+
+	return pack.PackCommentListResp(int32(misc.Success.ErrCode), misc.Success.ErrMsg, res)
+}

applications/comment/handler/var.go

@@ -0,0 +1,3 @@
+package handler
+
+type CommentServiceImpl struct{}

applications/comment/main.go

@@ -1,52 +1,42 @@
 package main
 
 import (
-	"context"
 	"github.com/TremblingV5/DouTok/applications/comment/handler"
+	"github.com/TremblingV5/DouTok/applications/comment/misc"
 	"github.com/TremblingV5/DouTok/applications/comment/rpc"
-	"github.com/TremblingV5/DouTok/config/configStruct"
+	"github.com/TremblingV5/DouTok/applications/comment/service"
 	"github.com/TremblingV5/DouTok/kitex_gen/comment/commentservice"
-	"github.com/TremblingV5/DouTok/pkg/DouTokContext"
-	"github.com/TremblingV5/DouTok/pkg/DouTokLogger"
-	"github.com/TremblingV5/DouTok/pkg/configurator"
-	"github.com/TremblingV5/DouTok/pkg/constants"
-	"github.com/TremblingV5/DouTok/pkg/services"
-	"go.uber.org/zap"
+	"github.com/TremblingV5/DouTok/pkg/dlog"
+	"github.com/TremblingV5/DouTok/pkg/initHelper"
 )
 
-type Config struct {
-	configStruct.BaseConfig `envPrefix:"DOUTOK_COMMENT_"`
-	Jwt                     configStruct.Jwt    `envPrefix:"DOUTOK_COMMENT_"`
-	Logger                  configStruct.Logger `envPrefix:"DOUTOK_COMMENT_"`
-}
-
 var (
-	logger *zap.Logger
-	config = &Config{}
+	Logger = dlog.InitLog(3)
 )
 
-func init() {
+func Init() {
+	misc.InitViperConfig()
 
-	ctx := context.Background()
-	_, err := configurator.Load(config, "DOUTOK_COMMENT", "comment")
-	logger = DouTokLogger.InitLogger(config.Logger)
-	DouTokContext.DefaultLogger = logger
-	DouTokContext.AddLoggerToContext(ctx, logger)
-	if err != nil {
-		logger.Fatal("could not load env variables", zap.Error(err), zap.Any("config", config))
-	}
+	service.Init()
+
+	rpc.InitPRCClient()
+
+	go service.UpdateComCountMap()
+	go service.UpdateComTotalCntMap()
 }
 
 func main() {
-	options, shutdown := services.InitRPCServerArgs(constants.COMMENT_SERVER_NAME, config.BaseConfig)
+	Init()
+
+	options, shutdown := initHelper.InitRPCServerArgs(misc.Config)
 	defer shutdown()
 
 	svr := commentservice.NewServer(
-		handler.New(rpc.New(services.InitRPCClientArgs(constants.COMMENT_SERVER_NAME, config.Etcd))),
-		options...,
+		new(handler.CommentServiceImpl),
+		options...
 	)
 
 	if err := svr.Run(); err != nil {
-		logger.Fatal("run server err", zap.Error(err))
+		Logger.Fatal(err)
 	}
 }

applications/comment/misc/check_args.go

@@ -0,0 +1,11 @@
+package misc
+
+import "github.com/TremblingV5/DouTok/kitex_gen/comment"
+
+func CheckCommentActionArgs(req *comment.DouyinCommentActionRequest) bool {
+	return req.CommentText != ""
+}
+
+func CheckCommentListArgs(req *comment.DouyinCommentListRequest) bool {
+	return req.VideoId >= 0
+}

applications/comment/misc/config.go

@@ -0,0 +1,18 @@
+package misc
+
+import "github.com/TremblingV5/DouTok/pkg/dtviper"
+
+var Config *dtviper.Config
+
+func InitViperConfig() {
+	config := dtviper.ConfigInit(ViperConfigEnvPrefix, ViperConfigEnvFilename)
+	Config = config
+}
+
+func GetConfig(key string) string {
+	return Config.Viper.GetString(key)
+}
+
+func GetConfigNum(key string) int64 {
+	return Config.Viper.GetInt64(key)
+}

applications/comment/misc/const.go

@@ -0,0 +1,9 @@
+package misc
+
+const (
+	ViperConfigEnvPrefix   = "DOUTOK_COMMENT"
+	ViperConfigEnvFilename = "comment"
+
+	ComCntCache      = "comcntcache"
+	ComTotalCntCache = "comtotalcntcache"
+)