Merge pull request #91 from canghai908/dev

Update to 2.1.2

Author: canghai908

.air.toml

@@ -0,0 +1,36 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+  bin = "tmp\\main.exe web"
+  cmd = "go build -o ./tmp/main.exe ."
+  delay = 1000
+  exclude_dir = ["assets", "tmp", "vendor", "testdata","download"]
+  exclude_file = []
+  exclude_regex = ["_test.go"]
+  exclude_unchanged = false
+  follow_symlink = false
+  full_bin = ""
+  include_dir = []
+  include_ext = ["go", "tpl", "tmpl", "html"]
+  kill_delay = "0s"
+  log = "build-errors.log"
+  send_interrupt = false
+  stop_on_error = true
+
+[color]
+  app = ""
+  build = "yellow"
+  main = "magenta"
+  runner = "green"
+  watcher = "cyan"
+
+[log]
+  time = false
+
+[misc]
+  clean_on_exit = false
+
+[screen]
+  clear_on_rebuild = false

.drone.yml

@@ -0,0 +1,87 @@
+kind: pipeline
+name: zbxtable
+steps:
+  - name: build
+    image: golang:1.18.6
+    commands:
+      - chmod a+x ./control
+      - ./control build
+      - ./control pack
+  - name: scp dev
+    image: appleboy/drone-scp
+    settings:
+      host:
+        from_secret: 222_host
+      port:
+        from_secret: port
+      username:
+        from_secret: username
+      password:
+        from_secret: 222_password
+      command_timeout: 10m
+      target:
+        - /home/wwwroot/downloads/dev
+      source:
+        - ./*.tar.gz
+    when:
+      branch:
+        - dev
+  - name: scp prod
+    image: appleboy/drone-scp
+    settings:
+      host:
+        from_secret: 222_host
+      port:
+        from_secret: port
+      username:
+        from_secret: username
+      password:
+        from_secret: 222_password
+      command_timeout: 10m
+      target:
+        - /home/wwwroot/downloads/stable
+      source:
+        - ./*.tar.gz
+    when:
+      branch:
+        - 2.1
+  - name: scp demo
+    image: appleboy/drone-scp
+    settings:
+      host:
+        from_secret: demo_host
+      port:
+        from_secret: demo_port
+      username:
+        from_secret: demo_username
+      password:
+        from_secret: demo_password
+      command_timeout: 10m
+      target:
+        - /tmp/zbxtable
+      source:
+        - zbxtable
+      rm: true
+    when:
+      branch:
+        - demo
+  - name: ssh restart
+    image: appleboy/drone-ssh
+    settings:
+      host:
+        from_secret: demo_host
+      username:
+        from_secret: demo_username
+      password:
+        from_secret: demo_password
+      port:
+        from_secret: demo_port
+      command_timeout: 10m
+      script:
+        - systemctl stop zbxtable
+        - rm -rf /usr/local/zbxtable/zbxtable
+        - mv /tmp/zbxtable/zbxtable /usr/local/zbxtable/
+        - systemctl start zbxtable
+    when:
+      branch:
+        - demo

cmd/install.go

@@ -7,16 +7,13 @@ import (
 	"github.com/google/uuid"
 	"github.com/urfave/cli/v2"
 	"math/rand"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
 )
 
-func init() {
-	rand.Seed(time.Now().UnixNano())
-}
-
-//tpl t
+// tpl t
 type EventTpl struct {
 	HostsID       string `json:"host_id"`
 	HostHost      string `json:"host_host"`
@@ -83,21 +80,29 @@ func CreateRecoveryTpl() string {
 	return tp
 }
 
-//RandStringRunes 随机密码生成
-func RandStringRunes() string {
-	b := make([]rune, 10)
-	for i := range b {
-		b[i] = letterRunes[rand.Intn(len(letterRunes))]
+// GetStrongPasswordString 强密码生成
+func GetStrongPasswordString(l int) string {
+	//~!@#$%^&*()_+{}":?><;.,
+	str := "123456789ABCDEFGHIJKLMNPQRSTUVWXYZabcdefghijklmnpqrstuvwxyz!@#$%&*"
+	bytes := []byte(str)
+	result := []byte{}
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	for i := 0; i < l; i++ {
+		result = append(result, bytes[r.Intn(len(bytes))])
 	}
-	return string(b)
-}
 
-//const
-var (
-	letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-)
+	ok1, _ := regexp.MatchString(".[1|2|3|4|5|6|7|8|9]", string(result))
+	ok2, _ := regexp.MatchString(".[Z|X|C|V|B|N|M|A|S|D|F|G|H|J|K|L|Q|W|E|R|T|Y|U|I|P]", string(result))
+	ok3, _ := regexp.MatchString(".[z|x|c|v|b|n|m|a|s|d|f|g|h|j|k|l|q|w|e|r|t|y|u|i|p]", string(result))
+	ok4, _ := regexp.MatchString(".[!|@|#|$|%|&|*]", string(result))
+	if ok1 && ok2 && ok3 && ok4 {
+		return string(result)
+	} else {
+		return GetStrongPasswordString(l)
+	}
+}
 
-//ms-aget const
+// ms-aget const
 var (
 	MSName   = "ms-agent"
 	MSUser   = "ms-agent"
@@ -136,7 +141,7 @@ func CheckZabbix() error {
 	return nil
 }
 
-//installAagent
+// installAagent
 func installAgent(*cli.Context) error {
 	err := CheckZabbix()
 	if err != nil {
@@ -190,7 +195,8 @@ func installAgent(*cli.Context) error {
 		userpara["alias"] = MSUser
 		userpara["name"] = MSUser
 	}
-	tPassword := RandStringRunes()
+	//10位随机密码生成
+	tPassword := GetStrongPasswordString(10)
 	userpara["passwd"] = tPassword
 	//5.2版本 取消type字段,切换为roleid，roleid=2默认为管理员角色
 	//5.2以下版本为管理员角色type=3，5.2以上版本roleid=3，为超级管理员角色
@@ -279,7 +285,7 @@ func installAgent(*cli.Context) error {
 	return nil
 }
 
-//GetActionID by actionname
+// GetActionID by actionname
 func GetActionID(ActionName string) (string, error) {
 	//action get
 	Params := make(map[string]interface{}, 0)
@@ -310,7 +316,7 @@ func GetActionID(ActionName string) (string, error) {
 	return hb[0].ActionID, nil
 }
 
-//UserGrpInfo st
+// UserGrpInfo st
 type UserInfo struct {
 	Mediatypes []struct {
 		Mediatypeid string `json:"mediatypeid"`
@@ -321,7 +327,7 @@ type UserInfo struct {
 	} `json:"usrgrps"`
 }
 
-//GetUserID by username
+// GetUserID by username
 func GetUserID(Username string) (userinfo UserInfo, err error) {
 	Params := make(map[string]interface{}, 0)
 	FilterParams := make(map[string]string)

cmd/update.go

@@ -0,0 +1,64 @@
+package cmd
+
+import (
+	"github.com/astaxie/beego/logs"
+	"github.com/sanbornm/go-selfupdate/selfupdate"
+	"github.com/urfave/cli/v2"
+	"zbxtable/models"
+)
+
+var updater = &selfupdate.Updater{
+	// Manually update the const, or set it using `go build -ldflags="-X main.VERSION=<newver>" -o hello-updater src/hello-updater/main.go`
+	ApiURL:     "http://dl.cactifans.com/stable/", // The server hosting `$CmdName/$GOOS-$ARCH.json` which contains the checksum for the binary
+	BinURL:     "http://dl.cactifans.com/stable/", // The server hosting the zip file containing the binary application which is a fallback for the patch method
+	DiffURL:    "http://dl.cactifans.com/stable/", // The server hosting the binary patch diff for incremental updates
+	Dir:        "update/",                         // The directory created by the app when run which stores the cktime file
+	CmdName:    "zbxtable",                        // The app name which is appended to the ApiURL to look for an update
+	ForceCheck: true,                              // For this example, always check for an update unless the version is "dev"
+}
+
+func GetVersion(version, gitHash, buildTime string) selfupdate.Updater {
+	models.Version = version
+	models.GitHash = gitHash
+	models.BuildTime = buildTime
+	updater.CurrentVersion = version
+	return *updater
+}
+
+var (
+	// Install cli
+	Update = &cli.Command{
+		Name:   "update",
+		Usage:  "update zbxtable",
+		Action: update,
+	}
+)
+
+func update(*cli.Context) error {
+	//获取更新信息
+	UpdateVersion, err := updater.UpdateAvailable()
+	//更新出错
+	if err != nil {
+		logs.Error("Update failed!", err)
+		return err
+	}
+	//版本需要更新
+	if UpdateVersion != "" {
+		logs.Info("Start updating zbxtable!")
+		err := updater.BackgroundRun()
+		if err != nil {
+			logs.Error("Update failed!", err)
+			return err
+		}
+		//更新成功
+		logs.Info("Successfully updated to version %s", updater.Info.Version)
+		logs.Info("Update Next run, I should be %v", updater.Info.Version)
+		return nil
+	} else {
+		logs.Info("The current version is %v ", updater.CurrentVersion)
+		logs.Info("The latest version is %v ", updater.Info.Version)
+		logs.Info("The current version is the latest version, no need to update!")
+		return nil
+	}
+	return nil
+}

cmd/web.go

@@ -17,14 +17,16 @@ import (
 )
 
 const motd = `
+
 $$$$$$$$\ $$$$$$$\  $$\   $$\ $$$$$$$$\  $$$$$$\  $$$$$$$\  $$\       $$$$$$$$\ 
 \____$$  |$$  __$$\ $$ |  $$ |\__$$  __|$$  __$$\ $$  __$$\ $$ |      $$  _____|
     $$  / $$ |  $$ |\$$\ $$  |   $$ |   $$ /  $$ |$$ |  $$ |$$ |      $$ |      
    $$  /  $$$$$$$\ | \$$$$  /    $$ |   $$$$$$$$ |$$$$$$$\ |$$ |      $$$$$\    
   $$  /   $$  __$$\  $$  $$<     $$ |   $$  __$$ |$$  __$$\ $$ |      $$  __|   
  $$  /    $$ |  $$ |$$  /\$$\    $$ |   $$ |  $$ |$$ |  $$ |$$ |      $$ |      
 $$$$$$$$\ $$$$$$$  |$$ /  $$ |   $$ |   $$ |  $$ |$$$$$$$  |$$$$$$$$\ $$$$$$$$\ 
-\________|\_______/ \__|  \__|   \__|   \__|  \__|\_______/ \________|\________|`
+\________|\_______/ \__|  \__|   \__|   \__|  \__|\_______/ \________|\________|
+`
 
 var (
 	//Web 配置
@@ -35,11 +37,11 @@ var (
 	}
 )
 
-//runWeb 启动web
+// runWeb 启动web
 func runWeb(*cli.Context) error {
+	Initlogger()
 	logs.Info(motd)
 	CheckConfExist()
-	Initlogger()
 	if beego.BConfig.RunMode == "dev" {
 		beego.BConfig.WebConfig.DirectoryIndex = true
 		beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
@@ -61,7 +63,7 @@ func runWeb(*cli.Context) error {
 	return nil
 }
 
-//CheckDb
+// CheckDb
 func CheckDb(dbdriver, dbhost, dbuser, dbpass, dbname string, dbport string) error {
 	//database type
 	switch dbdriver {
@@ -90,7 +92,7 @@ func CheckDb(dbdriver, dbhost, dbuser, dbpass, dbname string, dbport string) err
 	return nil
 }
 
-//LoginZabbixAPI Check
+// LoginZabbixAPI Check
 func CheckZabbixAPI(args ...string) (string, error) {
 	address := args[0]
 	user := args[1]
@@ -127,7 +129,7 @@ func CheckZabbixAPI(args ...string) (string, error) {
 	return version, nil
 }
 
-//CheckConfExist config
+// CheckConfExist config
 func CheckConfExist() {
 	_, err := os.Stat("./conf/app.conf")
 	if err != nil {
@@ -143,13 +145,12 @@ func CheckConfExist() {
 	}
 }
 
-//init config files
+// init config files
 func InitConfig(v string) string {
 	p, err := Cfg.Section("").GetKey(v)
 	if err != nil {
 		logs.Error(err)
 		return ""
-		os.Exit(1)
 	}
 	return p.String()
 }