支持通过绝对路径运行gocron

internal/modules/app/app.go

@@ -12,40 +12,51 @@ import (
 	"github.com/ouqiang/gocron/internal/modules/logger"
 	"github.com/ouqiang/gocron/internal/modules/setting"
 	"github.com/ouqiang/gocron/internal/modules/utils"
+	"github.com/ouqiang/goutil"
 )
 
 var (
-	AppDir      string           // 应用根目录
+	// AppDir 应用根目录
-	ConfDir     string           // 配置目录
+	AppDir string // 应用根目录
-	LogDir      string           // 日志目录
+	// ConfDir 配置文件目录
-	DataDir     string           // 存放session等
+	ConfDir string // 配置目录
-	AppConfig   string           // 应用配置文件
+	// LogDir 日志目录
-	Installed   bool             // 应用是否安装过
+	LogDir string // 日志目录
-	Setting     *setting.Setting // 应用配置
+	// DataDir 数据目录
-	VersionId   int              // 版本号
+	DataDir string // 存放session等
-	VersionFile string           // 版本号文件
+	// AppConfig 配置文件
+	AppConfig string // 应用配置文件
+	// Installed 应用是否已安装
+	Installed bool // 应用是否安装过
+	// Setting 应用配置
+	Setting *setting.Setting // 应用配置
+	// VersionId 版本号
+	VersionId int // 版本号
+	// VersionFile 版本文件
+	VersionFile string // 版本号文件
 )
 
+// InitEnv 初始化
 func InitEnv(versionString string) {
 	logger.InitLogger()
 	var err error
-	AppDir, err = filepath.Abs(filepath.Dir(os.Args[0]))
+	AppDir, err = goutil.WorkDir()
 	if err != nil {
 		logger.Fatal(err)
 	}
-	ConfDir = AppDir + "/conf"
+	ConfDir = filepath.Join(AppDir, "/conf")
-	LogDir = AppDir + "/log"
+	LogDir = filepath.Join(AppDir, "/log")
-	DataDir = AppDir + "/data"
+	DataDir = filepath.Join(AppDir, "/data")
-	AppConfig = ConfDir + "/app.ini"
+	AppConfig = filepath.Join(ConfDir, "/app.ini")
-	VersionFile = ConfDir + "/.version"
+	VersionFile = filepath.Join(ConfDir, "/.version")
 	createDirIfNotExists(ConfDir, LogDir, DataDir)
 	Installed = IsInstalled()
 	VersionId = ToNumberVersion(versionString)
 }
 
-// 判断应用是否已安装
+// IsInstalled 判断应用是否已安装
 func IsInstalled() bool {
-	_, err := os.Stat(ConfDir + "/install.lock")
+	_, err := os.Stat(filepath.Join(ConfDir, "/install.lock"))
 	if os.IsNotExist(err) {
 		return false
 	}
@@ -53,9 +64,9 @@ func IsInstalled() bool {
 	return true
 }
 
-// 创建安装锁文件
+// CreateInstallLock 创建安装锁文件
 func CreateInstallLock() error {
-	_, err := os.Create(ConfDir + "/install.lock")
+	_, err := os.Create(filepath.Join(ConfDir, "/install.lock"))
 	if err != nil {
 		logger.Error("创建安装锁文件conf/install.lock失败")
 	}
@@ -63,7 +74,7 @@ func CreateInstallLock() error {
 	return err
 }
 
-// 更新应用版本号文件
+// UpdateVersionFile 更新应用版本号文件
 func UpdateVersionFile() {
 	err := ioutil.WriteFile(VersionFile,
 		[]byte(strconv.Itoa(VersionId)),
@@ -75,7 +86,7 @@ func UpdateVersionFile() {
 	}
 }
 
-// 获取应用当前版本号, 从版本号文件中读取
+// GetCurrentVersionId 获取应用当前版本号, 从版本号文件中读取
 func GetCurrentVersionId() int {
 	if !utils.FileExist(VersionFile) {
 		return 0
@@ -94,7 +105,7 @@ func GetCurrentVersionId() int {
 	return versionId
 }
 
-// 把字符串版本号a.b.c转换为整数版本号abc
+// ToNumberVersion 把字符串版本号a.b.c转换为整数版本号abc
 func ToNumberVersion(versionString string) int {
 	v := strings.Replace(versionString, ".", "", -1)
 	if len(v) < 3 {

internal/routers/routers.go

@@ -3,6 +3,7 @@ package routers
 import (
 	"html/template"
 	"net/http"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
@@ -142,9 +143,9 @@ func RegisterMiddleware(m *macaron.Macaron) {
 	if macaron.Env != macaron.DEV {
 		m.Use(gzip.Gziper())
 	}
-	m.Use(macaron.Static(staticDir))
+	m.Use(macaron.Static(filepath.Join(app.AppDir, staticDir)))
 	m.Use(macaron.Renderer(macaron.RenderOptions{
-		Directory: templateDir,
+		Directory: filepath.Join(app.AppDir, templateDir),
 		// 模板语法分隔符，默认为 ["{{", "}}"]
 		Delims: macaron.Delims{"{%", "%}"},
 		Funcs: []template.FuncMap{map[string]interface{}{

vendor/github.com/ouqiang/goutil/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

vendor/github.com/ouqiang/goutil/README.md

@@ -0,0 +1 @@
+# Golang 工具包

vendor/github.com/ouqiang/goutil/doc.go

@@ -0,0 +1,16 @@
+// Copyright 2018 ouqiang authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+// Package goutil 常用工具包
+package goutil

vendor/github.com/ouqiang/goutil/util.go

@@ -0,0 +1,123 @@
+// Copyright 2018 ouqiang authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package goutil
+
+import (
+	"bytes"
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"html/template"
+	"io"
+	"math/rand"
+	"net/http"
+	"os"
+	"path"
+	"path/filepath"
+	"runtime"
+	"time"
+)
+
+// MD5 生成MD5摘要
+func MD5(s string) string {
+	m := md5.New()
+	m.Write([]byte(s))
+
+	return hex.EncodeToString(m.Sum(nil))
+}
+
+// RandNumber 生成min - max之间的随机数
+func RandNumber(min, max int) int {
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+
+	return min + r.Intn(max-min)
+}
+
+// PanicToError Panic转换为error
+func PanicToError(f func()) (err error) {
+	defer func() {
+		if e := recover(); e != nil {
+			err = fmt.Errorf("panic: %s", e)
+		}
+	}()
+	f()
+	return
+}
+
+// PrintAppVersion 打印应用版本
+func PrintAppVersion(appVersion, GitCommit, BuildDate string) {
+	versionInfo, err := FormatAppVersion(appVersion, GitCommit, BuildDate)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println(versionInfo)
+}
+
+// FormatAppVersion 格式化应用版本信息
+func FormatAppVersion(appVersion, GitCommit, BuildDate string) (string, error) {
+	content := `
+   Version: {{.Version}}
+Go Version: {{.GoVersion}}
+Git Commit: {{.GitCommit}}
+     Built: {{.BuildDate}}
+   OS/ARCH: {{.GOOS}}/{{.GOARCH}}
+`
+	tpl, err := template.New("version").Parse(content)
+	if err != nil {
+		return "", err
+	}
+	var buf bytes.Buffer
+	err = tpl.Execute(&buf, map[string]string{
+		"Version":   appVersion,
+		"GoVersion": runtime.Version(),
+		"GitCommit": GitCommit,
+		"BuildDate": BuildDate,
+		"GOOS":      runtime.GOOS,
+		"GOARCH":    runtime.GOARCH,
+	})
+	if err != nil {
+		return "", err
+	}
+
+	return buf.String(), err
+}
+
+// DownloadFile 文件下载
+func DownloadFile(filePath string, rw http.ResponseWriter) error {
+	file, err := os.Open(filePath)
+	if err != nil {
+		return err
+	}
+	filename := path.Base(filePath)
+	rw.Header().Set("Content-Type", "application/octet-stream")
+	rw.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filename))
+	_, err = io.Copy(rw, file)
+
+	return err
+}
+
+// WorkDir 获取程序运行时根目录
+func WorkDir() (string, error) {
+	execPath, err := os.Executable()
+	if err != nil {
+		return "", err
+	}
+	wd := filepath.Dir(execPath)
+	if filepath.Base(wd) == "bin" {
+		wd = filepath.Dir(wd)
+	}
+
+	return wd, nil
+}

vendor/vendor.json

@@ -154,6 +154,12 @@
 			"revision": "09cded8978dc9e80714c4d85b0322337b0a1e5e0",
 			"revisionTime": "2016-03-02T07:53:16Z"
 		},
+		{
+			"checksumSHA1": "TXREfPduAnd3j2nWhkqVXEcvufk=",
+			"path": "github.com/ouqiang/goutil",
+			"revision": "82b3d2997d337a2174b708d0ffe3f711ffb1eddf",
+			"revisionTime": "2018-04-18T01:28:05Z"
+		},
 		{
 			"checksumSHA1": "cVGA2CJTJsCAVa5VKTM8k/ma/BU=",
 			"path": "github.com/silenceper/pool",