更新若干功能

synccrypto_test.go

@@ -67,17 +67,21 @@ func TestSyncConfigDefaults(t *testing.T) {
 	defer s.db.Close()
 	a := NewApp()
 	a.store = s
+	pkg := packagedSyncDefaults()
+	a.applyPackagedSyncConfig()
 	c := a.syncConfig()
-	if c.Host != defaultSyncHost || c.User != defaultSyncUser || c.Password != defaultSyncPassword || c.Database != defaultSyncDatabase || c.Port != 3306 {
-		t.Fatalf("defaults not applied: %+v", c)
-	}
-	// meta 存过任意自定义配置后，以 meta 为准，不再混入默认值。
-	if e := s.SetMeta("sync_host", "db.example.com"); e != nil {
-		t.Fatal(e)
+	if c.Host != pkg.Host || c.User != pkg.User || c.Password != pkg.Password || c.Database != pkg.Database || c.Port != pkg.Port {
+		t.Fatalf("want packaged defaults written to sqlite: %+v got %+v", pkg, c)
 	}
+	// 启动覆盖后，本地残留的旧地址会被打包配置盖掉。
+	_ = s.SetMeta("sync_host", "127.0.0.1")
+	_ = s.SetMeta("sync_user", "root")
+	_ = s.SetMeta("sync_password", "root")
+	_ = s.SetMeta("sync_database", "code_count")
+	a.applyPackagedSyncConfig()
 	c = a.syncConfig()
-	if c.Host != "db.example.com" || c.User != "" || c.Password != "" || c.Database != "" {
-		t.Fatalf("explicit meta should win: %+v", c)
+	if c.Host != pkg.Host || c.User != pkg.User {
+		t.Fatalf("packaged config must overwrite sqlite meta: %+v", c)
 	}
 }