refactor: 独立 cache

issue9 · Nov 23, 2023 · c3d1298 · c3d1298
1 parent 886e66c
commit c3d1298
Show file tree

Hide file tree

Showing 29 changed files with 70 additions and 1,080 deletions.
diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
diff --git a/app/cache.go b/app/cache.go
@@ -6,12 +6,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/issue9/cache"
 	"github.com/issue9/scheduled"
 
 	"github.com/issue9/web"
-	"github.com/issue9/web/cache"
-	"github.com/issue9/web/cache/caches"
 	"github.com/issue9/web/locales"
+	"github.com/issue9/web/server"
 )
 
 var cacheFactory = map[string]CacheBuilder{}
@@ -91,16 +91,16 @@ func init() {
 			return nil, nil, err
 		}
 
-		drv, job := caches.NewMemory()
+		drv, job := server.NewMemory()
 		return drv, &Job{Ticker: d, Job: job}, nil
 	}, "", "memory")
 
 	RegisterCache(func(dsn string) (cache.Driver, *Job, error) {
-		return caches.NewMemcache(strings.Split(dsn, ";")...), nil, nil
+		return server.NewMemcache(strings.Split(dsn, ";")...), nil, nil
 	}, "memcached", "memcache")
 
 	RegisterCache(func(dsn string) (cache.Driver, *Job, error) {
-		drv, err := caches.NewRedisFromURL(dsn)
+		drv, err := server.NewRedisFromURL(dsn)
 		if err != nil {
 			return nil, nil, err
 		}

diff --git a/app/config.go b/app/config.go
@@ -7,11 +7,11 @@ import (
 	"runtime/debug"
 	"time"
 
+	"github.com/issue9/cache"
 	"github.com/issue9/config"
 	"golang.org/x/text/language"
 
 	"github.com/issue9/web"
-	"github.com/issue9/web/cache"
 	"github.com/issue9/web/locales"
 	"github.com/issue9/web/logs"
 	"github.com/issue9/web/server"

diff --git a/cache/cache.go b/cache/cache.go
diff --git a/cache/caches/README.md b/cache/caches/README.md
diff --git a/cache/caches/caches.go b/cache/caches/caches.go