fix(docker): export cache file

hitokoto-osc · Sep 13, 2023 · 0d2bfc7 · 0d2bfc7
1 parent 681196c
commit 0d2bfc7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/cache/base.go b/cache/base.go
@@ -15,7 +15,7 @@ import (
 var Collection *zcache.Cache[string, []byte]
 
 // DataFilePath 是缓存记录文件地址
-var DataFilePath = filepath.Join(util.MustGetExecDir(), "cache.data")
+var DataFilePath = filepath.Join(util.MustGetExecDir(), "./data", "cache.data")
 
 // LoadFromDisk 用于初始化缓存驱动
 func LoadFromDisk() {

diff --git a/prestart/do.go b/prestart/do.go
@@ -1,21 +1,13 @@
 package prestart
 
 import (
-	"encoding/gob"
 	"github.com/hitokoto-osc/Moe/cache"
 	"github.com/hitokoto-osc/Moe/database"
 	"github.com/hitokoto-osc/Moe/task"
-	"github.com/hitokoto-osc/Moe/task/status"
-	"github.com/hitokoto-osc/Moe/task/status/types"
 )
 
 // Do is a func will be called at init, registering the drivers of program
 func Do() {
-	// TODO: 用更好的方法修复缓存读写问题
-	gob.Register([]database.APIRecord{})
-	gob.Register(types.GeneratedData{})
-	gob.Register(status.TDownServerList{})
-
 	cache.LoadFromDisk()
 	initConfigDriver()
 	database.InitDB()

diff --git a/prestart/init_config_driver.go b/prestart/init_config_driver.go
@@ -48,6 +48,7 @@ func initConfigDriver() {
 		viper.AddConfigPath(".")
 		viper.AddConfigPath("./conf")
 		viper.AddConfigPath("./config")
+		viper.AddConfigPath("./data") // docker purpose
 		viper.AddConfigPath("../conf")
 		viper.AddConfigPath("../config")
 		err := viper.ReadInConfig()