统一桌面服务环境配置加载

This commit is contained in:
xuans committed 2026-08-31 01:17:37 +08:00
1 parent ed7b9ef5ed
commit 01dfda888a
3 files changed
+59 -1

No files matched your search

+7 -1
View File
@@ -28,12 +28,18 @@ func Open(configPath, baseDir string) (*Runtime, error) {
baseDir = filepath.Dir(filepath.Dir(configPath))
}
cfg, err := config.Load(configPath)
cfg, err := config.LoadWithEnv(configPath)
if err != nil {
if !errors.Is(err, os.ErrNotExist) {
return nil, err
}
cfg = defaultConfig(baseDir)
if err := cfg.ApplyEnvironment(); err != nil {
return nil, err
}
if err := cfg.Validate(); err != nil {
return nil, err
}
}
ctx, cancel := context.WithCancel(context.Background())
+38
View File
@@ -66,3 +66,41 @@ func (r *recordingResponse) Write(body []byte) (int, error) {
r.body += string(body)
return len(body), nil
}
func TestOpenAppliesEnvironmentOverrides(t *testing.T) {
baseDir := t.TempDir()
configPath := filepath.Join(baseDir, "config", "scert.json")
cfg := defaultConfig(baseDir)
if err := cfg.Save(configPath); err != nil {
t.Fatalf("保存测试配置失败:%v", err)
}
t.Setenv("SCERT_WEB_ENABLED", "false")
runtime, err := Open(configPath, baseDir)
if err != nil {
t.Fatalf("应用环境覆盖后打开桌面核心服务失败:%v", err)
}
defer runtime.Close()
request, err := http.NewRequest(http.MethodGet, "http://127.0.0.1/", nil)
if err != nil {
t.Fatal(err)
}
request.RemoteAddr = "127.0.0.1:1234"
response := newRecordingResponse()
runtime.Handler().ServeHTTP(response, request)
if response.status != http.StatusNotFound {
t.Fatalf("SCERT_WEB_ENABLED=false 未关闭 Web 页面,状态码:%d", response.status)
}
}
func TestOpenRejectsInvalidEnvironmentOverride(t *testing.T) {
baseDir := t.TempDir()
configPath := filepath.Join(baseDir, "config", "scert.json")
if err := defaultConfig(baseDir).Save(configPath); err != nil {
t.Fatalf("保存测试配置失败:%v", err)
}
t.Setenv("SCERT_WEB_ENABLED", "无效")
if _, err := Open(configPath, baseDir); err == nil {
t.Fatal("无效环境覆盖不应打开桌面核心服务")
}
}