diff --git a/.travis.yml b/.travis.yml index 13f323c1..e79a4a87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - "1.12" + - "1.12.7" sudo: true install: @@ -29,4 +29,4 @@ deploy: overwrite: true tags: true all_branches: true - go: "1.12" + go: "1.12.7" diff --git a/Dockerfile b/Dockerfile index 70ea79c9..9aa2dee6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.11.4-alpine3.8 AS build +FROM golang:1.12.7-alpine3.10 AS build #新增 GLIBC ENV GLIBC_VERSION "2.28-r0" diff --git a/appveyor.yml b/appveyor.yml index f428ea6b..733eaf2b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ clone_folder: c:\gopath\src\github.com\lifei6671\mindoc environment: GOPATH: c:\gopath - GOVERSION: "1.12" + GOVERSION: "1.12.7" matrix: - tbs_arch: "x86" tbs_tools: "mingw" diff --git a/conf/app.conf.example b/conf/app.conf.example index 1a4605a2..2c47a74e 100644 --- a/conf/app.conf.example +++ b/conf/app.conf.example @@ -141,6 +141,16 @@ http_login_url= http_login_secret=hzsp*THJUqwbCU%s ################################## +############## Proxy 认证配置 ################# +# 是否开启代理认证 +proxy_enabled = false +# 获取用户账号的请求头 +proxy_header_name = X-WEBAUTH-USER +# 获取用户邮箱地址的请求头 +proxy_header_email=X-WEBAUTH-EMAIL + + + ###############配置CDN加速################## cdn="${MINDOC_CDN_URL}" cdnjs="${MINDOC_CDN_JS_URL}"