feat: 优化代理准备并完善远端部署
- 增加严格代理、两分钟预取、白名单去重与分组状态展示\n- 增加远端注册令牌和安全地址校验\n- 增加 Docker Compose、Caddy 示例与控制中心部署文档
This commit is contained in:
@@ -80,6 +80,9 @@ func ApplySharedProxyConfig(cfg *types.Config, shared types.SharedProxyConfig) {
|
||||
if proxy.Enabled != nil {
|
||||
cfg.ProxyEnabled = *proxy.Enabled
|
||||
}
|
||||
if proxy.Required != nil {
|
||||
cfg.ProxyRequired = *proxy.Required
|
||||
}
|
||||
if proxy.API != nil {
|
||||
cfg.ProxyAPI = strings.TrimSpace(*proxy.API)
|
||||
}
|
||||
@@ -111,6 +114,9 @@ func ApplySharedProxyConfig(cfg *types.Config, shared types.SharedProxyConfig) {
|
||||
if remote.URL != nil {
|
||||
cfg.RemoteURL = strings.TrimSpace(*remote.URL)
|
||||
}
|
||||
if remote.EnrollmentToken != nil {
|
||||
cfg.RemoteEnrollmentToken = strings.TrimSpace(*remote.EnrollmentToken)
|
||||
}
|
||||
if remote.Token != nil {
|
||||
cfg.RemoteToken = strings.TrimSpace(*remote.Token)
|
||||
}
|
||||
@@ -131,6 +137,7 @@ func SaveSharedProxyConfig(path string, cfg types.Config) error {
|
||||
UpdatedAt: time.Now().Format(time.RFC3339),
|
||||
Proxy: types.SharedProxySettings{
|
||||
Enabled: boolPointer(cfg.ProxyEnabled),
|
||||
Required: boolPointer(cfg.ProxyRequired),
|
||||
API: stringPointer(cfg.ProxyAPI),
|
||||
AccountsPerProxy: intPointer(cfg.AccountsPerProxy),
|
||||
SparePercent: intPointer(cfg.ProxySparePercent),
|
||||
@@ -141,10 +148,11 @@ func SaveSharedProxyConfig(path string, cfg types.Config) error {
|
||||
WhitelistSignKey: stringPointer(cfg.ProxyWhitelistSignKey),
|
||||
},
|
||||
Remote: types.SharedRemoteSettings{
|
||||
Enabled: boolPointer(cfg.RemoteEnabled),
|
||||
URL: stringPointer(cfg.RemoteURL),
|
||||
Token: stringPointer(cfg.RemoteToken),
|
||||
MachineName: stringPointer(cfg.RemoteMachineName),
|
||||
Enabled: boolPointer(cfg.RemoteEnabled),
|
||||
URL: stringPointer(cfg.RemoteURL),
|
||||
EnrollmentToken: stringPointer(cfg.RemoteEnrollmentToken),
|
||||
Token: stringPointer(cfg.RemoteToken),
|
||||
MachineName: stringPointer(cfg.RemoteMachineName),
|
||||
},
|
||||
}
|
||||
data, err := json.MarshalIndent(shared, "", " ")
|
||||
@@ -188,6 +196,7 @@ func SaveSharedProxyConfig(path string, cfg types.Config) error {
|
||||
|
||||
func hasSharedProxySettings(proxy types.SharedProxySettings) bool {
|
||||
return proxy.Enabled != nil ||
|
||||
proxy.Required != nil ||
|
||||
proxy.API != nil ||
|
||||
proxy.AccountsPerProxy != nil ||
|
||||
proxy.SparePercent != nil ||
|
||||
|
||||
Reference in New Issue
Block a user