update

application/library/config/cliconfig.go

@@ -78,12 +78,12 @@ type CLIConfig struct {
 
 func (c *CLIConfig) InitFlag(flagSet *pflag.FlagSet) {
 	flagSet.StringVarP(&c.Address, `address`, `a`, c.Address, `address`)
-	flagSet.IntVarP(&c.Port, `port`, `p`, c.Port, `port`)
+	flagSet.IntVarP(&c.Port, `port`, `p`, DefaultPort, `port`)
 	flagSet.StringVarP(&c.Conf, `config`, `c`, c.Conf, `config`)
 	flagSet.StringVarP(&c.Confd, `dftconfig`, `d`, c.Confd, `default config dir`)
 	flagSet.StringVarP(&c.Confx, `subconfig`, `u`, ``, `submodule config`)
 	flagSet.StringVarP(&c.Type, `type`, `t`, `manager`, `operation type`)
-	flagSet.StringVarP(&c.Startup, `startup`, `s`, c.Startup, `startup`)
+	flagSet.StringVarP(&c.Startup, `startup`, `s`, DefaultStartup, `startup`)
 	flagSet.StringVarP(&c.FrontendDomain, `frontend.domain`, `f`, ``, `frontend domain`)
 	flagSet.StringVarP(&c.BackendDomain, `backend.domain`, `b`, ``, `backend domain`)
 }
@@ -128,7 +128,7 @@ func (c *CLIConfig) ParseConfig() {
 	}
 }
 
-//RunStartup manager启动时同时启动的服务
+// RunStartup manager启动时同时启动的服务
 func (c *CLIConfig) RunStartup() {
 	c.ParseConfig()
 	c.Startup = strings.TrimSpace(c.Startup)

application/library/license/official.go

@@ -89,6 +89,9 @@ func validateFromOfficial(ctx echo.Context) error {
 	fullURL := FullLicenseURL(ctx)
 	response, err := client.Get(fullURL)
 	if err != nil {
+		if strings.Contains(err.Error(), `connection refused`) {
+			return ErrConnectionFailed
+		}
 		return errors.Wrap(err, `Connection to the license server failed`)
 	}
 	if response == nil {

go.mod

@@ -137,7 +137,7 @@ require (
 require (
 	github.com/admpub/decimal v1.3.1
 	github.com/admpub/web-terminal v0.0.1
-	github.com/nging-plugins/caddymanager v0.8.0
+	github.com/nging-plugins/caddymanager v0.8.1
 	github.com/nging-plugins/collector v0.8.0
 	github.com/nging-plugins/dbmanager v0.8.1
 	github.com/nging-plugins/ddnsmanager v0.8.2
@@ -227,7 +227,6 @@ require (
 	github.com/gobwas/ws v1.1.0 // indirect
 	github.com/gofrs/uuid v4.2.0+incompatible // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v0.0.0-20210429001901-424d2337a529 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect

go.sum

@@ -718,7 +718,6 @@ github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgR
 github.com/golang/geo v0.0.0-20200319012246-673a6f80352d/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v0.0.0-20210429001901-424d2337a529 h1:2voWjNECnrZRbfwXxHB1/j8wa6xdKn85B5NzgVL/pTU=
-github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -1256,8 +1255,8 @@ github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJE
 github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/nging-plugins/caddymanager v0.8.0 h1:5wfTRknu1eIb5zpngEpwXdnjxVUvfz5n6sh8ipTk5i8=
-github.com/nging-plugins/caddymanager v0.8.0/go.mod h1:+Df0t72qAxfFQffJPtot5hTQZIE5k4hzWBaXx8qYNNs=
+github.com/nging-plugins/caddymanager v0.8.1 h1:UNhXKYj900TYeYUA7YfqcM3TGNkLsFZ+IVxSAwH02Aw=
+github.com/nging-plugins/caddymanager v0.8.1/go.mod h1:gp6MAg5Wy/hKnt7A8Rrrj+W/Z2fZXwAXKibsOY9tsGk=
 github.com/nging-plugins/collector v0.8.0 h1:s7iQDveSBMpMy6K8LWAcdY4jpez+5bTOga2eheB/GiM=
 github.com/nging-plugins/collector v0.8.0/go.mod h1:Yc3eC/OP5RweXpbstqOE9TMKLTOaqVgkzWfddUhg/Bk=
 github.com/nging-plugins/dbmanager v0.8.1 h1:Y1EXRH+TS+cXl5qaNVYa8hMoQvxm6+3Xh9QczOEJ8gw=

main.go

@@ -71,7 +71,7 @@ var (
 	CLOUD_GOX  string
 	COMMIT     string
 	LABEL      = `dev` //beta/alpha/stable
-	VERSION    = `4.2.3`
+	VERSION    = `4.2.4`
 	PACKAGE    = `free`
 
 	schemaVer = version.DBSCHEMA //数据表结构版本

nging-installer.sh

@@ -8,7 +8,7 @@
 
 osname=`uname -s`
 arch=`uname -m`
-version="4.2.2"
+version="4.2.3"
 
 if [ "$2" != "" ] && [ "$2" != "-" ]; then
     version="$2"

tool/inc-version.sh

@@ -7,7 +7,7 @@ export WORKDIR=${PWD}
 export GO_VERSION="1.19.0"
 
 # Nging configuration
-export NGING_VERSION="4.2.2"
+export NGING_VERSION="4.2.3"
 export NGING_BUILD=`date +%Y%m%d%H%M%S`
 export NGING_COMMIT=`git rev-parse HEAD`
 export NGING_LABEL="stable"

vendor/modules.txt

@@ -679,8 +679,6 @@ github.com/gogo/protobuf/proto
 github.com/golang/freetype
 github.com/golang/freetype/raster
 github.com/golang/freetype/truetype
-# github.com/golang/glog v0.0.0-20210429001901-424d2337a529
-## explicit
 # github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
 ## explicit
 github.com/golang/groupcache/lru
@@ -955,7 +953,7 @@ github.com/naoina/toml/ast
 # github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
 ## explicit
 github.com/nfnt/resize
-# github.com/nging-plugins/caddymanager v0.8.0
+# github.com/nging-plugins/caddymanager v0.8.1
 ## explicit; go 1.17
 github.com/nging-plugins/caddymanager
 github.com/nging-plugins/caddymanager/application/dbschema