支持旧版本升级

Dockerfile

@@ -14,7 +14,8 @@ RUN make install-vue \
 
 FROM alpine:3.7
 
-RUN addgroup -S app \
+RUN apk add --no-cache ca-certificates \
+    && addgroup -S app \
     && adduser -S -g app app
 
 WORKDIR /app
@@ -27,4 +28,4 @@ EXPOSE 5920
 
 USER app
 
-ENTRYPOINT ["/app/gocron", "web"]
+ENTRYPOINT ["/app/gocron", "web"]

internal/models/migration.go

@@ -223,6 +223,7 @@ func (m *Migration) upgradeFor150(session *xorm.Session) error {
 		return err
 	}
 
+	settingModel.Id = 0
 	settingModel.Code = WebhookCode
 	settingModel.Key = WebhookUrlKey
 	settingModel.Value = ""
@@ -231,6 +232,7 @@ func (m *Migration) upgradeFor150(session *xorm.Session) error {
 		return err
 	}
 
+	settingModel.Id = 0
 	settingModel.Code = WebhookCode
 	settingModel.Key = WebhookTemplateKey
 	settingModel.Value = webhookTemplate

internal/modules/app/app.go

@@ -22,8 +22,6 @@ var (
 	ConfDir string // 配置目录
 	// LogDir 日志目录
 	LogDir string // 日志目录
-	// DataDir 数据目录
-	DataDir string // 存放session等
 	// AppConfig 配置文件
 	AppConfig string // 应用配置文件
 	// Installed 应用是否已安装
@@ -46,10 +44,9 @@ func InitEnv(versionString string) {
 	}
 	ConfDir = filepath.Join(AppDir, "/conf")
 	LogDir = filepath.Join(AppDir, "/log")
-	DataDir = filepath.Join(AppDir, "/data")
 	AppConfig = filepath.Join(ConfDir, "/app.ini")
 	VersionFile = filepath.Join(ConfDir, "/.version")
-	createDirIfNotExists(ConfDir, LogDir, DataDir)
+	createDirIfNotExists(ConfDir, LogDir)
 	Installed = IsInstalled()
 	VersionId = ToNumberVersion(versionString)
 }
@@ -107,7 +104,7 @@ func GetCurrentVersionId() int {
 
 // ToNumberVersion 把字符串版本号a.b.c转换为整数版本号abc
 func ToNumberVersion(versionString string) int {
-	if strings.HasPrefix("v", versionString) {
+	if strings.HasPrefix(versionString, "v") {
 		versionString = versionString[1:]
 	}
 	v := strings.Replace(versionString, ".", "", -1)

internal/routers/routers.go

@@ -27,10 +27,10 @@ import (
 	_ "github.com/ouqiang/gocron/internal/statik"
 )
 
-// URL前缀
-const urlPrefix = "/api"
-
-var staticDir = "public"
+const (
+	urlPrefix = "/api"
+	staticDir = "public"
+)
 
 var statikFS http.FileSystem
 
@@ -42,7 +42,7 @@ func init() {
 	}
 }
 
-// 路由注册
+// Register 路由注册
 func Register(m *macaron.Macaron) {
 	m.SetURLPrefix(urlPrefix)
 	// 所有GET方法，自动注册HEAD方法
@@ -54,6 +54,7 @@ func Register(m *macaron.Macaron) {
 			ctx.WriteHeader(http.StatusInternalServerError)
 			return
 		}
+
 		io.Copy(ctx.Resp, file)
 
 	})

internal/routers/user/user.go

@@ -50,7 +50,7 @@ func Index(ctx *macaron.Context) string {
 
 // 解析查询参数
 func parseQueryParams(ctx *macaron.Context) models.CommonMap {
-	var params models.CommonMap = models.CommonMap{}
+	params := models.CommonMap{}
 	base.ParsePageAndPageSize(ctx, params)
 
 	return params
@@ -65,6 +65,9 @@ func Detail(ctx *macaron.Context) string {
 		logger.Error(err)
 	}
 	jsonResp := utils.JsonResponse{}
+	if userModel.Id == 0 {
+		return jsonResp.Success(utils.SuccessContent, nil)
+	}
 
 	return jsonResp.Success(utils.SuccessContent, userModel)
 }

internal/service/task.go

@@ -120,7 +120,7 @@ func (task Task) Initialize() {
 	for page < maxPage {
 		taskList, err := taskModel.ActiveList(page, pageSize)
 		if err != nil {
-			logger.Fatalf("定时任务初始化#获取任务列表错误-", err.Error())
+			logger.Fatalf("定时任务初始化#获取任务列表错误: %s", err)
 		}
 		if len(taskList) == 0 {
 			break

makefile

@@ -1,5 +1,3 @@
-
-
 .PHONY: build
 build: gocron node
 
@@ -41,6 +39,10 @@ enable-race:
 package: build-vue statik
 	bash ./package.sh
 
+.PHONY: package-all
+package-all: build-vue statik
+	bash ./package.sh -p 'linux darwin windows'
+
 .PHONY: build-vue
 build-vue:
 	cd web/vue && yarn run build

package.sh

@@ -103,8 +103,8 @@ init() {
     GIT_COMMIT_ID=`git_latest_commit`
     LDFLAGS="-w -X 'main.AppVersion=${VERSION}' -X 'main.BuildDate=`date '+%Y-%m-%d %H:%M:%S'`' -X 'main.GitCommit=${GIT_COMMIT_ID}'"
 
-    PACKAGE_DIR=${BINARY_NAME}_package
-    BUILD_DIR=${BINARY_NAME}_build
+    PACKAGE_DIR=${BINARY_NAME}-package
+    BUILD_DIR=${BINARY_NAME}-build
 
     if [[ -d ${BUILD_DIR} ]];then
         rm -rf ${BUILD_DIR}
@@ -178,7 +178,7 @@ run() {
 package_gocron() {
     BINARY_NAME='gocron'
     MAIN_FILE="./cmd/gocron/gocron.go"
-    INCLUDE_FILE=(Dockerfile-release README.md)
+    INCLUDE_FILE=()
 
 
     run