clean useless code

.gitignore

@@ -1,5 +1,5 @@
 # debug
-/skeleton
+/monitor_status
 /debug
 /.env
 # editor workspace

cmd/http/handler/index.go

@@ -2,7 +2,7 @@ package handler
 
 import (
 	"git.links123.net/links123.com/pkg/request"
-	"git.links123.net/links123.com/skeleton/service/api"
+	"git.links123.net/links123.com/monitor_status/service/api"
 	"github.com/Unknwon/i18n"
 	"github.com/gin-gonic/gin"
 )

cmd/http/http.go

@@ -6,9 +6,7 @@ import (
 	"strings"
 	"syscall"
 
-	"git.links123.net/links123.com/skeleton/cmd/http/router"
-	"git.links123.net/links123.com/skeleton/service/store/cache"
-	"git.links123.net/links123.com/skeleton/service/store/mysql"
+	"git.links123.net/links123.com/monitor_status/cmd/http/router"
 	"github.com/braintree/manners"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -37,10 +35,6 @@ func RunCommand() *cobra.Command {
 
 // Start use for cobra or testing
 func Start(host, port string) {
-	// init db
-	mysql.Init()
-	// init cache
-	cache.Init()
 	// build router
 	r := router.BuildRouter()
 	// start server
@@ -55,6 +49,4 @@ func Stop() {
 	if manners.Close() {
 		logrus.Info("http server stopped")
 	}
-	cache.Close()
-	mysql.Close()
 }

cmd/http/middleware/auth.go

@@ -1,18 +0,0 @@
-package middleware
-
-import (
-	"git.links123.net/links123.com/pkg/middleware/auth"
-	"git.links123.net/links123.com/skeleton/config"
-	"git.links123.net/links123.com/skeleton/service/store/cache"
-	"github.com/gin-gonic/gin"
-)
-
-// Auth 必须认证
-func Auth() gin.HandlerFunc {
-	return auth.Auth(config.C.App.Secret, cache.AuthSessionStore())
-}
-
-// OptionalAuth 可选认证 如果传了token就会解析其用户
-func OptionalAuth() gin.HandlerFunc {
-	return auth.OptionalAuth(config.C.App.Secret)
-}

cmd/http/router/router.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"git.links123.net/links123.com/pkg/middleware/cors"
-	"git.links123.net/links123.com/skeleton/cmd/http/handler"
-	"git.links123.net/links123.com/skeleton/config"
-	_ "git.links123.net/links123.com/skeleton/docs" // for swagger
+	"git.links123.net/links123.com/monitor_status/cmd/http/handler"
+	"git.links123.net/links123.com/monitor_status/config"
+	_ "git.links123.net/links123.com/monitor_status/docs" // for swagger
 	"github.com/gin-gonic/gin"
 	"github.com/swaggo/gin-swagger"
 	"github.com/swaggo/gin-swagger/swaggerFiles"

cmd/http/router/v1.go

@@ -1,8 +1,7 @@
 package router
 
 import (
-	"git.links123.net/links123.com/skeleton/cmd/http/handler"
-	"git.links123.net/links123.com/skeleton/cmd/http/middleware"
+	"git.links123.net/links123.com/monitor_status/cmd/http/handler"
 )
 
 func registerV1Router() {
@@ -11,16 +10,4 @@ func registerV1Router() {
 	{
 		v1NoAuth.GET("/hello", handler.Healthy)
 	}
-
-	// All user can access, you can get user id in handle
-	v1OptionAuth := r.Group("/v1").Use(middleware.OptionalAuth())
-	{
-		v1OptionAuth.POST("/hello/option/auth", handler.Healthy)
-	}
-
-	// Only the login user can access
-	v1Auth := r.Group("/v1").Use(middleware.Auth())
-	{
-		v1Auth.POST("/hello/auth", handler.Healthy)
-	}
 }

cmd/tcp/handler/index.go

@@ -1,10 +0,0 @@
-package handler
-
-import (
-	"github.com/wpajqz/linker"
-)
-
-// Healthy 健康检查
-func Healthy(ctx linker.Context) {
-	ctx.Success(map[string]string{"keepalive": "true"})
-}

cmd/tcp/middleware/auth.go

@@ -1,43 +0,0 @@
-package middleware
-
-import (
-	"fmt"
-	"net/http"
-
-	"git.links123.net/links123.com/skeleton/config"
-	"github.com/dgrijalva/jwt-go"
-	"github.com/wpajqz/linker"
-)
-
-// headers
-const (
-	CtxRequestHeaderUserId        = "user_id"
-	CtxRequestHeaderAuthorization = "Authorization"
-)
-
-// Auth empty struct for middleware interface
-type Auth struct{}
-
-// Handle middleware process
-func (a *Auth) Handle(ctx linker.Context) linker.Context {
-	tk := ctx.GetRequestProperty(CtxRequestHeaderAuthorization)
-	if len(tk) < 8 {
-		ctx.Error(http.StatusUnauthorized, "Auth failed")
-	}
-
-	token, err := jwt.Parse(tk[7:], func(token *jwt.Token) (interface{}, error) {
-		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
-			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
-		}
-
-		return []byte(config.C.App.Secret), nil
-	})
-
-	if err != nil || !token.Valid {
-		ctx.Error(http.StatusUnauthorized, "Auth failed")
-	}
-
-	ctx.Set(CtxRequestHeaderUserId, int(token.Claims.(jwt.MapClaims)[CtxRequestHeaderUserId].(float64)))
-
-	return ctx
-}

cmd/tcp/router/router.go

@@ -1,18 +0,0 @@
-package router
-
-import (
-	"git.links123.net/links123.com/skeleton/cmd/tcp/middleware"
-	"github.com/wpajqz/linker"
-)
-
-// golbal tcp router
-var r *linker.Router
-
-// BuildRouter build linker roter
-func BuildRouter() *linker.Router {
-	r = linker.NewRouter()
-	r.Use(&middleware.Auth{})
-	registerV1Router()
-
-	return r
-}

cmd/tcp/router/v1.go

@@ -1,17 +0,0 @@
-package router
-
-import (
-	"git.links123.net/links123.com/skeleton/cmd/tcp/handler"
-	"github.com/wpajqz/linker"
-)
-
-func registerV1Router() {
-	r.NSRouter("/v1",
-		r.NSRoute(
-			"/",
-			linker.HandlerFunc(func(ctx linker.Context) {
-				handler.Healthy(ctx)
-			}),
-		),
-	)
-}

cmd/tcp/tcp.go

@@ -1,74 +0,0 @@
-package tcp
-
-import (
-	"os"
-	"os/signal"
-	"strings"
-	"syscall"
-	"time"
-
-	"git.links123.net/links123.com/skeleton/cmd/tcp/router"
-	"git.links123.net/links123.com/skeleton/service/store/cache"
-	"git.links123.net/links123.com/skeleton/service/store/mysql"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-	"github.com/wpajqz/linker"
-	"github.com/wpajqz/linker/plugins"
-)
-
-// RunCommand cobra subcommand tcp
-func RunCommand() *cobra.Command {
-	var host, port string
-	cmd := &cobra.Command{
-		Use:   "tcp",
-		Short: "Run the tcp service",
-		Run: func(cmd *cobra.Command, args []string) {
-			go Start(host, port)
-			// 阻塞退出 捕获信号
-			signalChan := make(chan os.Signal)
-			signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM)
-			logrus.Infof("caught signal %+v, begin garbage collection", <-signalChan)
-			Stop()
-		},
-	}
-
-	cmd.PersistentFlags().StringVarP(&host, "host", "o", "0.0.0.0", "server hostname")
-	cmd.PersistentFlags().StringVarP(&port, "port", "p", "8081", "server port")
-
-	return cmd
-}
-
-// Start use for cobra or testing
-func Start(host, port string) {
-	// init db
-	mysql.Init()
-	// init cache
-	cache.Init()
-	// init server
-	server := linker.NewServer(linker.Config{
-		Timeout: 30 * time.Second,
-		PluginForPacketSender: []linker.PacketPlugin{
-			&plugins.Encryption{},
-			&plugins.Debug{Sender: true},
-		},
-		PluginForPacketReceiver: []linker.PacketPlugin{
-			&plugins.Decryption{},
-			&plugins.Debug{Sender: false},
-		},
-	})
-	// build router
-	r := router.BuildRouter()
-	server.BindRouter(r)
-	// start server
-	err := server.RunTCP("tcp", strings.Join([]string{host, port}, ":"))
-	if err != nil {
-		panic(err)
-	}
-}
-
-// Stop stop the http service graceful
-func Stop() {
-	// tcp server graceful shutdown missing
-	cache.Close()
-	mysql.Close()
-}

cmd/tcp/tcp_test.go

@@ -1,107 +0,0 @@
-package tcp
-
-import (
-	"fmt"
-	"os"
-	"testing"
-	"time"
-
-	"git.links123.net/links123.com/skeleton/config"
-	jwt "github.com/dgrijalva/jwt-go"
-	"github.com/stretchr/testify/assert"
-	"github.com/wpajqz/go-sdk/export"
-)
-
-var client *export.Client
-
-type (
-	ReadyStateCallback    struct{}
-	RequestStatusCallback struct {
-		Start   func()
-		End     func()
-		Success func(header, body []byte)
-		Error   func(code int, message string)
-	}
-)
-
-func (readyStateCallback *ReadyStateCallback) OnOpen() {
-	fmt.Println("Open connection")
-}
-
-func (readyStateCallback *ReadyStateCallback) OnClose() {
-	fmt.Println("Close connection")
-}
-
-func (readyStateCallback *ReadyStateCallback) OnError(err string) {
-	fmt.Println("Error:", err)
-}
-
-func (r RequestStatusCallback) OnStart() {
-	if r.Start != nil {
-		r.Start()
-	}
-}
-
-func (r RequestStatusCallback) OnSuccess(header, body []byte) {
-	if r.Success != nil {
-		r.Success(header, body)
-	}
-}
-
-func (r RequestStatusCallback) OnError(code int, message string) {
-	if r.Error != nil {
-		r.Error(code, message)
-	}
-}
-
-func (r RequestStatusCallback) OnEnd() {
-	if r.End != nil {
-		r.End()
-	}
-}
-
-func genToken(userID int64) string {
-	// Create a new token object, specifying signing method and the claims
-	// you would like it to contain.
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
-		"user_id": userID,
-		"expired": time.Now().Add(time.Hour).Unix(),
-	})
-
-	// Sign and get the complete encoded token as a string using the secret
-	tokenString, err := token.SignedString([]byte(config.C.App.Secret))
-	if err != nil {
-		panic(err)
-	}
-	return tokenString
-}
-
-func TestHealthy(t *testing.T) {
-	err := client.SyncSend("/v1/", nil, &RequestStatusCallback{
-		Success: func(header, body []byte) {
-			fmt.Print(header)
-			assert.Equal(t, "{\"keepalive\":\"true\"}", string(body))
-		},
-		Error: func(code int, message string) {
-			t.Error(code, message)
-		},
-	})
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-func TestMain(m *testing.M) {
-	// start tcp server
-	go Start("127.0.0.1", "8081")
-	client = export.NewClient("127.0.0.1", 8081, &ReadyStateCallback{})
-	for {
-		time.Sleep(time.Second)
-		if client.GetReadyState() == export.OPEN {
-			break
-		}
-	}
-	client.SetRequestProperty("Authorization", "Bearer "+genToken(217))
-	// call flag.Parse() here if TestMain uses flags
-	os.Exit(m.Run())
-}

config/config.go

@@ -23,19 +23,15 @@ type appConfig struct {
 		Debug  bool   `mapstructure:"debug"`
 		Secret string `mapstructure:"secret"`
 	} `mapstructure:"app"`
-	DB struct {
-		Host               string `mapstructure:"host"`
-		User               string `mapstructure:"user"`
-		Password           string `mapstructure:"password"`
-		Name               string `mapstructure:"name"`
-		MaxIdleConnections int    `mapstructure:"max_idle_connections"`
-		MaxOpenConnections int    `mapstructure:"max_open_connections"`
-	} `mapstructure:"db"`
-	Redis struct {
-		Address  string `mapstructure:"address"`
-		Password string `mapstructure:"password"`
-		PoolSize int    `mapstructure:"pool_size"`
-	} `mapstructure:"redis"`
+	Notice struct {
+		SMTP struct {
+			Host     string `mapstructure:"host"`
+			Port     string `mapstructure:"port"`
+			User     string `mapstructure:"user"`
+			Password string `mapstructure:"password"`
+		} `mapstructure:"smtp"`
+		URLs []string `mapstructure:"urls"`
+	} `mapstructure:"notice"`
 }
 
 func init() {
@@ -49,21 +45,14 @@ func init() {
 	viper.SetDefault("app.debug", true)
 	viper.SetDefault("app.secret", "123456")
 
-	// db
-	viper.SetDefault("db.host", "localhost:3306")
-	viper.SetDefault("db.user", "user")
-	viper.SetDefault("db.password", "password")
-	viper.SetDefault("db.name", "name")
-	viper.SetDefault("db.max_idle_connections", 20)
-	viper.SetDefault("db.max_open_connections", 50)
-
-	// redis
-	viper.SetDefault("redis.address", "localhost")
-	viper.SetDefault("redis.password", "")
-	viper.SetDefault("redis.pool_size", 10)
+	// smtp
+	viper.SetDefault("notice.smtp.host", "host")
+	viper.SetDefault("notice.smtp.port", "port")
+	viper.SetDefault("notice.smtp.user", "user")
+	viper.SetDefault("notice.smtp.password", "password")
 
 	// bind env
-	viper.SetEnvPrefix("skeleton")
+	viper.SetEnvPrefix("monitor")
 	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
 	viper.AutomaticEnv()
 

docs/docs.go

@@ -11,8 +11,8 @@ import (
 var doc = `{
     "swagger": "2.0",
     "info": {
-        "description": "project skeleton for all project from links123.com",
-        "title": "project skeleton for all project from links123.com",
+        "description": "project monitor_status for all project from links123.com",
+        "title": "project monitor_status for all project from links123.com",
         "contact": {},
         "license": {},
         "version": "1.0"

docs/swagger/swagger.json

@@ -1,8 +1,8 @@
 {
     "swagger": "2.0",
     "info": {
-        "description": "project skeleton for all project from links123.com",
-        "title": "project skeleton for all project from links123.com",
+        "description": "project monitor_status for all project from links123.com",
+        "title": "project monitor_status for all project from links123.com",
         "contact": {},
         "license": {},
         "version": "1.0"

docs/swagger/swagger.yaml

@@ -1,9 +1,9 @@
 host: 127.0.0.1:8080/v1
 info:
   contact: {}
-  description: project skeleton for all project from links123.com
+  description: project monitor_status for all project from links123.com
   license: {}
-  title: project skeleton for all project from links123.com
+  title: project monitor_status for all project from links123.com
   version: "1.0"
 paths: {}
 swagger: "2.0"

go.mod

@@ -1,4 +1,4 @@
-module git.links123.net/links123.com/skeleton
+module git.links123.net/links123.com/monitor_status
 
 require (
 	git.links123.net/links123.com/pkg/middleware/auth v0.0.0-20180919101150-037eea5b1493

languages/en-US.ini

@@ -1 +0,0 @@
-hi = hello, %s

languages/zh-CN.ini

@@ -1 +0,0 @@
-hi = 你好，%s

main.go

@@ -2,25 +2,23 @@ package main
 
 import (
 	"git.links123.net/links123.com/monitor_status/cmd/http"
-	"git.links123.net/links123.com/monitor_status/cmd/tcp"
 	"git.links123.net/links123.com/monitor_status/cmd/version"
 	"github.com/spf13/cobra"
 )
 
 var apiVersion, gitCommit, built string
 
-// @title project skeleton for all project from links123.com
+// @title project monitor_status for all project from links123.com
 // @version 1.0
-// @description project skeleton for all project from links123.com
+// @description project monitor_status for all project from links123.com
 // @host 127.0.0.1:8080/v1
 func main() {
 	rootCmd := &cobra.Command{
-		Use:   "skeleton",
-		Short: "skeleton api for the project of links123.com's campus",
+		Use:   "monitor_status",
+		Short: "monitor_status api for the project of links123.com's campus",
 	}
 
 	rootCmd.AddCommand(http.RunCommand())
-	rootCmd.AddCommand(tcp.RunCommand())
 	rootCmd.AddCommand(version.RunCommand(apiVersion, gitCommit, built))
 
 	if err := rootCmd.Execute(); err != nil {

service/store/cache/auth.go

@@ -1,10 +0,0 @@
-package cache
-
-import (
-	"git.links123.net/links123.com/pkg/middleware/auth"
-)
-
-// AuthSessionStore 认证存储
-func AuthSessionStore() auth.Session {
-	return session
-}

service/store/cache/auth_test.go

@@ -1,12 +0,0 @@
-package cache
-
-import (
-	"testing"
-)
-
-func TestAuthSessionStore(t *testing.T) {
-	store := AuthSessionStore()
-	if store == nil {
-		t.Error("init auth session store error")
-	}
-}

service/store/cache/cache.go

@@ -1,60 +1 @@
 package cache
-
-import (
-	"sync"
-	"time"
-
-	"git.links123.net/links123.com/pkg/middleware/auth"
-	"git.links123.net/links123.com/skeleton/config"
-	"github.com/go-redis/redis"
-	"github.com/sirupsen/logrus"
-)
-
-var (
-	client  *redis.Client
-	session auth.Session
-	once    = &sync.Once{}
-)
-
-// Init 初始化缓存
-func Init() {
-	once.Do(func() {
-		redisConfig := config.C.Redis
-
-		client = redis.NewClient(&redis.Options{
-			Addr:     redisConfig.Address,
-			Password: redisConfig.Password,
-			PoolSize: redisConfig.PoolSize,
-		})
-
-		for {
-			if err := client.Ping().Err(); err != nil {
-				logrus.Warn("waiting for redis server start...")
-				time.Sleep(3 * time.Second)
-				continue
-			}
-
-			logrus.Info("connect to redis successful")
-
-			break
-		}
-
-		if config.C.App.Debug {
-			session = auth.NewDebugSessionStore()
-		} else {
-			session = auth.NewRedisSessionStore(redisConfig.Address, redisConfig.Password)
-		}
-	})
-}
-
-// Close 退出时关闭链接
-func Close() {
-	if client != nil {
-		err := client.Close()
-		if err != nil {
-			logrus.Errorf("close redis connection error: %s", err.Error())
-			return
-		}
-		logrus.Info("redis connection closed")
-	}
-}

service/store/cache/cache_test.go

@@ -1,11 +0,0 @@
-package cache
-
-import (
-	"os"
-	"testing"
-)
-
-func TestMain(m *testing.M) {
-	Init()
-	os.Exit(m.Run())
-}

service/store/mysql/mysql.go

@@ -1,69 +0,0 @@
-package mysql
-
-import (
-	"time"
-
-	"git.links123.net/links123.com/skeleton/config"
-	"git.links123.net/links123.com/skeleton/service/api"
-	"github.com/sirupsen/logrus"
-	"upper.io/db.v3/lib/sqlbuilder"
-	"upper.io/db.v3/mysql"
-)
-
-var (
-	session sqlbuilder.Database
-)
-
-// Init 初始化数据库
-func Init() {
-	dbConfig := config.C.DB
-	settings := mysql.ConnectionURL{
-		Host:     dbConfig.Host,
-		Database: dbConfig.Name,
-		User:     dbConfig.User,
-		Password: dbConfig.Password,
-	}
-
-	var err error
-	if session, err = mysql.Open(settings); err != nil {
-		logrus.WithField("dsn", settings.String()).Info("connect db failed")
-		panic(err)
-	}
-
-	logrus.WithField("dsn", settings.String()).Info("connect db success")
-
-	session.SetMaxIdleConns(dbConfig.MaxIdleConnections)
-	session.SetMaxOpenConns(dbConfig.MaxOpenConnections)
-
-	for {
-		if err := session.Ping(); err != nil {
-			logrus.Warn("waiting for mysql server start...")
-			time.Sleep(3 * time.Second)
-			continue
-		}
-
-		logrus.Info("connect to mysql successful")
-
-		break
-	}
-
-	if config.C.App.Debug {
-		session.SetLogging(true)
-	}
-}
-
-// Close 在程序退出时关闭连接
-func Close() {
-	if session != nil {
-		err := session.Close()
-		if err != nil {
-			logrus.Errorf("error close mysql connection: %s", err.Error())
-			return
-		}
-	}
-	logrus.Info("mysql connection close")
-}
-
-func paging(selector sqlbuilder.Selector, cp api.CommonParams) sqlbuilder.Paginator {
-	return selector.Paginate(uint(cp.Limit)).Page(uint(cp.Page))
-}