diff --git a/.travis.yml b/.travis.yml index 72b5fdac..08a4a3ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_deploy: - rm -rf cache commands controllers converter .git .github graphics mail models routers utils runtime - ls -alh - cp conf/app.conf.example conf/app.conf - - zip -r mindoc_linux_amd64.zip conf static uploads views lib mindoc_linux_amd64 favicon.ico LICENSE.md + - zip -r mindoc_linux_amd64.zip conf static uploads views lib mindoc_linux_amd64 LICENSE.md deploy: provider: releases diff --git a/appveyor.yml b/appveyor.yml index 64195997..108eaf15 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,7 +46,7 @@ build_script: go build -v -o "mindoc_windows_%GOARCH%.exe" -ldflags="-w -X github.com/mindoc-org/mindoc/conf.VERSION=%APPVEYOR_REPO_TAG_NAME% -X 'github.com/mindoc-org/mindoc/conf.BUILD_TIME=%date% %time%' -X 'github.com/mindoc-org/mindoc/conf.GO_VERSION=%GO_VERSION%'" - 7z a -t7z -r mindoc_windows_%GOARCH%.7z conf/*.conf* conf/lang/* static/* mindoc_windows_%GOARCH%.exe views/* uploads/* lib/* favicon.ico LICENSE.md + 7z a -t7z -r mindoc_windows_%GOARCH%.7z conf/*.conf* conf/lang/* static/* mindoc_windows_%GOARCH%.exe views/* uploads/* lib/* LICENSE.md test_script: - cmd: >- cd c:\gopath\src\github.com\mindoc-org\mindoc diff --git a/build_amd64.sh b/build_amd64.sh index eaf64a5b..5f57f728 100644 --- a/build_amd64.sh +++ b/build_amd64.sh @@ -16,5 +16,5 @@ cp -r * ../mindoc_linux_amd64 cd ../mindoc_linux_amd64 rm -rf cache commands controllers converter .git .github graphics mail models routers utils runtime conf/*.go rm appveyor.yml docker-compose.yml Dockerfile .travis.yml .gitattributes .gitignore go.mod go.sum main.go README.md simsun.ttc start.sh sync_host.sh build_amd64.sh build_musl_amd64.sh -zip -r mindoc_linux_amd64.zip conf static uploads views lib mindoc_linux_amd64 favicon.ico LICENSE.md +zip -r mindoc_linux_amd64.zip conf static uploads views lib mindoc_linux_amd64 LICENSE.md mv ./mindoc_linux_amd64.zip ../ diff --git a/build_musl_amd64.sh b/build_musl_amd64.sh index 51c8ca93..4baf80af 100644 --- a/build_musl_amd64.sh +++ b/build_musl_amd64.sh @@ -16,5 +16,5 @@ cp -r * ../mindoc_linux_musl_amd64 cd ../mindoc_linux_musl_amd64 rm -rf cache commands controllers converter .git .github graphics mail models routers utils runtime conf/*.go rm appveyor.yml docker-compose.yml Dockerfile .travis.yml .gitattributes .gitignore go.mod go.sum main.go README.md simsun.ttc start.sh sync_host.sh build_amd64.sh build_musl_amd64.sh -zip -r mindoc_linux_musl_amd64.zip conf static uploads views lib mindoc_linux_musl_amd64 favicon.ico LICENSE.md +zip -r mindoc_linux_musl_amd64.zip conf static uploads views lib mindoc_linux_musl_amd64 LICENSE.md mv ./mindoc_linux_musl_amd64.zip ../ diff --git a/favicon.ico b/static/favicon.ico similarity index 100% rename from favicon.ico rename to static/favicon.ico diff --git a/views/account/find_password_setp1.tpl b/views/account/find_password_setp1.tpl index bd723ff4..38840fd7 100644 --- a/views/account/find_password_setp1.tpl +++ b/views/account/find_password_setp1.tpl @@ -2,7 +2,7 @@ - + diff --git a/views/account/find_password_setp2.tpl b/views/account/find_password_setp2.tpl index 16d78e56..a5ecc8c4 100644 --- a/views/account/find_password_setp2.tpl +++ b/views/account/find_password_setp2.tpl @@ -2,7 +2,7 @@ - + diff --git a/views/account/login.tpl b/views/account/login.tpl index 1f090988..9c6d52d4 100644 --- a/views/account/login.tpl +++ b/views/account/login.tpl @@ -2,7 +2,7 @@ - + diff --git a/views/account/register.tpl b/views/account/register.tpl index 5f53fba8..9e5ada13 100644 --- a/views/account/register.tpl +++ b/views/account/register.tpl @@ -2,7 +2,7 @@ - + diff --git a/views/account/workweixin-login-callback.tpl b/views/account/workweixin-login-callback.tpl index 63bfb158..63531c09 100644 --- a/views/account/workweixin-login-callback.tpl +++ b/views/account/workweixin-login-callback.tpl @@ -2,7 +2,7 @@ - + diff --git a/views/blog/index_password.tpl b/views/blog/index_password.tpl index babf3063..19ceef37 100644 --- a/views/blog/index_password.tpl +++ b/views/blog/index_password.tpl @@ -2,7 +2,7 @@ - + diff --git a/views/document/history.tpl b/views/document/history.tpl index 550b6776..1c945168 100644 --- a/views/document/history.tpl +++ b/views/document/history.tpl @@ -3,7 +3,7 @@ - + diff --git a/views/errors/403.tpl b/views/errors/403.tpl index b150d168..7c9b830b 100644 --- a/views/errors/403.tpl +++ b/views/errors/403.tpl @@ -3,7 +3,7 @@ - + diff --git a/views/errors/404.tpl b/views/errors/404.tpl index e789feb6..3cac2b70 100644 --- a/views/errors/404.tpl +++ b/views/errors/404.tpl @@ -3,7 +3,7 @@ - + diff --git a/views/errors/error.tpl b/views/errors/error.tpl index e7353049..217bbf9c 100644 --- a/views/errors/error.tpl +++ b/views/errors/error.tpl @@ -3,7 +3,7 @@ - +