feat:remove some useless code

Author: CocaineCong

app/index_platform/trie/init.go

@@ -21,15 +21,15 @@ import (
 	"github.com/CocaineCong/tangseng/pkg/trie"
 )
 
-var GobalTrieTree *trie.Trie
+var GlobalTrieTree *trie.Trie
 
 func InitTrieTree() {
-	// GobalTrieTree = trie.NewTrie()
+	// GlobalTrieTree = trie.NewTrie()
 	// TODO: 这里的想法是把原始的读出来合并的，但是第一次读的时候由于是空的，所以会强制报错，用recover也不起作用，后面看看怎么处理吧... :-(
 	// val, err := storage.GlobalTrieDBs.GetTrieTreeInfo()
 	// if err != nil {
 	// 	// 第一次读取会出现没有的情况
 	// } else {
-	// 	GobalTrieTree.Merge(val)
+	// 	GlobalTrieTree.Merge(val)
 	// }
 }

pkg/ctl/ctl.go

@@ -20,12 +20,17 @@ package ctl
 import (
 	"time"
 
-	"github.com/CocaineCong/tangseng/pkg/tracing"
 	"github.com/gin-gonic/gin"
 
+	"github.com/CocaineCong/tangseng/pkg/tracing"
+
 	e2 "github.com/CocaineCong/tangseng/consts/e"
 )
 
+const (
+	defaultSuccessMsg = "操作成功"
+)
+
 // Response 基础序列化器
 type Response struct {
 	Status    int         `json:"status"`
@@ -44,7 +49,7 @@ func RespSuccess(ctx *gin.Context, data interface{}, code ...int) *Response {
 	}
 
 	if data == nil {
-		data = "操作成功"
+		data = defaultSuccessMsg
 	}
 
 	r := &Response{

pkg/jwt/jwt.go

@@ -20,13 +20,16 @@ package jwt
 import (
 	"time"
 
-	"github.com/pkg/errors"
-
 	"github.com/dgrijalva/jwt-go"
+	"github.com/pkg/errors"
 
 	"github.com/CocaineCong/tangseng/consts"
 )
 
+const (
+	defaultIssuer = "Tangseng-search-engine"
+)
+
 var jwtSecret = []byte("38324-search-engine") // TODO 从配置文件读取
 
 type Claims struct {
@@ -45,7 +48,7 @@ func GenerateToken(id int64, username string) (accessToken, refreshToken string,
 		Username: username,
 		StandardClaims: jwt.StandardClaims{
 			ExpiresAt: expireTime.Unix(),
-			Issuer:    "mall",
+			Issuer:    defaultIssuer,
 		},
 	}
 	// 加密并获得完整的编码后的字符串token
@@ -56,7 +59,7 @@ func GenerateToken(id int64, username string) (accessToken, refreshToken string,
 
 	refreshToken, err = jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.StandardClaims{
 		ExpiresAt: rtExpireTime.Unix(),
-		Issuer:    "search-engine",
+		Issuer:    defaultIssuer,
 	}).SignedString(jwtSecret)
 	if err != nil {
 		return "", "", errors.Wrap(err, "failed to get refreshToken")

pkg/kfk/consume/forward_index.go

@@ -25,9 +25,8 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/pkg/errors"
-
 	"github.com/IBM/sarama"
+	"github.com/pkg/errors"
 
 	"github.com/CocaineCong/tangseng/app/index_platform/repository/db/dao"
 	"github.com/CocaineCong/tangseng/config"
@@ -117,7 +116,7 @@ func toggleConsumptionFlow(client sarama.ConsumerGroup, isPaused *bool) {
 	*isPaused = !*isPaused
 }
 
-// Consumer Sarama消费者群体的消费者
+// ForwardIndexConsumer Sarama消费者群体的消费者
 type ForwardIndexConsumer struct {
 	Ready chan bool
 }

pkg/kfk/consume/trie_tree.go

@@ -88,7 +88,6 @@ func (consumer *TrieTreeConsumer) Cleanup(sarama.ConsumerGroupSession) error {
 // ConsumeClaim 必须启动 ConsumerGroupClaim 的 Messages() 消费者循环。
 // 一旦 Messages() 通道关闭，处理程序必须完成其处理循环并退出。
 func (consumer *TrieTreeConsumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error {
-	// ctx := context.Background()
 	gapTime := 2 * time.Minute
 	for {
 		select {
@@ -98,14 +97,12 @@ func (consumer *TrieTreeConsumer) ConsumeClaim(session sarama.ConsumerGroupSessi
 				return nil
 			}
 			// 构建trie tree树
-			trie.GobalTrieTree.Insert(string(message.Value))
-			// logs.LogrusObj.Infof("TrieTreeConsumer Message claimed: value = %s, timestamp = %v, topic = %s", string(message.Value), message.Timestamp, message.Topic)
+			trie.GlobalTrieTree.Insert(string(message.Value))
 			session.MarkMessage(message, "")
-		// https://github.com/IBM/sarama/issues/1192
 
 		case <-time.After(gapTime):
 			logs.LogrusObj.Infof("ConsumeClaim starting store dict")
-			// _ = storage.GlobalTrieDBs.StorageDict(trie.GobalTrieTree) // TODO:后续看看能不能实现一个全局的triedb，每次都先读取存量进行初始化，再插入增量...
+			// _ = storage.GlobalTrieDBs.StorageDict(trie.GlobalTrieTree) // TODO:后续看看能不能实现一个全局的triedb，每次都先读取存量进行初始化，再插入增量...
 			logs.LogrusObj.Infof("ConsumeClaim ending store dict")
 
 		case <-session.Context().Done():
@@ -116,12 +113,12 @@ func (consumer *TrieTreeConsumer) ConsumeClaim(session sarama.ConsumerGroupSessi
 }
 
 // func mergeTrieTree(node string) {
-// 	trie.GobalTrieTree.Insert(node)
+// 	trie.GlobalTrieTree.Insert(node)
 // 	gapTime := 2 * time.Minute
 // 	for {
 // 		select {
 // 		case <-time.After(gapTime):
-// 			_ = storage.GlobalTrieDBs.StorageDict(trie.GobalTrieTree)
+// 			_ = storage.GlobalTrieDBs.StorageDict(trie.GlobalTrieTree)
 // 		}
 // 	}
 // }

pkg/kfk/init.go

@@ -18,13 +18,14 @@
 package kfk
 
 import (
-	logs "github.com/CocaineCong/tangseng/pkg/logger"
 	"github.com/IBM/sarama"
 
+	logs "github.com/CocaineCong/tangseng/pkg/logger"
+
 	"github.com/CocaineCong/tangseng/config"
 )
 
-var GobalKafka sarama.Client
+var GlobalKafka sarama.Client
 
 func InitKafka() {
 	con := sarama.NewConfig()
@@ -34,5 +35,5 @@ func InitKafka() {
 		logs.LogrusObj.Errorln(err)
 		return
 	}
-	GobalKafka = kafkaClient
+	GlobalKafka = kafkaClient
 }

pkg/kfk/produce.go

@@ -20,14 +20,13 @@ package kfk
 import (
 	_ "net/http/pprof"
 
-	"github.com/pkg/errors"
-
 	"github.com/IBM/sarama"
+	"github.com/pkg/errors"
 )
 
 // KafkaProducer 发送单条
 func KafkaProducer(topic string, msg []byte) (err error) {
-	producer, err := sarama.NewSyncProducerFromClient(GobalKafka)
+	producer, err := sarama.NewSyncProducerFromClient(GlobalKafka)
 	if err != nil {
 		return errors.Wrap(err, "failed to create Kafka producer")
 	}
@@ -44,7 +43,7 @@ func KafkaProducer(topic string, msg []byte) (err error) {
 
 // KafkaProducers 发送多条，topic在messages中
 func KafkaProducers(messages []*sarama.ProducerMessage) (err error) {
-	producer, err := sarama.NewSyncProducerFromClient(GobalKafka)
+	producer, err := sarama.NewSyncProducerFromClient(GlobalKafka)
 	if err != nil {
 		return errors.Wrap(err, "failed to create Kafka producer")
 	}

pkg/res/response.go

@@ -31,22 +31,22 @@ const (
 	DefaultGapTime    = 3 * time.Second // 默认的超时时间间隔
 )
 
-var instance *RetryOption
+var instance *Option
 var once sync.Once
 
 type DelayRetryFunc func(context.Context, interface{}) (interface{}, bool, error)
 
-type RetryOption struct {
+type Option struct {
 	GapTime    time.Duration  // 重试间隔时间
 	RetryCount int            // 重试次数
 	RetryFunc  DelayRetryFunc // 重试函数
 
 	ctx context.Context
 }
 
-func NewRetryOption(ctx context.Context, gapTime time.Duration, retryCount int, func_ DelayRetryFunc) *RetryOption {
+func NewRetryOption(ctx context.Context, gapTime time.Duration, retryCount int, func_ DelayRetryFunc) *Option {
 	once.Do(func() {
-		instance = &RetryOption{
+		instance = &Option{
 			GapTime:    gapTime,
 			RetryCount: retryCount,
 			RetryFunc:  func_,
@@ -57,7 +57,7 @@ func NewRetryOption(ctx context.Context, gapTime time.Duration, retryCount int,
 	return instance
 }
 
-func (r *RetryOption) Retry(ctx context.Context, req interface{}) (resp interface{}, err error) {
+func (r *Option) Retry(ctx context.Context, req interface{}) (resp interface{}, err error) {
 	if r.RetryFunc == nil {
 		return resp, errors.Wrap(errors.New("RetryFunc is nil"), "failed to retry")
 	}