merged from release-1.6

Author: john

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-- "1.11.x"
+- "1.16.x"
 
 git:
   depth: 1
@@ -11,15 +11,15 @@ branches:
   - master
   - v2
 
-go_import_path: hidevops.io/hiboot
+go_import_path: github.com/hidevopsio/hiboot
 
 env:
 - GO111MODULE=on APP_PROFILES_ACTIVE=local GOPROXY=https://goproxy.cn
 
 install: true
 
 script:
-- env GO111MODULE=on go test -v ./... -coverprofile=coverage.out -covermode=atomic
+- env GO111MODULE=on go test -p 1 -v ./... -coverprofile=coverage.out -covermode=atomic
 
 after_success:
 - bash <(curl -s https://codecov.io/bash) -t ${CODECOV_TOKEN}

CONTRIBUTING.md

@@ -28,7 +28,7 @@ Below, we outline one of the more common Git workflows that core developers use.
 
 ### Fork the main repository
 
-* Go to https://hidevops.io/hiboot
+* Go to https://github.com/hidevopsio/hiboot
 * Click the "Fork" button (at the top right)
 
 ### Clone your fork
@@ -41,7 +41,7 @@ mkdir -p $GOPATH/src/hidevops.io
 cd $GOPATH/src/hidevops.io
 git clone https://github.com/$GITHUB_USER/hiboot
 cd hiboot
-git remote add upstream 'https://hidevops.io/hiboot'
+git remote add upstream 'https://github.com/hidevopsio/hiboot'
 git config --global --add http.followRedirects 1
 ```
 
@@ -59,4 +59,4 @@ git fetch upstream
 git rebase upstream/master
 ```
 
-Note: If you have write access to the main repositories (e.g. hidevops.io/hiboot), you should modify your Git configuration so that you can't accidentally push to upstream:
+Note: If you have write access to the main repositories (e.g. github.com/hidevopsio/hiboot), you should modify your Git configuration so that you can't accidentally push to upstream:

README.md

@@ -1,4 +1,4 @@
-# Hiboot - web/cli application framework 
+# Hiboot - web/cli application framework
 
 <p align="center">
   <a href="https://hiboot.hidevops.io">
@@ -10,7 +10,7 @@
   <a href="https://travis-ci.org/hidevopsio/hiboot?branch=master">
     <img src="https://travis-ci.org/hidevopsio/hiboot.svg?branch=master" alt="Build Status"/>
   </a>
-  <a class="badge-align" href="https://www.codacy.com/app/john-deng/hiboot?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=hidevopsio/hiboot&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/ee8ddbf56ece4f46a6efeb216c351a0f"/></a>
+  <a class="badge-align" href="https://www.codacy.com/app/john-deng/hiboot?utm_source=github.com&utm_medium=referral&utm_content=hidevopsio/hiboot&utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/ee8ddbf56ece4f46a6efeb216c351a0f"/></a>
   <a href="https://github.com/hidevopsio/hiboot">
     <img src="https://tokei.rs/b1/github/hidevopsio/hiboot" />
   </a>
@@ -20,10 +20,10 @@
   <a href="https://opensource.org/licenses/Apache-2.0">
       <img src="https://img.shields.io/badge/License-Apache%202.0-green.svg" />
   </a>
-  <a href="https://goreportcard.com/report/hidevops.io/hiboot">
-      <img src="https://goreportcard.com/badge/hidevops.io/hiboot" />
+  <a href="https://goreportcard.com/report/github.com/hidevopsio/hiboot">
+      <img src="https://goreportcard.com/badge/github.com/hidevopsio/hiboot" />
   </a>
-  <a href="https://godoc.org/hidevops.io/hiboot">
+  <a href="https://godoc.org/github.com/hidevopsio/hiboot">
       <img src="https://godoc.org/github.com/golang/gddo?status.svg" />
   </a>
 </p>
@@ -56,3 +56,8 @@ Thank you for considering contributing to the Hiboot framework, The contribution
 © John Deng, 2017 ~ time.Now
 
 Released under the [Apache License 2.0](https://hidevops.io/hiboot/blob/master/LICENSE)
+=====================================
+
+Released under the [Apache License 2.0](https://github.com/hidevopsio/hiboot/blob/master/LICENSE)
+
+[Jetbrains](https://www.jetbrains.com/?from=hiboot) supports this project with GoLand licenses. We appreciate their support for free and open source software!

doc.go

@@ -19,7 +19,7 @@ Hiboot is a cloud native web and cli application framework written in Go.
 Hiboot integrates the popular libraries but make them simpler, easier to use.
 It borrowed some of the Spring features like dependency injection, aspect oriented programming, and auto configuration.
 You can integrate any other libraries easily by auto configuration with dependency injection support. hiboot-data is the
-typical project that implement customized hiboot starters. see https://godoc.org/hidevops.io/hiboot-data
+typical project that implement customized hiboot starters. see https://godoc.org/github.com/hidevopsio/hiboot-data
 
 Overview
 
@@ -153,8 +153,8 @@ Getting started with Hiboot web application
 
 Get the source code
 
-	go get -u hidevops.io/hiboot
-	cd $GOPATH/src/hidevops.io/hiboot/examples/web/helloworld/
+	go get -u github.com/hidevopsio/hiboot
+	cd $GOPATH/src/github.com/hidevopsio/hiboot/examples/web/helloworld/
 
 Source Code
 

doc_test.go

@@ -15,8 +15,8 @@
 package hiboot_test
 
 import (
-	"hidevops.io/hiboot/pkg/app/web"
-	"hidevops.io/hiboot/pkg/at"
+	"github.com/hidevopsio/hiboot/pkg/app/web"
+	"github.com/hidevopsio/hiboot/pkg/at"
 )
 
 // This is a simple hello world example

examples/cli/README.md

@@ -10,7 +10,7 @@ package main
 
 // import cli starter and fmt
 import (
-	"hidevops.io/hiboot/pkg/starter/cli"
+	"github.com/hidevopsio/hiboot/pkg/starter/cli"
 	"github.com/manifoldco/promptui"
 	"fmt"
 )

examples/cli/advanced/cmd/bar.go

@@ -15,9 +15,9 @@
 package cmd
 
 import (
-	"hidevops.io/hiboot/pkg/app"
-	"hidevops.io/hiboot/pkg/app/cli"
-	"hidevops.io/hiboot/pkg/log"
+	"github.com/hidevopsio/hiboot/pkg/app"
+	"github.com/hidevopsio/hiboot/pkg/app/cli"
+	"github.com/hidevopsio/hiboot/pkg/log"
 )
 
 type barCommand struct {

examples/cli/advanced/cmd/foo.go

@@ -15,10 +15,10 @@
 package cmd
 
 import (
-	"hidevops.io/hiboot/examples/cli/advanced/model"
-	"hidevops.io/hiboot/pkg/app"
-	"hidevops.io/hiboot/pkg/app/cli"
-	"hidevops.io/hiboot/pkg/log"
+	"github.com/hidevopsio/hiboot/examples/cli/advanced/model"
+	"github.com/hidevopsio/hiboot/pkg/app"
+	"github.com/hidevopsio/hiboot/pkg/app/cli"
+	"github.com/hidevopsio/hiboot/pkg/log"
 )
 
 type fooCommand struct {

examples/cli/advanced/cmd/root.go

@@ -15,8 +15,8 @@
 package cmd
 
 import (
-	"hidevops.io/hiboot/pkg/app/cli"
-	"hidevops.io/hiboot/pkg/log"
+	"github.com/hidevopsio/hiboot/pkg/app/cli"
+	"github.com/hidevopsio/hiboot/pkg/log"
 )
 
 // RootCommand is the root command
@@ -25,6 +25,8 @@ type RootCommand struct {
 
 	profile string
 	timeout int
+
+	MagicNumber int `value:"${magic.number}"`
 }
 
 // NewRootCommand the root command
@@ -43,6 +45,7 @@ func NewRootCommand(second *secondCommand) *RootCommand {
 
 // Run root command handler
 func (c *RootCommand) Run(args []string) error {
-	log.Infof("handle first command: profile=%v, timeout=%v", c.profile, c.timeout)
+	log.Debugf("root: %v", args)
+	log.Infof("handle first command: profile=%v, timeout=%v, magic.number=%v", c.profile, c.timeout, c.MagicNumber)
 	return nil
 }

examples/cli/advanced/cmd/root_test.go

@@ -16,12 +16,15 @@ package cmd
 
 import (
 	"github.com/stretchr/testify/assert"
-	_ "hidevops.io/hiboot/examples/cli/advanced/config"
-	"hidevops.io/hiboot/pkg/app/cli"
+	_ "github.com/hidevopsio/hiboot/examples/cli/advanced/config"
+	"github.com/hidevopsio/hiboot/pkg/app/cli"
+	"sync"
 	"testing"
 )
 
+var mu sync.Mutex
 func TestRootCommands(t *testing.T) {
+	mu.Lock()
 	testApp := cli.NewTestApplication(t, NewRootCommand)
 
 	t.Run("should run first command", func(t *testing.T) {
@@ -59,4 +62,5 @@ func TestRootCommands(t *testing.T) {
 		assert.NotEqual(t, nil, err)
 		assert.Contains(t, err.Error(), "unknown command")
 	})
+	mu.Unlock()
 }

examples/cli/advanced/cmd/second.go

@@ -15,9 +15,9 @@
 package cmd
 
 import (
-	"hidevops.io/hiboot/pkg/app"
-	"hidevops.io/hiboot/pkg/app/cli"
-	"hidevops.io/hiboot/pkg/log"
+	"github.com/hidevopsio/hiboot/pkg/app"
+	"github.com/hidevopsio/hiboot/pkg/app/cli"
+	"github.com/hidevopsio/hiboot/pkg/log"
 )
 
 type secondCommand struct {

examples/cli/advanced/config/autoconfigure.go

@@ -1,8 +1,8 @@
 package config
 
 import (
-	"hidevops.io/hiboot/examples/cli/advanced/model"
-	"hidevops.io/hiboot/pkg/app"
+	"github.com/hidevopsio/hiboot/examples/cli/advanced/model"
+	"github.com/hidevopsio/hiboot/pkg/app"
 )
 
 // Profile is the configuration name

examples/cli/advanced/config/foo/bar/application-foo.yml

@@ -0,0 +1,8 @@
+# config file for testing
+
+
+logging:
+  level: debug
+
+magic:
+  number: 999

examples/cli/advanced/config/foo/bar/application-local.yml

@@ -0,0 +1,8 @@
+# config file for testing
+
+
+logging:
+  level: error
+
+magic:
+  number: 888

examples/cli/advanced/config/foo/bar/application.yml

@@ -0,0 +1,15 @@
+# config file for testing
+# filename should be application.yml
+
+app:
+  project: hidevopsio
+  name: hiboot-cmd
+  profiles:
+    include:
+      - foo
+
+logging:
+  level: info
+
+magic:
+  number: 666

examples/cli/advanced/config/foo/baz/application-baz.yml

@@ -0,0 +1,8 @@
+# config file for testing
+
+
+logging:
+  level: debug
+
+magic:
+  number: 999

examples/cli/advanced/main.go

@@ -15,17 +15,23 @@
 package main
 
 import (
-	"hidevops.io/hiboot/examples/cli/advanced/cmd"
-	"hidevops.io/hiboot/examples/cli/advanced/config"
-	"hidevops.io/hiboot/pkg/app"
-	"hidevops.io/hiboot/pkg/app/cli"
-	"hidevops.io/hiboot/pkg/starter/logging"
+	"embed"
+
+	"github.com/hidevopsio/hiboot/examples/cli/advanced/cmd"
+	"github.com/hidevopsio/hiboot/examples/cli/advanced/config"
+	"github.com/hidevopsio/hiboot/pkg/app"
+	"github.com/hidevopsio/hiboot/pkg/app/cli"
+	"github.com/hidevopsio/hiboot/pkg/starter/logging"
 )
 
+//go:embed config/foo
+var embedFS embed.FS
+
 func main() {
 	// create new cli application and run it
 	cli.NewApplication(cmd.NewRootCommand).
-		SetProperty(logging.Level, logging.LevelWarn).
-		SetProperty(app.ProfilesInclude, config.Profile).
+		SetProperty(app.Config, &embedFS).
+		SetProperty(logging.Level, logging.LevelError).
+		SetProperty(app.ProfilesInclude, config.Profile, logging.Profile).
 		Run()
 }

examples/cli/advanced/main_test.go

@@ -16,11 +16,14 @@
 package main
 
 import (
+	"sync"
 	"testing"
-	"time"
 )
 
+var mu sync.Mutex
+
 func TestRunMain(t *testing.T) {
+	mu.Lock()
 	go main()
-	time.Sleep(200 * time.Millisecond)
+	mu.Unlock()
 }

examples/cli/crypto/cmd/crypto.go

@@ -16,9 +16,9 @@ package cmd
 
 import (
 	"fmt"
-	"hidevops.io/hiboot/pkg/app"
-	"hidevops.io/hiboot/pkg/app/cli"
-	"hidevops.io/hiboot/pkg/utils/crypto/rsa"
+	"github.com/hidevopsio/hiboot/pkg/app"
+	"github.com/hidevopsio/hiboot/pkg/app/cli"
+	"github.com/hidevopsio/hiboot/pkg/utils/crypto/rsa"
 )
 
 // define the command

examples/cli/crypto/cmd/crypto_test.go

@@ -16,8 +16,8 @@ package cmd
 
 import (
 	"github.com/stretchr/testify/assert"
-	"hidevops.io/hiboot/pkg/app/cli"
-	"hidevops.io/hiboot/pkg/log"
+	"github.com/hidevopsio/hiboot/pkg/app/cli"
+	"github.com/hidevopsio/hiboot/pkg/log"
 	"testing"
 )
 

examples/cli/crypto/main.go

@@ -18,8 +18,8 @@ package main
 
 // import cli starter and fmt
 import (
-	_ "hidevops.io/hiboot/examples/cli/crypto/cmd"
-	"hidevops.io/hiboot/pkg/app/cli"
+	_ "github.com/hidevopsio/hiboot/examples/cli/crypto/cmd"
+	"github.com/hidevopsio/hiboot/pkg/app/cli"
 )
 
 // main function

examples/cli/crypto/main_test.go

@@ -16,11 +16,14 @@
 package main
 
 import (
+	"sync"
 	"testing"
-	"time"
 )
 
+var mu sync.Mutex
+
 func TestRunMain(t *testing.T) {
+	mu.Lock()
 	go main()
-	time.Sleep(200 * time.Millisecond)
+	mu.Unlock()
 }

examples/cli/hello/main.go

@@ -19,8 +19,8 @@ package main
 // import cli starter and fmt
 import (
 	"fmt"
-	"hidevops.io/hiboot/pkg/app"
-	"hidevops.io/hiboot/pkg/app/cli"
+	"github.com/hidevopsio/hiboot/pkg/app"
+	"github.com/hidevopsio/hiboot/pkg/app/cli"
 )
 
 // define the command