统一 frontend、backend、test、test-log 和 out 目录,更新构建、部署及测试入口;纳入配置管理兼容与首次安全引导修复;排除本机配置、密钥和测试产物。
This commit is contained in:
1 parent
28cd9d3406
commit
f60d3b0880
603 files changed
+2351
-660
No files matched your search
@@ -0,0 +1,65 @@
|
||||
package setup
|
||||
|
||||
import (
|
||||
"git.pcux.cn/xuans/Smail/config"
|
||||
"git.pcux.cn/xuans/Smail/signal"
|
||||
"git.pcux.cn/xuans/Smail/utils/errors"
|
||||
"sync"
|
||||
)
|
||||
|
||||
var finishMu sync.Mutex
|
||||
|
||||
// Finish 标记初始化完成
|
||||
func Finish() error {
|
||||
finishMu.Lock()
|
||||
defer finishMu.Unlock()
|
||||
cfg, err := config.ReadConfig()
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
portsChanged := applyServicePorts(cfg)
|
||||
if cfg.IsSetupReady() {
|
||||
if portsChanged {
|
||||
if err = config.WriteConfig(cfg); err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
}
|
||||
config.SetInitState(true)
|
||||
return nil
|
||||
}
|
||||
cfg.SetupState = config.SetupStateReady
|
||||
cfg.IsInit = true
|
||||
|
||||
err = config.WriteConfig(cfg)
|
||||
if err != nil {
|
||||
return errors.Wrap(err)
|
||||
}
|
||||
config.SetInitState(true)
|
||||
// 初始化完成
|
||||
select {
|
||||
case signal.InitChan <- true:
|
||||
default:
|
||||
// 初始化通知只需唤醒一次启动流程,避免重复完成请求阻塞响应。
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func applyServicePorts(cfg *config.Config) bool {
|
||||
if cfg == nil {
|
||||
return false
|
||||
}
|
||||
resolved := config.ResolveHTTPPortDefaults(config.HTTPConfig{
|
||||
Port: cfg.HttpPort,
|
||||
HTTPSPort: cfg.HttpsPort,
|
||||
HTTPSEnabled: cfg.HttpsEnabled != 2,
|
||||
TLSMode: cfg.TLSMode,
|
||||
}, cfg.GetSetupPort())
|
||||
changed := cfg.HttpPort != resolved.Port || cfg.HttpsPort != resolved.HTTPSPort
|
||||
cfg.HttpPort = resolved.Port
|
||||
cfg.HttpsPort = resolved.HTTPSPort
|
||||
if resolved.TLSMode == config.HTTPSTLSModeProxy && cfg.HttpsEnabled != 2 {
|
||||
cfg.HttpsEnabled = 2
|
||||
changed = true
|
||||
}
|
||||
return changed
|
||||
}
|
||||
Reference in new issue
Block a user