Merge branch 'develop'

Author: DarthPestilane

.dockerignore

@@ -1 +1,4 @@
 .env
+.gitignore
+.github
+.idea

.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+name: Aliddns
+
+on: [push, pull_request]
+
+jobs:
+  install:
+    name: Install
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-
+      - name: Install dependencies
+        run: go get -v -t -d ./...
+  lint:
+    needs: install
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: golangci/golangci-lint-action@v1
+        with:
+          version: v1.27

.golangci.yml

@@ -54,4 +54,4 @@ linters:
     - nakedret
     - unconvert
     - unparam
-  fast: true
+  fast: false

Dockerfile

@@ -2,11 +2,14 @@ FROM golang:alpine as builder
 
 ADD . /aliddns-src
 
+ENV GOPROXY='https://goproxy.cn/,direct'
+ENV GOSUMDB=off
+
 RUN cp /etc/apk/repositories /etc/apk/repositories.backup && \
     sed -i -E "s|http://.+/alpine|http://mirrors\.aliyun\.com/alpine|" /etc/apk/repositories && \
-    apk add --no-cache --virtual .build-deps git && \
+    apk add --no-cache git make && \
     cd /aliddns-src && \
-    go build -gcflags=-trimpath=${GOPATH} -asmflags=-trimpath=${GOPATH} -ldflags '-s -w' -o aliddns && \
+    make build && \
     cp aliddns /
 
 FROM alpine:latest

Makefile

@@ -1,23 +1,26 @@
 .PHONY: all test clean vendor
 
-ldflags = -ldflags="-s -w"
+buildTime = `date +%Y-%m-%dT%T%z`
+gitCommit = `git rev-parse --short HEAD`
+gitTag = `git describe --tags --abbrev=0 2> /dev/null`
+
+ldflags = -ldflags="-s -w -X main.buildTime=${buildTime} -X main.gitCommit=${gitCommit} -X main.gitTag=${gitTag}"
 gcflags = -gcflags="-trimpath=${PWD}"
 output = -o=aliddns
 
-build: # build
+build:
 	CGO_ENABLED=0 go build ${ldflags} ${gcflags} -v ${output}
 
-build-linux:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ${ldflags} ${gcflags} -v ${output}
-
 lint:
-	CGO_ENABLED=0 GOGC=15 golangci-lint run
-
-lint-ci:
-	CGO_ENABLED=0 GOGC=15 golangci-lint run -v
-
-lint-fix:
-	CGO_ENABLED=0 GOGC=15 golangci-lint run --fix
+	CGO_ENABLED=0 golangci-lint run --concurrency=2
 
 tidy:
 	go mod tidy
+
+image = "darthminion/aliddns"
+
+build-image:
+	docker build -t ${image} .
+
+push-image:
+	docekr push ${image}

README.MD

@@ -1,5 +1,7 @@
 # Ali DDNS
 
+![Aliddns](https://github.com/DarthPestilane/aliddns/workflows/Aliddns/badge.svg)
+
 调用阿里云提供的API，刷新域名解析，将其解析到当前IP地址。
 
 本来想用php写的，但是php版本的sdk写的太烂了(大家可以感受一下：[github/aliyun-stupid-php-sdk](https://github.com/aliyun/aliyun-openapi-php-sdk))，没有composer，连注释也没有，不想用，故换成golang。

app/app.go

@@ -0,0 +1,7 @@
+package app
+
+import "github.com/DarthPestilane/aliddns/app/logger"
+
+func Log() *logger.Logger {
+	return logger.Provide()
+}

app/cmd/cmd.go

@@ -0,0 +1,29 @@
+package cmd
+
+import (
+	"github.com/DarthPestilane/aliddns/app/cmd/server"
+	"github.com/DarthPestilane/aliddns/app/cmd/version"
+	"github.com/urfave/cli"
+	"os"
+)
+
+func Run(buildTime, gitCommit, gitTag string) {
+	info := &version.BuildInfo{
+		BuildTime: buildTime,
+		GitCommit: gitCommit,
+		GitTag:    gitTag,
+	}
+	if info.GitTag == "" {
+		info.GitTag = "in-dev"
+	}
+
+	app := cli.NewApp()
+	app.Version = info.GitTag
+	app.Commands = []cli.Command{
+		server.Command(),
+		version.Command(info),
+	}
+	if err := app.Run(os.Args); err != nil {
+		panic(err)
+	}
+}

cmd_run.go app/cmd/server/server.gocmd_run.go renamed to app/cmd/server/server.go

@@ -1,15 +1,18 @@
-package main
+package server
 
 import (
-	"encoding/json"
 	"fmt"
+	"github.com/DarthPestilane/aliddns/app"
+	"github.com/DarthPestilane/aliddns/app/dns"
+	"github.com/DarthPestilane/aliddns/app/helper"
+	jsoniter "github.com/json-iterator/go"
 	"github.com/urfave/cli"
 	"net/http"
 	"strconv"
 )
 
-func cmdRun() cli.Command {
-	defaultPort, err := strconv.Atoi(env("PORT", "8888"))
+func Command() cli.Command {
+	defaultPort, err := strconv.Atoi(helper.Env("PORT", "8888"))
 	if err != nil {
 		panic(fmt.Errorf("parse env PORT failed: %v", err))
 	}
@@ -24,7 +27,7 @@ func cmdRun() cli.Command {
 		},
 		Action: func(ctx *cli.Context) {
 			port := ctx.Int("port")
-			Log.Info(fmt.Sprintf("listening at port %d", port))
+			app.Log().Info(fmt.Sprintf("listening at port %d", port))
 			http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 				w.Header().Set("Content-Type", "application/json")
 
@@ -35,7 +38,7 @@ func cmdRun() cli.Command {
 				var domainName string
 				if domains, has := query["domain_name"]; !has || domains[0] == "" {
 					w.WriteHeader(422)
-					b, _ := json.Marshal(map[string]interface{}{
+					b, _ := jsoniter.Marshal(map[string]interface{}{
 						"success": false,
 						"errors":  "domain_name is required",
 					})
@@ -52,13 +55,13 @@ func cmdRun() cli.Command {
 				}
 
 				// ip
-				currentIP := ip(r)
+				currentIP := helper.IP(r)
 
-				// bind
-				dns := NewDns(domainName, currentIP, rr)
-				Log.Info("=====")
-				if err := dns.Bind(); err != nil {
-					b, _ := json.Marshal(map[string]interface{}{
+				// bind dns
+				dnsHandler := dns.New(domainName, currentIP, rr)
+				app.Log().Info("=====")
+				if err := dnsHandler.Bind(); err != nil {
+					b, _ := jsoniter.Marshal(map[string]interface{}{
 						"success": false,
 						"errors":  err.Error(),
 					})
@@ -68,18 +71,18 @@ func cmdRun() cli.Command {
 				}
 
 				w.WriteHeader(200)
-				b, err := json.Marshal(map[string]interface{}{
+				b, err := jsoniter.Marshal(map[string]interface{}{
 					"success": true,
 					"message": fmt.Sprintf("set ip of '%s.%s' to %s", rr, domainName, currentIP),
 				})
 				if err != nil {
-					Log.Error("decode response failed", err)
+					app.Log().Error("decode response failed", err)
 					return
 				}
 				_, _ = w.Write(b)
 			})
 			if err := http.ListenAndServe(fmt.Sprintf(":%d", port), nil); err != nil {
-				panic(fmt.Errorf("start http server failed: %v", err))
+				panic(fmt.Errorf("start http server failed: %s", err))
 			}
 		},
 	}

app/cmd/version/version.go

@@ -0,0 +1,38 @@
+package version
+
+import (
+	"fmt"
+	"github.com/urfave/cli"
+	"runtime"
+	"strings"
+)
+
+const tpl = `
+  Version:        %s
+  Go version:     %s
+  Git commit:     %s
+  Built:          %s
+  OS/Arch:        %s/%s
+`
+
+func Command(info *BuildInfo) cli.Command {
+	return cli.Command{
+		Name:  "version",
+		Usage: "Shows app version",
+		Action: func(ctx *cli.Context) {
+			fmt.Println(strings.Trim(fmt.Sprintf(tpl,
+				info.GitTag,
+				runtime.Version(),
+				info.GitCommit,
+				info.BuildTime,
+				runtime.GOOS, runtime.GOARCH,
+			), "\n"))
+		},
+	}
+}
+
+type BuildInfo struct {
+	BuildTime string `json:"build_time"`
+	GitCommit string `json:"git_commit"`
+	GitTag    string `json:"git_tag"`
+}