移动swagger config

Author: reggiepy

README.md

@@ -18,10 +18,10 @@ go mod tidy
 
 generate swagger UI
 ```bash
-swag init -g cmd/log-writer/main.go
+swag init -g cmd/LogBeetle/main.go
 ```
 
-run
+runs
 ```bash
 go run github.com/reggiepy/LogBeetle/cmd/LogBeetle server
 ```

cmd/LogBeetle/sub/root.go

@@ -110,23 +110,6 @@ func Execute() {
 	}
 }
 
-// @title           Swagger Example API
-// @version         1.0
-// @description     This is a sample server celler server.
-// @termsOfService  http://swagger.io/terms/
-
-// @contact.name   API Support
-// @contact.url    http://www.swagger.io/support
-// @contact.email  [email protected]
-
-// @license.name  Apache 2.0
-// @license.url   http://www.apache.org/licenses/LICENSE-2.0.html
-
-// @host      localhost:8080
-// @BasePath  /api/v1
-
-// @externalDocs.description  OpenAPI
-// @externalDocs.url          https://swagger.io/resources/open-api/
 func serverStart() {
 	// 创建一个上下文，以便能够在主程序退出时取消所有 Goroutine
 	ctx, cancel := context.WithCancel(context.Background())
@@ -141,6 +124,9 @@ func serverStart() {
 	// 获取配置
 	nsqConfig := config.Instance.NSQConfig
 	consumerConfig := config.Instance.ConsumerConfig
+	if len(consumerConfig.NSQConsumers) == 0 {
+		_ = fmt.Errorf("consumer config is empty")
+	}
 
 	// 定义工作线程
 	workers := []*worker.Worker{
@@ -189,7 +175,7 @@ func serverStart() {
 				)
 
 				// 添加其他消费者
-				for _, consumerConfig := range consumerConfig.Consumers {
+				for _, consumerConfig := range consumerConfig.NSQConsumers {
 					logconsumer.AddConsumer(
 						logconsumer.NewLogConsumer(
 							consumerConfig.Name,

log-beetle.tmp.yaml

@@ -11,7 +11,7 @@ LogConfig: # 日志配置
   LogFormat: json # 日志等级 JSON | logfmt
 ConsumerConfig:
   LogPath: ./logs
-  Consumers:
+  NSQConsumers:
     - Name: "test"
       Topic: "test"
       FileName: "test.log"

pkg/config/config.go

@@ -10,7 +10,7 @@ import (
 
 var Instance *Config
 
-type Consumer struct {
+type NSQConsumers struct {
 	Name     string `yaml:"Name"`
 	Topic    string `yaml:"Topic"`
 	FileName string `yaml:"FileName"`
@@ -33,8 +33,8 @@ type Config struct {
 	} `yaml:"LogConfig"`
 
 	ConsumerConfig struct {
-		LogPath   string     `yaml:"LogPath"` //日志输出路径
-		Consumers []Consumer `yaml:"Consumers"`
+		LogPath      string         `yaml:"LogPath"` //日志输出路径
+		NSQConsumers []NSQConsumers `yaml:"NSQConsumers"`
 	} `yaml:"ConsumerConfig"`
 
 	NSQConfig struct {
@@ -59,7 +59,7 @@ func DefaultConfig() *Config {
 	config.LogConfig.LogFormat = "json"
 
 	config.ConsumerConfig.LogPath = "./logs"
-	config.ConsumerConfig.Consumers = make([]Consumer, 0)
+	config.ConsumerConfig.NSQConsumers = make([]NSQConsumers, 0)
 
 	config.NSQConfig.AuthSecret = ""
 	config.NSQConfig.NSQDAddress = "127.0.0.1:4150"
@@ -138,7 +138,7 @@ func setStructDefaults(config, defaultConfig interface{}) {
 		field := configValue.Field(i)
 
 		// 如果字段是切片类型，则递归处理每个元素
-		if configValue.Type().Field(i).Name == "Consumers" && field.Kind() == reflect.Slice {
+		if configValue.Type().Field(i).Name == "NSQConsumers" && field.Kind() == reflect.Slice {
 			// 删除目标配置中的空切片以及空元素
 			var updatedSlice reflect.Value
 			updatedSlice = reflect.MakeSlice(field.Type(), 0, 0)

web/routers.go

@@ -13,6 +13,19 @@ import (
 )
 
 // SetupRouter 设置路由
+// @title           Swagger Example API
+// @version         1.0
+// @description     This is a sample server celler server.
+// @termsOfService  http://swagger.io/terms/
+// @contact.name   API Support
+// @contact.url    http://www.swagger.io/support
+// @contact.email  [email protected]
+// @license.name  Apache 2.0
+// @license.url   http://www.apache.org/licenses/LICENSE-2.0.html
+// @host      localhost:8080
+// @BasePath  /api/v1
+// @externalDocs.description  OpenAPI
+// @externalDocs.url          https://swagger.io/resources/open-api/
 func SetupRouter() *gin.Engine {
 	// programatically set swagger info
 	docs.SwaggerInfo.Title = "Log API"