Merge branch 'master' into dev

.travis.yml

@@ -0,0 +1,45 @@
+language: go
+
+go:
+  - 1.8
+
+sudo: true
+
+before_install:
+  - go get github.com/bradfitz/gomemcache/memcache
+  - go get github.com/garyburd/redigo/internal
+  - go get github.com/garyburd/redigo/redis
+  - go get github.com/go-sql-driver/mysql
+  - go get github.com/golang/freetype
+
+script:
+  - go get -t -v ./...
+  - go build -v -tags "pam" && go install
+
+before_deploy:
+  - sudo apt-get -qq update
+  - GOARCH=amd64 GOOS=linux go build -o godoc_linux_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'"
+  - GOARCH=amd64 GOOS=darwin go build -o godoc_darwin_amd64 -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'"
+  - GOARCH=amd64 GOOS=windows go build -o godoc_windows_amd64.exe -ldflags="-w -X main.VERSION=$TAG -X 'main.BUILD_TIME=`date`' -X 'main.GO_VERSION=`go version`'"
+  - rm -rf commands controllers models modules routers tasks vendor docs search data utils graphics .git Godeps uploads/* .gitignore .travis.yml Dockerfile gide.yaml LICENSE main.go README.md conf/enumerate.go conf/mail.go install.lock *.md
+  - zip -r godoc_linux_amd64.zip conf logs static uploads views godoc_linux_amd64
+  - zip -r godoc_darwin_amd64.zip conf logs static uploads views godoc_darwin_amd64
+  - zip -r godoc_windows_amd64.zip conf logs static uploads views godoc_windows_amd64.exe
+
+deploy:
+  provider: releases
+  api_key: $CI_USER_TOKEN
+  skip_cleanup: true
+  file:
+    - godoc_linux_amd64.zip
+    - godoc_darwin_amd64.zip
+    - godoc_windows_amd64.zip
+  on:
+    overwrite: true
+    tags: true
+    all_branches: true
+    go: 1.8
+
+env:
+ global:
+   - TAG: 0.1.3

README.md

@@ -1,5 +1,7 @@
 # MinDoc 简介
 
+[![Build Status](https://travis-ci.org/lifei6671/godoc.svg?branch=master)](https://travis-ci.org/lifei6671/godoc)
+
 MinDoc 是一款针对IT团队开发的简单好用的文档管理系统。 
 
 MinDoc 的前身是 SmartWiki 文档系统。SmartWiki 是基于 PHP 框架 laravel 开发的一款文档管理系统。因 PHP 的部署对普通用户来说太复杂，所以改用 Golang 开发。可以方便用户部署和实用。

README_LINUX.md

@@ -82,8 +82,6 @@ server {
     #此处配置你的访问日志，请手动创建该目录：
     access_log  /var/log/nginx/webhook.iminho.me/access.log;
 
-    root "/var/go/src/go-git-webhook";
-
     location ~ .*\.(ttf|woff2|eot|otf|map|swf|svg|gif|jpg|jpeg|bmp|png|ico|txt|js|css)$ {
     
         #此处将路径执行 MinDoc 的跟目录

README_WIN.md

@@ -68,8 +68,6 @@ server {
     #此处配置你的访问日志，请手动创建该目录：
     access_log  /var/log/nginx/webhook.iminho.me/access.log;
 
-    root "/var/go/src/go-git-webhook";
-
     location ~ .*\.(ttf|woff2|eot|otf|map|swf|svg|gif|jpg|jpeg|bmp|png|ico|txt|js|css)$ {
     
         #此处将路径执行 MinDoc 的跟目录
@@ -93,4 +91,4 @@ server {
     }
 }
 
-```
+```