sail/examples: optimize source code

.gitignore

@@ -4,6 +4,7 @@
 *.dll
 *.so
 *.dylib
+.DS_Store
 
 coverage.out
 count.out

examples/.gitignore

@@ -23,3 +23,5 @@ tmp.out
 
 # VS Code
 .vscode
+
+examples

examples/Makefile

@@ -6,7 +6,7 @@ default: run
 
 .PHONY: build
 build: fmt
-	go build -o mir-examples main.go
+	go build -o examples main.go
 
 .PHONY: build
 run: fmt

examples/go.mod

@@ -1,4 +1,4 @@
-module github.com/alimy/mir-example/v4
+module github.com/alimy/mir/examples/v4
 
 go 1.21
 

examples/main.go

@@ -7,7 +7,7 @@ package main
 import (
 	"log"
 
-	"github.com/alimy/mir-example/v4/servants"
+	"github.com/alimy/mir/examples/v4/servants"
 	"github.com/gin-gonic/gin"
 )
 

examples/mirc/gen.go

@@ -14,10 +14,10 @@ import (
 	. "github.com/alimy/mir/v4/engine"
 	"github.com/gin-gonic/gin"
 
-	_ "github.com/alimy/mir-example/v4/mirc/routes"
-	_ "github.com/alimy/mir-example/v4/mirc/routes/v1"
-	_ "github.com/alimy/mir-example/v4/mirc/routes/v2"
-	_ "github.com/alimy/mir-example/v4/mirc/routes/v3"
+	_ "github.com/alimy/mir/examples/v4/mirc/routes"
+	_ "github.com/alimy/mir/examples/v4/mirc/routes/v1"
+	_ "github.com/alimy/mir/examples/v4/mirc/routes/v2"
+	_ "github.com/alimy/mir/examples/v4/mirc/routes/v3"
 )
 
 //go:generate go run $GOFILE

examples/mirc/routes/v3/site.go

@@ -5,7 +5,7 @@
 package v3
 
 import (
-	"github.com/alimy/mir-example/v4/model"
+	"github.com/alimy/mir/examples/v4/model"
 	. "github.com/alimy/mir/v4"
 	. "github.com/alimy/mir/v4/engine"
 )

examples/servants/admin_a.go

@@ -5,7 +5,7 @@
 package servants
 
 import (
-	api "github.com/alimy/mir-example/v4/mirc/auto/api/v1"
+	api "github.com/alimy/mir/examples/v4/mirc/auto/api/v1"
 )
 
 type adminSrvA struct {

examples/servants/servants.go

@@ -5,10 +5,10 @@
 package servants
 
 import (
-	"github.com/alimy/mir-example/v4/mirc/auto/api"
-	v1 "github.com/alimy/mir-example/v4/mirc/auto/api/v1"
-	v2 "github.com/alimy/mir-example/v4/mirc/auto/api/v2"
-	v3 "github.com/alimy/mir-example/v4/mirc/auto/api/v3"
+	"github.com/alimy/mir/examples/v4/mirc/auto/api"
+	v1 "github.com/alimy/mir/examples/v4/mirc/auto/api/v1"
+	v2 "github.com/alimy/mir/examples/v4/mirc/auto/api/v2"
+	v3 "github.com/alimy/mir/examples/v4/mirc/auto/api/v3"
 	"github.com/gin-gonic/gin"
 )
 

examples/servants/site.go

@@ -5,7 +5,7 @@
 package servants
 
 import (
-	"github.com/alimy/mir-example/v4/mirc/auto/api"
+	"github.com/alimy/mir/examples/v4/mirc/auto/api"
 )
 
 type siteSrv struct {

examples/servants/site_a.go

@@ -5,7 +5,7 @@
 package servants
 
 import (
-	api "github.com/alimy/mir-example/v4/mirc/auto/api/v1"
+	api "github.com/alimy/mir/examples/v4/mirc/auto/api/v1"
 )
 
 type siteSrvA struct {

examples/servants/site_b.go

@@ -5,7 +5,7 @@
 package servants
 
 import (
-	api "github.com/alimy/mir-example/v4/mirc/auto/api/v2"
+	api "github.com/alimy/mir/examples/v4/mirc/auto/api/v2"
 )
 
 type siteSrvB struct {

examples/servants/site_c.go

@@ -5,7 +5,7 @@
 package servants
 
 import (
-	api "github.com/alimy/mir-example/v4/mirc/auto/api/v3"
+	api "github.com/alimy/mir/examples/v4/mirc/auto/api/v3"
 )
 
 type siteSrvC struct {

sail/examples/.gitignore

@@ -1,4 +1,5 @@
 # Binaries for programs and plugins
+.DS_Store
 *.exe
 *.exe~
 *.dll
@@ -24,4 +25,4 @@ tmp.out
 # VS Code
 .vscode
 
-mir-examples
+/examples

sail/examples/Dockerfile

@@ -0,0 +1,22 @@
+# syntax=docker/dockerfile:1
+
+FROM golang:1.22-alpine3.18 AS builder
+ENV GOPROXY=https://goproxy.io,direct
+
+WORKDIR /app/examples
+ADD . .
+RUN --mount=type=cache,target=$GOPATH/pkg,id=examples-gomodcache \
+    --mount=type=cache,target=/root/.cache/go-build,id=examples-gocache \
+    go mod download && go build -trimpath -tags 'go_json' -ldflags '-w -s' -o examples
+
+FROM alpine:3.18
+WORKDIR /app/examples
+COPY --from=builder /app/examples/examples .
+COPY --from=builder /app/examples/config.yaml .
+
+VOLUME ["/app/paopao-ce/custom"]
+EXPOSE 8080 8081 8082
+HEALTHCHECK --interval=5s --timeout=3s  --retries=3  CMD ps -ef | grep examples || exit 1
+
+ENTRYPOINT ["/app/examples"]
+CMD ["serve"]

sail/examples/Makefile

@@ -6,7 +6,7 @@ BUILD_VERSION := $(shell git describe --tags --always)
 BUILD_DATE := $(shell date +'%Y-%m-%d %H:%M:%S %Z')
 SHA_SHORT := $(shell git rev-parse --short HEAD)
 
-MOD_NAME = github.com/alimy/mir/sail/mir-example/v4
+MOD_NAME = github.com/alimy/mir/sail/examples/v4
 LDFLAGS = -X "${MOD_NAME}/internal/conf.version=${BUILD_VERSION}" \
           -X "${MOD_NAME}/internal/conf.buildDate=${BUILD_DATE}" \
           -X "${MOD_NAME}/internal/conf.commitID=${SHA_SHORT}" \
@@ -18,7 +18,7 @@ default: serve
 
 .PHONY: build
 build: fmt
-	go build -trimpath -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o mir-examples main.go
+	go build -trimpath -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o examples main.go
 
 .PHONY: build
 serve: fmt

sail/examples/cmd/migrate/migrate.go

@@ -7,7 +7,7 @@ package migrate
 import (
 	"fmt"
 
-	"github.com/alimy/mir/sail/mir-example/v4/cmd"
+	"github.com/alimy/mir/sail/examples/v4/cmd"
 	"github.com/spf13/cobra"
 )
 

sail/examples/cmd/serve/serve.go

@@ -11,8 +11,9 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/alimy/mir/sail/mir-example/v4/cmd"
-	"github.com/alimy/mir/sail/mir-example/v4/internal/service"
+	"github.com/alimy/mir/sail/examples/v4/cmd"
+	"github.com/alimy/mir/sail/examples/v4/internal/conf"
+	"github.com/alimy/mir/sail/examples/v4/internal/service"
 
 	"github.com/fatih/color"
 	"github.com/sourcegraph/conc"
@@ -28,8 +29,8 @@ var (
 func init() {
 	serveCmd := &cobra.Command{
 		Use:   "serve",
-		Short: "start mir-example server",
-		Long:  "start mir-example server",
+		Short: "start sail examples server",
+		Long:  "start sail examples server",
 		Run:   serveRun,
 	}
 
@@ -43,6 +44,10 @@ func serveRun(_cmd *cobra.Command, _args []string) {
 	// set maxprocs automatic
 	maxprocs.Set(maxprocs.Logger(log.Printf))
 
+	// initial configure
+	conf.Initial(features, noDefaultFeatures)
+
+	// create service runtime
 	runtime := service.NewRuntime()
 
 	// start services

sail/examples/cmd/version.go

@@ -7,7 +7,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/alimy/mir/sail/mir-example/v4/internal/conf"
+	"github.com/alimy/mir/sail/examples/v4/internal/conf"
 	"github.com/spf13/cobra"
 )