diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a03a64f9..f4a97bd6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,7 +75,7 @@ jobs: build-args: | appVer=${{ env.APP_VER }} commitId=${{ env.commitId }} - tags: bjdgyc/anylink:latest,bjdgyc/anylink:${{ env.APP_VER }} + tags: bjdgyc/anylink:${{ env.APP_VER }},bjdgyc/anylink:latest #tags: bjdgyc/anylink:${{ env.APP_VER }} - name: Build deploy binary diff --git a/README.md b/README.md index 5cd5aa85..ad1f7752 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ AnyLink 服务端仅在 CentOS 7、CentOS 8、Ubuntu 18.04、Ubuntu 20.04 测试 > > 其他问题 [前往查看](doc/question.md) > -> 默认管理后台访问地址 https://host:8800 默认账号密码 admin 123456 +> 默认管理后台访问地址 https://host:8800 或 https://域名:8800 默认账号密码 admin 123456 > > 首次使用,请在浏览器访问 https://域名:443 浏览器提示安全后,在客户端输入 【域名:443】 即可 @@ -87,7 +87,6 @@ cd anylink-deploy sudo ./anylink # 默认管理后台访问地址 -# 注意该host为anylink的内网ip,不能跟客户端请求的ip一样 # https://host:8800 # 默认账号 密码 # admin 123456 diff --git a/server/base/config.go b/server/base/config.go index f384c6ca..b520bb54 100644 --- a/server/base/config.go +++ b/server/base/config.go @@ -58,7 +58,7 @@ var configs = []config{ {Typ: cfgInt, Name: "mobile_keepalive", Usage: "移动端keepalive接检测时间(秒)", ValInt: 10}, {Typ: cfgInt, Name: "mobile_dpd", Usage: "移动端死链接检测时间(秒)", ValInt: 22}, {Typ: cfgInt, Name: "mtu", Usage: "最大传输单元MTU", ValInt: 1460}, - {Typ: cfgInt, Name: "idle_timeout", Usage: "空闲链接超时时间(秒)-超时后断开链接,0关闭此功能", ValInt: 7200}, + {Typ: cfgInt, Name: "idle_timeout", Usage: "空闲链接超时时间(秒)-超时后断开链接,0关闭此功能", ValInt: 1800}, {Typ: cfgInt, Name: "session_timeout", Usage: "session过期时间(秒)-用于断线重连,0永不过期", ValInt: 3600}, // {Typ: cfgInt, Name: "auth_timeout", Usage: "auth_timeout", ValInt: 0}, {Typ: cfgInt, Name: "audit_interval", Usage: "审计去重间隔(秒),-1关闭", ValInt: 600}, diff --git a/server/conf/server-sample.toml b/server/conf/server-sample.toml index bd31f84a..2ee2d4d7 100644 --- a/server/conf/server-sample.toml +++ b/server/conf/server-sample.toml @@ -74,7 +74,7 @@ default_domain = "example.com" #default_domain = "example.com abc.example.com" #空闲链接超时时间(秒)-超时后断开链接,0关闭此功能 -idle_timeout = 7200 +idle_timeout = 1800 #session过期时间,用于断线重连,0永不过期 session_timeout = 3600 auth_timeout = 0 diff --git a/server/dbdata/db.go b/server/dbdata/db.go index 448a3372..c8873203 100644 --- a/server/dbdata/db.go +++ b/server/dbdata/db.go @@ -179,7 +179,7 @@ const accountMail = `

您好:

diff --git a/server/handler/link_tunnel.go b/server/handler/link_tunnel.go index 3c7eb097..b3834f91 100644 --- a/server/handler/link_tunnel.go +++ b/server/handler/link_tunnel.go @@ -192,7 +192,7 @@ func LinkTunnel(w http.ResponseWriter, r *http.Request) { hClone := w.Header().Clone() buf := &bytes.Buffer{} _ = hClone.Write(buf) - base.Trace("LinkTunnel Response Header:", buf.String()) + base.Debug("LinkTunnel Response Header:", buf.String()) hj := w.(http.Hijacker) conn, bufRW, err := hj.Hijack() diff --git a/server/handler/server.go b/server/handler/server.go index 6e1f5ec1..8137c3a6 100644 --- a/server/handler/server.go +++ b/server/handler/server.go @@ -119,7 +119,7 @@ func notFound(w http.ResponseWriter, r *http.Request) { // fmt.Println(r.RemoteAddr) if base.GetLogLevel() == base.LogLevelTrace { hd, _ := httputil.DumpRequest(r, true) - base.Trace("NotFound: ", string(hd)) + base.Trace("NotFound: ", r.RemoteAddr, string(hd)) } w.WriteHeader(http.StatusNotFound) diff --git a/web/src/pages/user/List.vue b/web/src/pages/user/List.vue index 34fa519d..4e4476d4 100644 --- a/web/src/pages/user/List.vue +++ b/web/src/pages/user/List.vue @@ -217,7 +217,8 @@ + v-model="ruleForm.disable_otp" + active-text="开启OTP后,用户密码为【PIN码+OTP动态码】(中间没有+号)">