feat: consul

README.md

@@ -1,60 +1,60 @@
-# Assistant Bot
-
-![Build](https://github.com/tsundata/assistant/workflows/Build/badge.svg)
-![CodeQL](https://github.com/tsundata/assistant/workflows/CodeQL/badge.svg)
-![Lint](https://github.com/tsundata/assistant/workflows/Lint/badge.svg)
-[![Go Report Card](https://goreportcard.com/badge/github.com/tsundata/assistant)](https://goreportcard.com/report/github.com/tsundata/assistant)
-![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/tsundata/assistant)
-![GitHub](https://img.shields.io/github/license/tsundata/assistant)
-
-Assistant Bot is a workflow engine for chatbot
-
-## Features
-
-- Chat bot
-- Message Publish/Subscribe Hub
-- Message Cron, Trigger, Task, Pipeline
-- Workflow Action ([Syntax](./doc/action_syntax.md))
-
-## Architecture
-
-<img src="./doc/architecture.png" alt="Architecture" align="center" width="100%" /> 
-
-## Applications used
-
-- Github
-- Pocket
-- Pushover
-- Dropbox
-- Slack
-- Rollbar
-- Email
-
-## Requirements
-
-This project requires Go 1.16 or newer
-
-## Installation
-
-- install MySQL, Redis, etcd, influx, jaeger, nats, xconf
-
-- import sql files
-
-- Configuration
-```
-cp ./configs/*.yml.example ./config/*.yml
-```
-
-- Build binary
-```
-make build
-```
-
-- Run
-```
-./dist/* -f configs/*.yml
-```
-
-# License
-
+# Assistant Bot
+
+![Build](https://github.com/tsundata/assistant/workflows/Build/badge.svg)
+![CodeQL](https://github.com/tsundata/assistant/workflows/CodeQL/badge.svg)
+![Lint](https://github.com/tsundata/assistant/workflows/Lint/badge.svg)
+[![Go Report Card](https://goreportcard.com/badge/github.com/tsundata/assistant)](https://goreportcard.com/report/github.com/tsundata/assistant)
+![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/tsundata/assistant)
+![GitHub](https://img.shields.io/github/license/tsundata/assistant)
+
+Assistant Bot is a workflow engine for chatbot
+
+## Features
+
+- Chat bot
+- Message Publish/Subscribe Hub
+- Message Cron, Trigger, Task, Pipeline
+- Workflow Action ([Syntax](./doc/action_syntax.md))
+
+## Architecture
+
+<img src="./doc/architecture.png" alt="Architecture" align="center" width="100%" /> 
+
+## Applications used
+
+- Github
+- Pocket
+- Pushover
+- Dropbox
+- Slack
+- Rollbar
+- Email
+
+## Requirements
+
+This project requires Go 1.16 or newer
+
+## Installation
+
+- install MySQL, Redis, etcd, influx, jaeger, nats, consul
+
+- import sql files
+
+- Configuration
+```
+cp ./configs/*.yml.example ./config/*.yml
+```
+
+- Build binary
+```
+make build
+```
+
+- Run
+```
+./dist/* -f configs/*.yml
+```
+
+# License
+
 Assistant Bot is licensed under the [MIT license](https://opensource.org/licenses/MIT).

cmd/agent/redis/main.go

@@ -6,13 +6,18 @@ import (
 	"github.com/tsundata/assistant/internal/pkg/app"
 	"github.com/tsundata/assistant/internal/pkg/config"
 	"github.com/tsundata/assistant/internal/pkg/logger"
+	"github.com/tsundata/assistant/internal/pkg/middleware/consul"
 	"github.com/tsundata/assistant/internal/pkg/middleware/influx"
 	"github.com/tsundata/assistant/internal/pkg/middleware/redis"
 	"github.com/tsundata/assistant/internal/pkg/vendors/rollbar"
 )
 
 func CreateApp() (*app.Application, error) {
-	appConfig := config.NewConfig()
+	c, err := consul.New()
+	if err != nil {
+		return nil, err
+	}
+	appConfig := config.NewConfig(c)
 
 	r := rollbar.New(appConfig)
 

cmd/agent/server/main.go

@@ -6,12 +6,17 @@ import (
 	"github.com/tsundata/assistant/internal/pkg/app"
 	"github.com/tsundata/assistant/internal/pkg/config"
 	"github.com/tsundata/assistant/internal/pkg/logger"
+	"github.com/tsundata/assistant/internal/pkg/middleware/consul"
 	"github.com/tsundata/assistant/internal/pkg/middleware/influx"
 	"github.com/tsundata/assistant/internal/pkg/vendors/rollbar"
 )
 
 func CreateApp() (*app.Application, error) {
-	appConfig := config.NewConfig()
+	c, err := consul.New()
+	if err != nil {
+		return nil, err
+	}
+	appConfig := config.NewConfig(c)
 
 	r := rollbar.New(appConfig)
 

cmd/cron/wire.go

@@ -9,6 +9,7 @@ import (
 	"github.com/tsundata/assistant/internal/pkg/app"
 	"github.com/tsundata/assistant/internal/pkg/config"
 	"github.com/tsundata/assistant/internal/pkg/logger"
+	"github.com/tsundata/assistant/internal/pkg/middleware/consul"
 	"github.com/tsundata/assistant/internal/pkg/middleware/etcd"
 	"github.com/tsundata/assistant/internal/pkg/middleware/influx"
 	"github.com/tsundata/assistant/internal/pkg/middleware/jaeger"
@@ -30,6 +31,7 @@ var providerSet = wire.NewSet(
 	redis.ProviderSet,
 	cron.ProviderSet,
 	rollbar.ProviderSet,
+	consul.ProviderSet,
 )
 
 func CreateApp() (*app.Application, error) {

cmd/finance/wire.go

@@ -8,6 +8,7 @@ import (
 	"github.com/tsundata/assistant/internal/pkg/app"
 	"github.com/tsundata/assistant/internal/pkg/config"
 	"github.com/tsundata/assistant/internal/pkg/logger"
+	"github.com/tsundata/assistant/internal/pkg/middleware/consul"
 	"github.com/tsundata/assistant/internal/pkg/middleware/etcd"
 	"github.com/tsundata/assistant/internal/pkg/middleware/influx"
 	"github.com/tsundata/assistant/internal/pkg/middleware/jaeger"
@@ -30,6 +31,7 @@ var providerSet = wire.NewSet(
 	finance.ProviderSet,
 	mysql.ProviderSet,
 	rollbar.ProviderSet,
+	consul.ProviderSet,
 )
 
 func CreateApp() (*app.Application, error) {

cmd/gateway/wire.go

@@ -11,6 +11,7 @@ import (
 	"github.com/tsundata/assistant/internal/pkg/config"
 	"github.com/tsundata/assistant/internal/pkg/event"
 	"github.com/tsundata/assistant/internal/pkg/logger"
+	"github.com/tsundata/assistant/internal/pkg/middleware/consul"
 	"github.com/tsundata/assistant/internal/pkg/middleware/etcd"
 	"github.com/tsundata/assistant/internal/pkg/middleware/influx"
 	"github.com/tsundata/assistant/internal/pkg/middleware/jaeger"
@@ -36,6 +37,7 @@ var providerSet = wire.NewSet(
 	rollbar.ProviderSet,
 	nats.ProviderSet,
 	event.ProviderSet,
+	consul.ProviderSet,
 )
 
 func CreateApp() (*app.Application, error) {

cmd/message/wire.go

@@ -11,6 +11,7 @@ import (
 	"github.com/tsundata/assistant/internal/pkg/config"
 	"github.com/tsundata/assistant/internal/pkg/event"
 	"github.com/tsundata/assistant/internal/pkg/logger"
+	"github.com/tsundata/assistant/internal/pkg/middleware/consul"
 	"github.com/tsundata/assistant/internal/pkg/middleware/etcd"
 	"github.com/tsundata/assistant/internal/pkg/middleware/influx"
 	"github.com/tsundata/assistant/internal/pkg/middleware/jaeger"
@@ -38,6 +39,7 @@ var providerSet = wire.NewSet(
 	repository.ProviderSet,
 	nats.ProviderSet,
 	event.ProviderSet,
+	consul.ProviderSet,
 )
 
 func CreateApp() (*app.Application, error) {