Merge pull request #93 from yoyofx/dev

1. Add Startup Env and flags
2. Add Http Server Path , such as /app/...
3. Add Config Path , Used read k8s ConfigMap
4.Add Demo docker image

.build/docker_build.sh

@@ -0,0 +1,5 @@
+# at root dir exec
+
+docker build -f ./Examples/SimpleWeb/Dockerfile  -t yoyofx/yoyogo:v-20201104-56b0d607160cac3954d21f545bcd644541667309 .
+
+kubectl create configmap yoyogo-demo-test -n yoyogo --from-file=config_test.yml

Abstractions/Configuration.go

@@ -6,6 +6,8 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"github.com/yoyofx/yoyogo/Utils"
+	"log"
+	"path"
 )
 
 type Configuration struct {
@@ -15,28 +17,43 @@ type Configuration struct {
 
 func NewConfiguration(configContext *ConfigurationContext) *Configuration {
 	defaultConfig := viper.New()
-
-	flag.String("port", "", "application port")
-	flag.String("profile", configContext.profile, "application profile")
-	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
-	pflag.Parse()
-	_ = defaultConfig.BindPFlags(pflag.CommandLine)
+	if configContext.enableEnv {
+		defaultConfig.AutomaticEnv()
+		defaultConfig.SetEnvPrefix("YYG")
+	}
+	if configContext.enableFlag {
+		flag.String("app", "", "application name")
+		flag.String("port", "", "application port")
+		flag.String("profile", configContext.profile, "application profile")
+		flag.String("conf", ".", "config dir")
+		pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
+		pflag.Parse()
+		_ = defaultConfig.BindPFlags(pflag.CommandLine)
+	}
 
 	if pf := defaultConfig.GetString("profile"); pf != "" {
 		configContext.profile = pf
 	}
+
+	if cf := defaultConfig.GetString("conf"); cf != "" {
+		configContext.configDir = cf
+	}
+
 	configName := configContext.configName + "_" + configContext.profile
-	exists, _ := Utils.PathExists("./" + configName + "." + configContext.configType)
+	configFilePath := path.Join(configContext.configDir, configName+"."+configContext.configType)
+	exists, _ := Utils.PathExists(configFilePath)
 	if !exists {
 		configName = configContext.configName
 	}
 
-	defaultConfig.AddConfigPath(".")
+	defaultConfig.AddConfigPath(configContext.configDir)
 	defaultConfig.SetConfigName(configName)
 	defaultConfig.SetConfigType(configContext.configType)
 	if err := defaultConfig.ReadInConfig(); err != nil {
+		panic(err)
 		return nil
 	}
+	log.Println(configFilePath)
 
 	return &Configuration{
 		context: configContext,
@@ -48,6 +65,14 @@ func (c *Configuration) Get(name string) interface{} {
 	return c.config.Get(name)
 }
 
+func (c *Configuration) GetString(name string) string {
+	return c.config.GetString(name)
+}
+
+func (c *Configuration) GetInt(name string) int {
+	return c.config.GetInt(name)
+}
+
 func (c *Configuration) GetSection(name string) IConfiguration {
 	section := c.config.Sub(name)
 
@@ -67,3 +92,7 @@ func (c *Configuration) Unmarshal(obj interface{}) {
 func (c *Configuration) GetProfile() string {
 	return c.context.profile
 }
+
+func (c *Configuration) GetConfDir() string {
+	return c.context.configDir
+}

Abstractions/ConfigurationBuilder.go

@@ -5,6 +5,7 @@ import "github.com/yoyofx/yoyogo/Abstractions/Env"
 type ConfigurationContext struct {
 	enableFlag bool
 	enableEnv  bool
+	configDir  string
 	configType string
 	configName string
 	profile    string
@@ -51,5 +52,6 @@ func (builder *ConfigurationBuilder) BuildEnv(env string) *Configuration {
 
 func (builder *ConfigurationBuilder) Build() *Configuration {
 	builder.context.profile = Env.Dev
+	builder.context.enableFlag = true
 	return NewConfiguration(builder.context)
 }

Abstractions/HostBuilder.go

@@ -45,6 +45,10 @@ func (host *HostBuilder) UseConfiguration(configuration IConfiguration) *HostBui
 		if portInterface != nil && portInterface.(string) != "" {
 			config.Server.Address = ":" + portInterface.(string)
 		}
+		appName := configuration.GetString("app")
+		if appName != "" {
+			config.Name = appName
+		}
 		host.Context.HostConfiguration = config
 	}
 	return host
@@ -98,6 +102,10 @@ func buildingHostEnvironmentSetting(context *HostBuildContext) {
 	hostEnv := context.HostingEnvironment
 	hostEnv.Version = YoyoGo.Version
 	hostEnv.Addr = DetectAddress("")
+	hostEnv.MetaData = make(map[string]string)
+	hostEnv.MetaData["config.path"] = context.Configuration.GetConfDir()
+	hostEnv.MetaData["server.path"] = context.Configuration.GetString("yoyogo.application.server.path")
+	hostEnv.MetaData["mvc.template"] = context.Configuration.GetString("yoyogo.application.server.mvc.template")
 	config := context.HostConfiguration
 	if config != nil {
 		hostEnv.ApplicationName = config.Name

Abstractions/IConfiguration.go

@@ -2,7 +2,10 @@ package Abstractions
 
 type IConfiguration interface {
 	Get(name string) interface{}
+	GetString(name string) string
+	GetInt(name string) int
 	GetSection(name string) IConfiguration
 	Unmarshal(interface{})
 	GetProfile() string
+	GetConfDir() string
 }

Abstractions/IServiceHost.go

@@ -56,9 +56,11 @@ func PrintLogo(l XLog.ILogger, env *Context.HostEnvironment) {
 	l.Debug("listening on port        :  %s", ConsoleColors.Blue(env.Port))
 	l.Debug("application running pid  :  %s", ConsoleColors.Blue(strconv.Itoa(env.PID)))
 	l.Debug("application name         :  %s", ConsoleColors.Blue(env.ApplicationName))
-	l.Debug("application environment  :  %s", ConsoleColors.Blue(env.Profile))
 	l.Debug("application exec path    :  %s", ConsoleColors.Yellow(Utils.GetCurrentDirectory()))
-	l.Debug("running in %s mode , change (Dev,Test,Prod) mode by HostBuilder.SetEnvironment .", ConsoleColors.Blue(env.Profile))
-	l.Debug(ConsoleColors.Green("Starting HTTP server..."))
+	l.Debug("application config path  :  %s", ConsoleColors.Yellow(env.MetaData["config.path"]))
+	l.Debug("application environment  :  %s", ConsoleColors.Yellow(ConsoleColors.Blue(env.Profile)))
+	l.Debug("running in %s mode , change (Dev,Test,Prod) mode by HostBuilder.SetEnvironment .", ConsoleColors.Red(env.Profile))
+	l.Debug(ConsoleColors.Green("Starting server..."))
+	l.Debug("server setting map       :  %v", env.MetaData)
 
 }

Examples/GrafanaAlertWebHook/WechatRequests/QiyeWechat.go

@@ -31,22 +31,27 @@ func SendTxtMessage(request GrafanaAlertRequest, config Abstractions.IConfigurat
 	tag := request.GetTag()
 	logger := XLog.GetXLogger("wechat")
 	js, _ := json.Marshal(request)
-	logger.Info(string(js))
+	logger.Info("Request json: %s", string(js))
 	if tag == "" {
 		logger.Info("no send")
 		return ""
 	}
-	sendUrl := config.Get("alert.webhook_url").(string)
+	sendUrl := config.Get(fmt.Sprintf("alert.%s.webhook_url", tag)).(string)
 	linkUrl := config.Get(fmt.Sprintf("alert.%s.link_url", tag)).(string)
+	logger.Info("request tag:%s", tag)
+	logger.Info(sendUrl)
+	logger.Info(linkUrl)
+
 	var message *MarkdownMessage
 	if request.State == "alerting" && len(request.EvalMatches) > 0 {
 		message = &MarkdownMessage{
 			Markdown: struct {
 				Content string `json:"content" gorm:"column:content"`
 			}{
-				Content: request.RuleName + ",请相关同事注意。\n" +
-					" > [报警次数]:<font color=\"warning\">" + request.GetMetricValue() + "次</font>" + "\n" +
-					" > [报警明细](" + linkUrl + ")\n",
+				Content: "## " + request.RuleName + ",请相关同事注意。\n" +
+					" > [报警信息] : " + request.Message + "\n" +
+					" > [报警次数] : <font color=\"warning\">" + request.GetMetricValue() + "次</font>" + "\n" +
+					" > [报警明细] : (" + linkUrl + ")\n",
 			},
 			Msgtype: "markdown",
 		}
@@ -55,5 +60,6 @@ func SendTxtMessage(request GrafanaAlertRequest, config Abstractions.IConfigurat
 	msgStr := string(msg)
 	logger.Info("send message:%s", msgStr)
 
+	//return sendUrl + msgStr
 	return postWechatMessage(sendUrl, msgStr)
 }

Examples/GrafanaAlertWebHook/config.yml

@@ -9,8 +9,9 @@ yoyogo:
 
 # alert通过 tag识别节点值
 alert:
-  webhook_url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=014f19d9-929e-4349-9b0f-ee57d868da9e
   jishi:
+    webhook_url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=014f19d9-929e-4349-9b0f-ee57d868da9e
     link_url: http://jcenter-main.easypass.cn/jiankong/d/trpHG7FGk/che-hou-ye-wu-ri-zhi-cha-xun?orgId=1&from=now-1h&to=now&var-app=jishi*&var-level=error&var-host=All&var-msg=*
   znbk:
+    webhook_url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=2319bfd0-9bb4-4cb6-8598-a2f191fc8e81
     link_url: http://jcenter-main.easypass.cn/jiankong/d/trpHG7FGk/che-hou-ye-wu-ri-zhi-cha-xun?orgId=1&from=now-1h&to=now&var-app=zhineng*&var-level=error&var-host=All&var-msg=*

Examples/GrafanaAlertWebHook/controller.go

@@ -15,29 +15,4 @@ func PostAlert(ctx *Context.HttpContext) {
 	ctx.JSON(200, Context.H{
 		"Message": WechatRequests.SendTxtMessage(request, config),
 	})
-
-	//var message WechatRequests.MarkdownMessage
-	//if request.State == "alerting" && len(request.EvalMatches) > 0 {
-	//	message = WechatRequests.MarkdownMessage{
-	//		Markdown: struct {
-	//			Content string `json:"content" gorm:"column:content"`
-	//		}{
-	//			Content: request.RuleName + ",请相关同事注意。\n" +
-	//				" > [报警次数]:<font color=\"warning\">" + strconv.Itoa(request.EvalMatches[0].Value) + "次</font>" + "\n" +
-	//				" > [报警明细](http://jcenter-main.easypass.cn/jiankong/d/trpHG7FGk/che-hou-ye-wu-ri-zhi-cha-xun?orgId=1&from=now-1h&to=now&var-app=jishi*&var-level=error&var-host=All&var-msg=*)\n",
-	//		},
-	//		Msgtype: "markdown",
-	//	}
-	//	//msg, _ := json.Marshal(message)
-	//	//sendUrl := "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=efaebe93-7b21-4bc3-888f-260744f397ac"
-	//	//ctx.JSON(200, Context.H{
-	//	//	"Message": postWechatMessage(sendUrl,string(msg)),
-	//	//})
-	//	ctx.JSON(200, message)
-	//}
-	//msg, _ := json.Marshal(message)
-	//
-	//ctx.JSON(200,Context.H{
-	//	"Message":postWechatMessage(string(msg)) ,
-	//})
 }

Examples/GrafanaAlertWebHook/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"github.com/yoyofx/yoyogo/Abstractions"
 	"github.com/yoyofx/yoyogo/WebFramework"
+	"github.com/yoyofx/yoyogo/WebFramework/Endpoints"
 	"github.com/yoyofx/yoyogo/WebFramework/Router"
 )
 
@@ -14,6 +15,7 @@ func main() {
 		Configure(func(app *YoyoGo.WebApplicationBuilder) {
 			app.UseEndpoints(func(router Router.IRouterBuilder) {
 				router.POST("/alert", PostAlert)
+				Endpoints.UsePrometheus(router)
 			})
 		}).Build().Run()
 }

Examples/SimpleWeb/Dockerfile

@@ -0,0 +1,48 @@
+FROM golang:latest AS builder
+
+# 为我们的镜像设置必要的环境变量
+ENV GO111MODULE=on \
+    CGO_ENABLED=0 \
+    GOOS=linux \
+    GOARCH=amd64 \
+    GOPROXY=https://goproxy.cn,direct
+
+# 移动到工作目录：/build
+WORKDIR /build
+
+# 将代码复制到容器中
+COPY . .
+WORKDIR /build/Examples/SimpleWeb
+RUN ls
+# 将我们的代码编译成二进制可执行文件 app
+RUN go build -o app .
+
+###################
+# 接下来创建一个小镜像
+###################
+FROM alpine
+
+#更新Alpine的软件源为国内源，提高下载速度
+RUN echo "https://mirror.tuna.tsinghua.edu.cn/alpine/v3.4/main/" > /etc/apk/repositories
+
+RUN apk update \
+        && apk upgrade \
+        && apk add --no-cache bash \
+        bash-doc \
+        bash-completion \
+        && rm -rf /var/cache/apk/* \
+        && /bin/bash
+# 设置时区为上海
+RUN apk -U add tzdata && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk del tzdata
+
+# 从builder镜像中把/dist/app 拷贝到当前目录
+COPY --from=builder /build/Examples/SimpleWeb/app /
+COPY --from=builder /build/Examples/SimpleWeb/config_dev.yml /
+COPY --from=builder /build/Examples/SimpleWeb/config_prod.yml /
+
+# RUN chmod +x /app
+
+# 需要运行的命令
+ENTRYPOINT ["/app"]

Examples/SimpleWeb/config_dev.yml

@@ -1,11 +1,14 @@
 yoyogo:
   application:
-    name: demo_dev
+    name: yoyogo_demo_dev
     metadata: "develop"
     server:
       type: "fasthttp"
-      address: ":8082"
+      address: ":8080"
+      path: "app"
       max_request_size: 2096157
+      mvc:
+        template: "/v1/{controller}/{action}"
       static:
         patten: "/"
         webroot: "./Static"
@@ -17,7 +20,7 @@ yoyogo:
         secret: "12391JdeOW^%$#@"
         prefix: "Bearer"
         expires: 3
-        enable: true
+        enable: false
         skip_path: [
             "/info",
             "/v1/user/GetInfo",
@@ -34,8 +37,8 @@ yoyogo:
     discovery:
       type: "nacos"
       metadata:
-        url: "localhost"
-        port: 8848
+        url: "120.53.133.30"
+        port: 80
         namespace: "public"
         group_name: ""
     #    clusters: [""]