DoNewsCode
diff --git a/‎.github/workflows/go.yml
+35-28 b/‎.github/workflows/go.yml
+35-28
diff --git a/‎CHANGELOG.md
+1 b/‎CHANGELOG.md
+1
diff --git a/‎README.md
+2 b/‎README.md
+2
diff --git a/‎README_CN.md
+4 b/‎README_CN.md
+4
diff --git a/‎c.go
+24-38 b/‎c.go
+24-38
@@ -9,7 +9,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.16.x,1.17.x]
+        go-version: [ 1.18.x ]
     runs-on: ubuntu-latest
     services:
       redis:
@@ -70,44 +70,51 @@ jobs:
         options: --name minio-server
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          stable: false
+          go-version: ${{ matrix.go-version }}
 
-    - uses: actions/cache@v2
-      id: cache-go-mod
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('go.mod') }}
-        restore-keys: |
-          ${{ runner.os }}-go-${{ matrix.go-version }}
+      - uses: actions/cache@v3
+        id: cache-go-mod
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('go.mod') }}
+          restore-keys: |
+            ${{ runner.os }}-go-${{ matrix.go-version }}
 
-    - name: Environment Variables from Dotenv
-      uses: c-py/action-dotenv-to-setenv@v3
+      - name: Environment Variables from Dotenv
+        uses: c-py/action-dotenv-to-setenv@v3
 
-    - name: Build
-      if: steps.cache-go-mod.outputs.cache-hit != 'true'
-      run: go build -v ./...
+      - name: Build
+        if: steps.cache-go-mod.outputs.cache-hit != 'true'
+        run: go build -v ./...
 
-    - name: Test
-      run: go test -race -coverprofile=coverage.txt -covermode=atomic ./...
+      - name: Test
+        run: go test -race -coverprofile=coverage.txt -covermode=atomic ./...
 
-    - name: Upload coverage
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: coverage.txt
+      - name: Upload coverage
+        uses: codecov/codecov-action@v2
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: coverage.txt
   lint:
+    strategy:
+      matrix:
+        go-version: [ 1.18.x ]
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go-version }}
+      - uses: actions/checkout@v3
       - name: Lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.41
+          version: v1.45.2
           args: --disable errcheck --timeout 5m0s
           only-new-issues: true
@@ -465,3 +465,4 @@ the new otetcd configuration is not backward compatible.
 
 * **leader:** add leader election package. ([#56](https://github.com/DoNewsCode/core/issues/56)) (@[谷溪]([email protected]))
 
+>>>>>>> origin/master
@@ -227,5 +227,7 @@ Be sure to checkout the documentation section to learn more.
 - [Go Kit](https://github.com/DoNewsCode/core-kit) (if multiple transports)
 - [Kratos v2](https://github.com/go-kratos/kratos)
 
+## Thanks for JetBrains OS licenses
 
+<a href="https://www.jetbrains.com/?from=Donews/core" target="_blank"><img src="https://user-images.githubusercontent.com/1787798/69898077-4f4e3d00-138f-11ea-81f9-96fb7c49da89.png" width="150" align="middle"/></a>
 
@@ -194,3 +194,7 @@ type HTTPProvider interface {
 - [Gin](https://github.com/DoNewsCode/core-gin) （如果仅限于 HTTP）
 - [Go Kit](https://github.com/DoNewsCode/core-kit) （如果有多个运输工具）
 - [kratos](https://github.com/go-kratos/kratos) (当前 v2 已经可以使用)
+
+## 感谢 JetBrains 开源证书支持
+
+<a href="https://www.jetbrains.com/?from=Donews/core" target="_blank"><img src="https://user-images.githubusercontent.com/1787798/69898077-4f4e3d00-138f-11ea-81f9-96fb7c49da89.png" width="150" align="middle"/></a>
@@ -18,6 +18,7 @@ import (
 	"github.com/DoNewsCode/core/contract"
 	"github.com/DoNewsCode/core/di"
 	"github.com/DoNewsCode/core/logging"
+
 	"github.com/go-kit/log"
 	"github.com/knadh/koanf/providers/confmap"
 	"github.com/knadh/koanf/providers/file"
@@ -34,29 +35,25 @@ type C struct {
 	contract.ConfigAccessor
 	logging.LevelLogger
 	*container.Container
-	contract.Dispatcher
 	di         *dig.Container
 	baseLogger log.Logger
 }
 
 // ConfParser models a parser for configuration. For example, yaml.Parser.
 type ConfParser interface {
-	Unmarshal([]byte) (map[string]interface{}, error)
-	Marshal(map[string]interface{}) ([]byte, error)
+	Unmarshal([]byte) (map[string]any, error)
+	Marshal(map[string]any) ([]byte, error)
 }
 
 // ConfProvider models a configuration provider. For example, file.Provider.
 type ConfProvider interface {
 	ReadBytes() ([]byte, error)
-	Read() (map[string]interface{}, error)
+	Read() (map[string]any, error)
 }
 
 // ConfigProvider provides contract.ConfigAccessor to the core.
 type ConfigProvider func(configStack []config.ProviderSet, configWatcher contract.ConfigWatcher) contract.ConfigUnmarshaler
 
-// EventDispatcherProvider provides contract.Dispatcher to the core.
-type EventDispatcherProvider func(conf contract.ConfigUnmarshaler) contract.Dispatcher
-
 // DiProvider provides the *dig.Container to the core.
 type DiProvider func(conf contract.ConfigUnmarshaler) *dig.Container
 
@@ -74,12 +71,11 @@ type coreValues struct {
 	configStack   []config.ProviderSet
 	configWatcher contract.ConfigWatcher
 	// ConfProvider functions
-	configProvider          ConfigProvider
-	eventDispatcherProvider EventDispatcherProvider
-	diProvider              DiProvider
-	appNameProvider         AppNameProvider
-	envProvider             EnvProvider
-	loggerProvider          LoggerProvider
+	configProvider  ConfigProvider
+	diProvider      DiProvider
+	appNameProvider AppNameProvider
+	envProvider     EnvProvider
+	loggerProvider  LoggerProvider
 }
 
 // CoreOption is the option to modify core attribute.
@@ -93,8 +89,8 @@ func WithYamlFile(path string) (CoreOption, CoreOption) {
 }
 
 // WithInline is a CoreOption that creates a inline config in the configuration stack.
-func WithInline(key string, entry interface{}) CoreOption {
-	return WithConfigStack(confmap.Provider(map[string]interface{}{
+func WithInline(key string, entry any) CoreOption {
+	return WithConfigStack(confmap.Provider(map[string]any{
 		key: entry,
 	}, "."), nil)
 }
@@ -148,24 +144,16 @@ func SetDiProvider(provider DiProvider) CoreOption {
 	}
 }
 
-// SetEventDispatcherProvider is a CoreOption to replaces the default EventDispatcherProvider.
-func SetEventDispatcherProvider(provider EventDispatcherProvider) CoreOption {
-	return func(values *coreValues) {
-		values.eventDispatcherProvider = provider
-	}
-}
-
 // New creates a new bare-bones C.
 func New(opts ...CoreOption) *C {
 	values := coreValues{
-		configStack:             []config.ProviderSet{},
-		configWatcher:           nil,
-		configProvider:          ProvideConfig,
-		appNameProvider:         ProvideAppName,
-		envProvider:             ProvideEnv,
-		loggerProvider:          ProvideLogger,
-		diProvider:              ProvideDi,
-		eventDispatcherProvider: ProvideEventDispatcher,
+		configStack:     []config.ProviderSet{},
+		configWatcher:   nil,
+		configProvider:  ProvideConfig,
+		appNameProvider: ProvideAppName,
+		envProvider:     ProvideEnv,
+		loggerProvider:  ProvideLogger,
+		diProvider:      ProvideDi,
 	}
 	for _, f := range opts {
 		f(&values)
@@ -175,15 +163,13 @@ func New(opts ...CoreOption) *C {
 	appName := values.appNameProvider(conf)
 	logger := values.loggerProvider(conf, appName, env)
 	diContainer := values.diProvider(conf)
-	dispatcher := values.eventDispatcherProvider(conf)
 
 	c := C{
 		AppName:        appName,
 		Env:            env,
 		ConfigAccessor: config.WithAccessor(conf),
 		LevelLogger:    logging.WithLevel(logger),
 		Container:      &container.Container{},
-		Dispatcher:     dispatcher,
 		di:             diContainer,
 		baseLogger:     logger,
 	}
@@ -207,7 +193,7 @@ func Default(opts ...CoreOption) *C {
 // container. The semantics of injection follows the same rule of dig.Invoke.
 // Note that the module added in this way will not retain any original field
 // values, i.e. the module will only contain fields populated by DI container.
-func (c *C) AddModule(module interface{}) {
+func (c *C) AddModule(module any) {
 	t := reflect.TypeOf(module)
 	if t.Kind() == reflect.Ptr && dig.IsIn(t.Elem()) {
 		err := di.IntoPopulator(c.di).Populate(module)
@@ -252,7 +238,7 @@ func (c *C) Provide(deps di.Deps) {
 	}
 }
 
-func (c *C) provide(constructor interface{}) {
+func (c *C) provide(constructor any) {
 	var (
 		options        []dig.ProvideOption
 		shouldMakeFunc bool
@@ -342,7 +328,7 @@ func (c *C) ProvideEssentials() {
 		DIPopulator       contract.DIPopulator
 		Logger            log.Logger
 		LevelLogger       logging.LevelLogger
-		Dispatcher        contract.Dispatcher
+		Lifecycles        lifecycleOut
 		DefaultConfigs    []config.ExportedConfig `group:"config,flatten"`
 	}
 
@@ -355,8 +341,8 @@ func (c *C) ProvideEssentials() {
 			ConfigAccessor:    c.ConfigAccessor,
 			Logger:            c.baseLogger,
 			LevelLogger:       c.LevelLogger,
-			Dispatcher:        c.Dispatcher,
 			DIPopulator:       di.IntoPopulator(c.di),
+			Lifecycles:        provideLifecycle(),
 			DefaultConfigs:    provideDefaultConfig(),
 		}
 		if cc, ok := c.ConfigAccessor.(contract.ConfigRouter); ok {
@@ -391,7 +377,7 @@ func (c *C) Shutdown() {
 
 // AddModuleFunc add the module after Invoking its constructor. Clean up
 // functions and errors are handled automatically.
-func (c *C) AddModuleFunc(constructor interface{}) {
+func (c *C) AddModuleFunc(constructor any) {
 	c.provide(constructor)
 	ftype := reflect.TypeOf(constructor)
 	targetTypes := make([]reflect.Type, 0)
@@ -439,7 +425,7 @@ func (c *C) ApplyRootCommand(command *cobra.Command) {
 //
 // It internally calls uber's dig library. Consult dig's documentation for
 // details. (https://pkg.go.dev/go.uber.org/dig)
-func (c *C) Invoke(function interface{}) {
+func (c *C) Invoke(function any) {
 	err := c.di.Invoke(function)
 	if err != nil {
 		panic(err)
Original file line number	Diff line number	Diff line change
`@@ -465,3 +465,4 @@ the new otetcd configuration is not backward compatible.`
`465`	`465`
`466`	`466`	`* leader: add leader election package. ([#56](https://github.com/DoNewsCode/core/issues/56)) (@[谷溪]([email protected]))`
`467`	`467`
	`468`	`+>>>>>>> origin/master`