Ver código fonte

feat:升级golang基础版本

lifei6671 6 anos atrás
pai
commit
458a507fff
4 arquivos alterados com 14 adições e 4 exclusões
  1. 2 2
      .travis.yml
  2. 1 1
      Dockerfile
  3. 1 1
      appveyor.yml
  4. 10 0
      conf/app.conf.example

+ 2 - 2
.travis.yml

@@ -1,7 +1,7 @@
 language: go
 language: go
 
 
 go:
 go:
-  - "1.12"
+  - "1.12.7"
 
 
 sudo: true
 sudo: true
 install:
 install:
@@ -29,4 +29,4 @@ deploy:
     overwrite: true
     overwrite: true
     tags: true
     tags: true
     all_branches: true
     all_branches: true
-    go: "1.12"
+    go: "1.12.7"

+ 1 - 1
Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.11.4-alpine3.8 AS build
+FROM golang:1.12.7-alpine3.10 AS build
 
 
 #新增 GLIBC
 #新增 GLIBC
 ENV GLIBC_VERSION "2.28-r0"
 ENV GLIBC_VERSION "2.28-r0"

+ 1 - 1
appveyor.yml

@@ -3,7 +3,7 @@ clone_folder: c:\gopath\src\github.com\lifei6671\mindoc
 
 
 environment:
 environment:
   GOPATH: c:\gopath
   GOPATH: c:\gopath
-  GOVERSION: "1.12"
+  GOVERSION: "1.12.7"
   matrix:
   matrix:
     - tbs_arch: "x86"
     - tbs_arch: "x86"
       tbs_tools: "mingw"
       tbs_tools: "mingw"

+ 10 - 0
conf/app.conf.example

@@ -141,6 +141,16 @@ http_login_url=
 http_login_secret=hzsp*THJUqwbCU%s
 http_login_secret=hzsp*THJUqwbCU%s
 ##################################
 ##################################
 
 
+############## Proxy 认证配置 #################
+# 是否开启代理认证
+proxy_enabled = false
+# 获取用户账号的请求头
+proxy_header_name = X-WEBAUTH-USER
+# 获取用户邮箱地址的请求头
+proxy_header_email=X-WEBAUTH-EMAIL
+
+
+
 ###############配置CDN加速##################
 ###############配置CDN加速##################
 cdn="${MINDOC_CDN_URL}"
 cdn="${MINDOC_CDN_URL}"
 cdnjs="${MINDOC_CDN_JS_URL}"
 cdnjs="${MINDOC_CDN_JS_URL}"