Merge pull request 0xDkd#87 from ysicing/dev

support sqlite3 & docker

Author: zh239ns

.dockerignore

@@ -0,0 +1,31 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Go template
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+# vendor/
+
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
+
+auxpi
+db/auxpi.db
+conf/install.lock
+conf/siteConfig.json

.gitignore

@@ -30,4 +30,8 @@ main
 *.test
 
 # Output of the go coverage tool, specifically when used with LiteIDE
-*.out
+*.out
+
+db/auxpi.db
+conf/install.lock
+conf/siteConfig.json

Dockerfile

@@ -0,0 +1,36 @@
+FROM auxpi:base AS builder
+
+RUN make build
+
+FROM debian:stretch-backports
+
+ENV TZ Asia/Shanghai
+
+COPY --from=builder /go/src/github.com/auxpi/auxpi /opt/go/auxpi
+
+COPY static /opt/go/static
+
+COPY views /opt/go/views
+
+#COPY db /opt/go/db
+RUN mkdir -p /opt/go/db /opt/go/conf
+
+# 持久化数据库
+VOLUME /opt/go/db
+# 持久化配置
+VOLUME /opt/go/conf
+
+COPY conf /opt/go/confbak
+
+COPY hack/run/entrypoint.sh /entrypoint.sh
+
+RUN chmod 777 /opt/go/auxpi \
+    && chmod 777 /entrypoint.sh
+
+WORKDIR /opt/go
+
+EXPOSE 2333
+
+ENTRYPOINT ["/entrypoint.sh"]
+
+CMD ["run"]

Makefile

@@ -0,0 +1,76 @@
+.PHONY: fmt vet lint default
+GO_RELEASE_TAGS := $(shell go list -f ':{{join (context.ReleaseTags) ":"}}:' runtime)
+
+# Only use the `-race` flag on newer versions of Go (version 1.3 and newer)
+ifeq (,$(findstring :go1.3:,$(GO_RELEASE_TAGS)))
+	RACE_FLAG :=
+else
+	RACE_FLAG := -race -cpu 1,2,4
+endif
+
+# Run `go vet` on Go 1.12 and newer. For Go 1.5-1.11, use `go tool vet`
+ifneq (,$(findstring :go1.12:,$(GO_RELEASE_TAGS)))
+	GO_VET := go vet \
+		-atomic \
+		-bool \
+		-copylocks \
+		-nilfunc \
+		-printf \
+		-rangeloops \
+		-unreachable \
+		-unsafeptr \
+		-unusedresult \
+		.
+else ifneq (,$(findstring :go1.5:,$(GO_RELEASE_TAGS)))
+	GO_VET := go tool vet \
+		-atomic \
+		-bool \
+		-copylocks \
+		-nilfunc \
+		-printf \
+		-shadow \
+		-rangeloops \
+		-unreachable \
+		-unsafeptr \
+		-unusedresult \
+		.
+else
+	GO_VET := @echo "go vet skipped -- not supported on this version of Go"
+endif
+
+fmt: ## fmt
+
+	@echo gofmt -l
+	@OUTPUT=`gofmt -l . 2>&1`; \
+	if [ "$$OUTPUT" ]; then \
+		echo "gofmt must be run on the following files:"; \
+        echo "$$OUTPUT"; \
+        exit 1; \
+    fi
+
+lint: ## lint
+
+	@echo golint ./...
+	@OUTPUT=`command -v golint >/dev/null 2>&1 && golint ./... 2>&1`; \
+	if [ "$$OUTPUT" ]; then \
+		echo "golint errors:"; \
+		echo "$$OUTPUT"; \
+		exit 1; \
+	fi
+
+vet: ## vet
+	$(GO_VET)
+
+default: fmt lint vet
+
+.PHONY: build
+build: ## 构建
+	  GOARCH=amd64 GOOS=linux CGO_ENABLED=1 go build
+
+.PHONY: docker
+docker: ## 构建镜像
+	@docker build -t auxpi:base -f hack/docker/Dockerfile .
+	@docker build -t ysicing/auxpi .
+
+help: ## this help
+	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)

auxpiAll/e/code.go

@@ -19,7 +19,6 @@ const (
 	ERROR_AUTH                     = 20004
 	ERROR_ACCESS_DENIED            = 20005
 
-
 	ERROR_TASK_REPEAT = 30001
 
 	//USER ERROR 4xxx
@@ -34,7 +33,7 @@ const (
 	ERROR_USER_DELTE         = 40007
 
 	//上传参数错误(api 选择)
-	ERROR_UPLOAD_PARAM = 50001
-	ERROR_CAN_NOT_UPLOAD = 50002
+	ERROR_UPLOAD_PARAM       = 50001
+	ERROR_CAN_NOT_UPLOAD     = 50002
 	ERROR_UPLOAD_TOKEN_ERROR = 50003
 )

bootstrap/Config.go

@@ -33,6 +33,7 @@ type AuxpiConfig struct {
 }
 
 var Cache = initCache()
+
 //var Cache, _ = cache.NewCache("memory", `{"interval":60}`)
 
 var SiteConfig *auxpi.SiteConfig
@@ -175,7 +176,7 @@ func init() {
 
 		//Db Init
 		siteconfig.DbOption.UseDb = true
-		siteconfig.DbOption.DbType = "mysql"
+		siteconfig.DbOption.DbType = "sqlite3"
 		siteconfig.DbOption.DbHost = "127.0.0.1:3306"
 		siteconfig.DbOption.DbName = "auxpi"
 		siteconfig.DbOption.DbUser = "root"
@@ -248,6 +249,6 @@ func initCache() cache.Cache {
 			panic(err)
 		}
 		return c
-		
+
 	}
 }

controllers/api/v1/upload.go

@@ -40,7 +40,7 @@ func (a *ApiUploadController) UpLoadHandle() {
 	//验证
 	validate := a.Validate(h.Header.Get("Content-Type"), h.Filename)
 	if validate {
-		resp,_ := a.UploadHandle(userID, apiSelect, h, ip, true)
+		resp, _ := a.UploadHandle(userID, apiSelect, h, ip, true)
 		a.Data["json"] = resp
 		a.ServeJSON()
 	}

controllers/index.go

@@ -25,7 +25,6 @@ type PagesController struct {
 	beego.Controller
 }
 
-
 func (i *PagesController) commonStyle() {
 	un, _ := i.GetSecureCookie(bootstrap.SiteConfig.AuxpiSalt, "uname")
 

db/.gitkeep

@@ -4,15 +4,11 @@ require (
 	github.com/astaxie/beego v1.11.1
 	github.com/casbin/casbin v1.7.0
 	github.com/casbin/gorm-adapter v0.0.0-20190318080705-e74a050c51a4
-	github.com/denisenkom/go-mssqldb v0.0.0-20190412130859-3b1d194e553a // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/gofrs/uuid v3.2.0+incompatible
 	github.com/gorilla/websocket v1.4.0
-	github.com/jinzhu/gorm v1.9.2
-	github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a // indirect
-	github.com/jinzhu/now v1.0.0 // indirect
+	github.com/jinzhu/gorm v1.9.10
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983
 	github.com/pkg/errors v0.8.0
@@ -23,3 +19,5 @@ require (
 	gopkg.in/masci/flickr.v2 v2.0.0-20161216033441-3cc496dc15cd
 	gopkg.in/yaml.v2 v2.2.2
 )
+
+go 1.13