sql-otp-20210630 #38
Closed
sql-otp-20210630 #38
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bjdgyc
reviewed
Jul 1, 2021
| @@ -64,7 +64,11 @@ type ServerConfig struct { | |||
| MobileDpd int `json:"mobile_dpd"` | |||
|
|
|||
| SessionTimeout int `json:"session_timeout"` // in seconds | |||
| AuthTimeout int `json:"auth_timeout"` // in seconds | |||
bjdgyc
reviewed
Jul 1, 2021
| {Typ: cfgStr, Name: "cert_file", Usage: "证书文件", ValStr: "./vpn_cert.pem"}, | ||
| {Typ: cfgStr, Name: "cert_key", Usage: "证书密钥", ValStr: "./vpn_cert.key"}, | ||
| {Typ: cfgStr, Name: "db_file", Usage: "数据库地址支持sqlite3和mysql以及pgsql:\nsqlite3:./sslvpn.db\nmysql:root:root@tcp(127.0.0.1:3306)/sslvpn?charset=utf8\npostgres:host=127.0.0.1 port=5432 user=postgres password=postgres dbname=sslvpn sslmode=disable\n", ValStr: "sqlite3:./sslvpn.db"}, | ||
| {Typ: cfgStr, Name: "cert_file", Usage: "证书文件", ValStr: "./test_vpn_cert.pem"}, |
bjdgyc
reviewed
Jul 1, 2021
| } | ||
| return opt | ||
| return nil |
|
这个证书路径当时为了我测试方便改了下路径。
…------------------ 原始邮件 ------------------
发件人: "bjdgyc/anylink" ***@***.***>;
发送时间: 2021年7月1日(星期四) 上午8:54
***@***.***>;
***@***.******@***.***>;
主题: Re: [bjdgyc/anylink] sql-otp-20210630 (#38)
@bjdgyc commented on this pull request.
In server/base/config.go:
> @@ -23,9 +23,9 @@ var configs = []config{ {Typ: cfgStr, Name: "server_dtls_addr", Usage: "DTLS监听地址", ValStr: ":4433"}, {Typ: cfgStr, Name: "admin_addr", Usage: "后台服务监听地址", ValStr: ":8800"}, {Typ: cfgBool, Name: "proxy_protocol", Usage: "TCP代理协议", ValBool: false}, - {Typ: cfgStr, Name: "db_file", Usage: "数据库地址", ValStr: "./data.db"}, - {Typ: cfgStr, Name: "cert_file", Usage: "证书文件", ValStr: "./vpn_cert.pem"}, - {Typ: cfgStr, Name: "cert_key", Usage: "证书密钥", ValStr: "./vpn_cert.key"}, + {Typ: cfgStr, Name: "db_file", Usage: ***@***.***(127.0.0.1:3306)/sslvpn?charset=utf8\npostgres:host=127.0.0.1 port=5432 user=postgres password=postgres dbname=sslvpn sslmode=disable\n", ValStr: "sqlite3:./sslvpn.db"}, + {Typ: cfgStr, Name: "cert_file", Usage: "证书文件", ValStr: "./test_vpn_cert.pem"},
这个没必要改
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
这里可以直接返回err，我这是个人习惯写nil
…------------------ 原始邮件 ------------------
发件人: "bjdgyc/anylink" ***@***.***>;
发送时间: 2021年7月1日(星期四) 上午9:03
***@***.***>;
***@***.******@***.***>;
主题: Re: [bjdgyc/anylink] sql-otp-20210630 (#38)
@bjdgyc commented on this pull request.
In server/dbdata/db_orm.go:
> } - return opt + return nil
直接 return err
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
并没删，这是我添加了ip和用户错误密码限制次数导致该参数下移
…------------------ 原始邮件 ------------------
发件人: "bjdgyc/anylink" ***@***.***>;
发送时间: 2021年7月1日(星期四) 上午8:53
***@***.***>;
***@***.******@***.***>;
主题: Re: [bjdgyc/anylink] sql-otp-20210630 (#38)
@bjdgyc commented on this pull request.
In server/base/cfg.go:
> @@ -64,7 +64,11 @@ type ServerConfig struct { MobileDpd int `json:"mobile_dpd"` SessionTimeout int `json:"session_timeout"` // in seconds - AuthTimeout int `json:"auth_timeout"` // in seconds
为什么要删除这一参数
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
bjdgyc
reviewed
Jul 1, 2021
| @@ -0,0 +1,191 @@ | |||
| package handler | |||
|
建议重新拉下sql分支，修复下冲突问题吧 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
更新sql支持和otp认证逻辑修改