mirror of
https://github.com/pppscn/SmsForwarder
synced 2025-08-03 01:17:41 +08:00
修复:多个自启动的Frpc无法同时自动启动Bug
优化:Frpc默认配置采用toml格式
This commit is contained in:
parent
5eed98121e
commit
7e6499be1b
@ -197,33 +197,38 @@ CREATE TABLE "Frpc" (
|
|||||||
)
|
)
|
||||||
database.execSQL(
|
database.execSQL(
|
||||||
"""
|
"""
|
||||||
INSERT INTO "Frpc" VALUES ('830b0a0e-c2b3-4f95-b3c9-55db12923d2e', '远程控制SmsForwarder', '[common]
|
INSERT INTO "Frpc" VALUES ('830b0a0e-c2b3-4f95-b3c9-55db12923d2e', '远程控制SmsForwarder', '
|
||||||
#frps服务端公网IP
|
#frps服务端公网IP
|
||||||
server_addr = 88.88.88.88
|
serverAddr = "88.88.88.88"
|
||||||
#frps服务端公网端口
|
#frps服务端公网端口
|
||||||
server_port = 8888
|
serverPort = 8888
|
||||||
#可选,建议启用
|
|
||||||
token = 88888888
|
|
||||||
#连接服务端的超时时间(增大时间避免frpc在网络未就绪的情况下启动失败)
|
#连接服务端的超时时间(增大时间避免frpc在网络未就绪的情况下启动失败)
|
||||||
dial_server_timeout = 60
|
transport.dialServerTimeout = 60
|
||||||
#第一次登陆失败后是否退出
|
#第一次登陆失败后是否退出
|
||||||
login_fail_exit = false
|
loginFailExit = false
|
||||||
|
#可选,建议启用
|
||||||
|
auth.method = "token"
|
||||||
|
auth.token = "88888888"
|
||||||
|
|
||||||
#[二选一即可]每台机器不可重复,通过 http://88.88.88.88:5000 访问
|
#[二选一即可]每台机器的 name 和 remotePort 不可重复,通过 http://88.88.88.88:5000 访问
|
||||||
[SmsForwarder-TCP]
|
[[proxies]]
|
||||||
type = tcp
|
#同一个frps下,多台设备的 name 不可重复
|
||||||
local_ip = 127.0.0.1
|
name = "SmsForwarder-TCP-001"
|
||||||
local_port = 5000
|
type = "tcp"
|
||||||
#只要修改下面这一行(frps所在服务器必须暴露的公网端口)
|
localIP = "127.0.0.1"
|
||||||
remote_port = 5000
|
localPort = 5000
|
||||||
|
#只要修改下面这一行(frps所在服务器必须暴露且防火墙放行的公网端口,同一个frps下不可重复)
|
||||||
|
remotePort = 5000
|
||||||
|
|
||||||
#[二选一即可]每台机器不可重复,通过 http://smsf.demo.com 访问
|
#[二选一即可]每台机器的 name 和 customDomains 不可重复,通过 http://smsf.demo.com 访问
|
||||||
[SmsForwarder-HTTP]
|
[[proxies]]
|
||||||
type = http
|
#同一个frps下,多台设备的 name 不可重复
|
||||||
local_ip = 127.0.0.1
|
name = "SmsForwarder-HTTP-001"
|
||||||
local_port = 5000
|
type = "http"
|
||||||
|
localPort = 5000
|
||||||
#只要修改下面这一行(在frps端将域名反代到vhost_http_port)
|
#只要修改下面这一行(在frps端将域名反代到vhost_http_port)
|
||||||
custom_domains = smsf.demo.com
|
customDomains = ["smsf.demo.com"]
|
||||||
|
|
||||||
', 0, '1651334400000')
|
', 0, '1651334400000')
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
)
|
)
|
||||||
|
@ -263,9 +263,13 @@ class ForegroundService : Service() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (frpc in frpcList) {
|
for (frpc in frpcList) {
|
||||||
val error = Frpclib.runContent(frpc.uid, frpc.config)
|
Log.d(TAG, "自启动的Frpc: $frpc")
|
||||||
if (!TextUtils.isEmpty(error)) {
|
GlobalScope.async(Dispatchers.IO) {
|
||||||
Log.e(TAG, error)
|
val error = Frpclib.runContent(frpc.uid, frpc.config)
|
||||||
|
Log.d(TAG, "自启动的Frpc: uid=${frpc.uid}, error=$error")
|
||||||
|
if (!TextUtils.isEmpty(error)) {
|
||||||
|
Log.e(TAG, error)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,27 +0,0 @@
|
|||||||
[common]
|
|
||||||
#frps服务端公网IP
|
|
||||||
server_addr = 88.88.88.88
|
|
||||||
#frps服务端公网端口
|
|
||||||
server_port = 8888
|
|
||||||
#可选,建议启用
|
|
||||||
token = 88888888
|
|
||||||
#连接服务端的超时时间(增大时间避免frpc在网络未就绪的情况下启动失败)
|
|
||||||
dial_server_timeout = 60
|
|
||||||
#第一次登陆失败后是否退出
|
|
||||||
login_fail_exit = false
|
|
||||||
|
|
||||||
#[二选一即可]每台机器不可重复,通过 http://88.88.88.88:5000 访问
|
|
||||||
[SmsForwarder-TCP]
|
|
||||||
type = tcp
|
|
||||||
local_ip = 127.0.0.1
|
|
||||||
local_port = 5000
|
|
||||||
#只要修改下面这一行(frps所在服务器必须暴露的公网端口)
|
|
||||||
remote_port = 5000
|
|
||||||
|
|
||||||
#[二选一即可]每台机器不可重复,通过 http://smsf.demo.com 访问
|
|
||||||
[SmsForwarder-HTTP]
|
|
||||||
type = http
|
|
||||||
local_ip = 127.0.0.1
|
|
||||||
local_port = 5000
|
|
||||||
#只要修改下面这一行(在frps端将域名反代到vhost_http_port)
|
|
||||||
custom_domains = smsf.demo.com
|
|
30
app/src/main/res/raw/frpc.toml
Normal file
30
app/src/main/res/raw/frpc.toml
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
#frps服务端公网IP
|
||||||
|
serverAddr = "88.88.88.88"
|
||||||
|
#frps服务端公网端口
|
||||||
|
serverPort = 8888
|
||||||
|
#连接服务端的超时时间(增大时间避免frpc在网络未就绪的情况下启动失败)
|
||||||
|
transport.dialServerTimeout = 60
|
||||||
|
#第一次登陆失败后是否退出
|
||||||
|
loginFailExit = false
|
||||||
|
#可选,建议启用
|
||||||
|
auth.method = "token"
|
||||||
|
auth.token = "88888888"
|
||||||
|
|
||||||
|
#[二选一即可]每台机器的 name 和 remotePort 不可重复,通过 http://88.88.88.88:5000 访问
|
||||||
|
[[proxies]]
|
||||||
|
#同一个frps下,多台设备的 name 不可重复
|
||||||
|
name = "SmsForwarder-TCP-001"
|
||||||
|
type = "tcp"
|
||||||
|
localIP = "127.0.0.1"
|
||||||
|
localPort = 5000
|
||||||
|
#只要修改下面这一行(frps所在服务器必须暴露且防火墙放行的公网端口,同一个frps下不可重复)
|
||||||
|
remotePort = 5000
|
||||||
|
|
||||||
|
#[二选一即可]每台机器的 name 和 customDomains 不可重复,通过 http://smsf.demo.com 访问
|
||||||
|
[[proxies]]
|
||||||
|
#同一个frps下,多台设备的 name 不可重复
|
||||||
|
name = "SmsForwarder-HTTP-001"
|
||||||
|
type = "http"
|
||||||
|
localPort = 5000
|
||||||
|
#只要修改下面这一行(在frps端将域名反代到vhost_http_port)
|
||||||
|
customDomains = ["smsf.demo.com"]
|
Loading…
x
Reference in New Issue
Block a user