From 1cff4b63cdaafac0f3c43354eac790afa32e609b Mon Sep 17 00:00:00 2001 From: RockYang Date: Tue, 2 Apr 2024 17:24:38 +0800 Subject: [PATCH] feat: image preview for stable-diffusion task is ready --- CHANGELOG.md | 1 + api/go.mod | 2 + api/go.sum | 16 +++++ api/handler/sd_handler.go | 12 ++-- api/main.go | 1 + api/service/sd/pool.go | 4 +- api/service/sd/service.go | 11 +++- api/store/leveldb.go | 110 +++++++++++++++++++++++++++++++ api/test/test.go | 9 ++- deploy/docker-compose.yaml | 1 + web/src/assets/css/image-mj.css | 5 ++ web/src/assets/css/image-mj.styl | 6 ++ web/src/views/ImageSd.vue | 6 +- 13 files changed, 171 insertions(+), 13 deletions(-) create mode 100644 api/store/leveldb.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d9110a0..06851171 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * 功能新增：支持前端菜单可以配置 * 功能优化：在登录和注册界面标题显示软件版本号 * 功能优化：MJ 绘画支持 --sref 和 --cref 图片一致性参数 +* 功能优化：使用 leveldb 解决 SD 绘图进度图片预览问题 * 功能优化：手机端支持免登录预览功能 * Bug修复：解决因为图片上传使用相对路径而导致融图失败的问题。 * 功能新增：手机端支持 Stable-Diffusion 绘画 diff --git a/api/go.mod b/api/go.mod index ff63a4a6..fc131837 100644 --- a/api/go.mod +++ b/api/go.mod @@ -28,10 +28,12 @@ require github.com/xxl-job/xxl-job-executor-go v1.2.0 require ( github.com/mojocn/base64Captcha v1.3.1 github.com/shopspring/decimal v1.3.1 + github.com/syndtr/goleveldb v1.0.0 ) require ( github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect + github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect golang.org/x/image v0.0.0-20190501045829-6d32002ffd75 // indirect ) diff --git a/api/go.sum b/api/go.sum index b94c92a0..e5c987ce 100644 --- a/api/go.sum +++ b/api/go.sum @@ -27,6 +27,7 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/eatmoreapple/openwechat v1.2.1 h1:ez4oqF/Y2NSEX/DbPV8lvj7JlfkYqvieeo4awx5lzfU= github.com/eatmoreapple/openwechat v1.2.1/go.mod h1:61HOzTyvLobGdgWhL68jfGNwTJEv0mhQ1miCXQrvWU8= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= @@ -67,8 +68,11 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF0 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -83,6 +87,7 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/imroc/req/v3 v3.37.2 h1:vEemuA0cq9zJ6lhe+mSRhsZm951bT0CdiSH47+KTn6I= github.com/imroc/req/v3 v3.37.2/go.mod h1:DECzjVIrj6jcUr5n6e+z0ygmCO93rx4Jy0RjOEe1YCI= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= @@ -133,9 +138,12 @@ github.com/mojocn/base64Captcha v1.3.1/go.mod h1:wAQCKEc5bDujxKRmbT6/vTnTt5CjStQ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs= github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b h1:FfH+VrHHk6Lxt9HdVS0PXzSXFyS2NbZKXv33FYPol0A= github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mod h1:AC62GU6hc0BrNm+9RK9VSiwa/EUe1bkIeFORAMcHvJU= @@ -193,6 +201,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= +github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= @@ -235,6 +245,7 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -243,11 +254,13 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -294,12 +307,15 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/api/handler/sd_handler.go b/api/handler/sd_handler.go index 09b35d49..ca1e9650 100644 --- a/api/handler/sd_handler.go +++ b/api/handler/sd_handler.go @@ -6,11 +6,11 @@ import ( "chatplus/service" "chatplus/service/oss" "chatplus/service/sd" + "chatplus/store" "chatplus/store/model" "chatplus/store/vo" "chatplus/utils" "chatplus/utils/resp" - "encoding/base64" "fmt" "net/http" "time" @@ -28,13 +28,15 @@ type SdJobHandler struct { pool *sd.ServicePool uploader *oss.UploaderManager snowflake *service.Snowflake + leveldb *store.LevelDB } -func NewSdJobHandler(app *core.AppServer, db *gorm.DB, pool *sd.ServicePool, manager *oss.UploaderManager, snowflake *service.Snowflake) *SdJobHandler { +func NewSdJobHandler(app *core.AppServer, db *gorm.DB, pool *sd.ServicePool, manager *oss.UploaderManager, snowflake *service.Snowflake, levelDB *store.LevelDB) *SdJobHandler { return &SdJobHandler{ pool: pool, uploader: manager, snowflake: snowflake, + leveldb: levelDB, BaseHandler: BaseHandler{ App: app, DB: db, @@ -257,10 +259,10 @@ func (h *SdJobHandler) getData(finish bool, userId uint, page int, pageSize int, } if item.Progress < 100 { - // 正在运行中任务使用代理访问图片 - image, err := utils.DownloadImage(item.ImgURL, "") + // 从 leveldb 中获取图片预览数据 + imageData, err := h.leveldb.Get(item.TaskId) if err == nil { - job.ImgURL = "data:image/png;base64," + base64.StdEncoding.EncodeToString(image) + job.ImgURL = "data:image/png;base64," + string(imageData) } } jobs = append(jobs, job) diff --git a/api/main.go b/api/main.go index 8b3c1ed1..24efc68e 100644 --- a/api/main.go +++ b/api/main.go @@ -96,6 +96,7 @@ func main() { fx.Provide(store.NewGormConfig), fx.Provide(store.NewMysql), fx.Provide(store.NewRedisClient), + fx.Provide(store.NewLevelDB), fx.Provide(func() embed.FS { return xdbFS diff --git a/api/service/sd/pool.go b/api/service/sd/pool.go index 2661edd1..3033b548 100644 --- a/api/service/sd/pool.go +++ b/api/service/sd/pool.go @@ -20,7 +20,7 @@ type ServicePool struct { Clients *types.LMap[uint, *types.WsClient] // UserId => Client } -func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderManager, appConfig *types.AppConfig) *ServicePool { +func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderManager, appConfig *types.AppConfig, levelDB *store.LevelDB) *ServicePool { services := make([]*Service, 0) taskQueue := store.NewRedisQueue("StableDiffusion_Task_Queue", redisCli) notifyQueue := store.NewRedisQueue("StableDiffusion_Queue", redisCli) @@ -32,7 +32,7 @@ func NewServicePool(db *gorm.DB, redisCli *redis.Client, manager *oss.UploaderMa // create sd service name := fmt.Sprintf("StableDifffusion Service-%s", config.Model) - service := NewService(name, config, taskQueue, notifyQueue, db, manager) + service := NewService(name, config, taskQueue, notifyQueue, db, manager, levelDB) // run sd service go func() { service.Run() diff --git a/api/service/sd/service.go b/api/service/sd/service.go index f87067a3..b2baccca 100644 --- a/api/service/sd/service.go +++ b/api/service/sd/service.go @@ -24,9 +24,10 @@ type Service struct { db *gorm.DB uploadManager *oss.UploaderManager name string // service name + leveldb *store.LevelDB } -func NewService(name string, config types.StableDiffusionConfig, taskQueue *store.RedisQueue, notifyQueue *store.RedisQueue, db *gorm.DB, manager *oss.UploaderManager) *Service { +func NewService(name string, config types.StableDiffusionConfig, taskQueue *store.RedisQueue, notifyQueue *store.RedisQueue, db *gorm.DB, manager *oss.UploaderManager, levelDB *store.LevelDB) *Service { config.ApiURL = strings.TrimRight(config.ApiURL, "/") return &Service{ name: name, @@ -35,6 +36,7 @@ func NewService(name string, config types.StableDiffusionConfig, taskQueue *stor taskQueue: taskQueue, notifyQueue: notifyQueue, db: db, + leveldb: levelDB, uploadManager: manager, } } @@ -167,15 +169,20 @@ func (s *Service) Txt2Img(task types.SdTask) error { } s.db.Model(&model.SdJob{Id: uint(task.Id)}).UpdateColumn("progress", 100) s.notifyQueue.RPush(task.UserId) + // 从 leveldb 中删除预览图片数据 + _ = s.leveldb.Delete(task.Params.TaskId) return nil default: err, resp := s.checkTaskProgress() // 更新任务进度 if err == nil && resp.Progress > 0 { - logger.Debugf("Check task progress: %+v", resp.Progress) s.db.Model(&model.SdJob{Id: uint(task.Id)}).UpdateColumn("progress", int(resp.Progress*100)) // 发送更新状态信号 s.notifyQueue.RPush(task.UserId) + // 保存预览图片数据 + if resp.CurrentImage != "" { + _ = s.leveldb.Put(task.Params.TaskId, resp.CurrentImage) + } } time.Sleep(time.Second) } diff --git a/api/store/leveldb.go b/api/store/leveldb.go new file mode 100644 index 00000000..c74d4090 --- /dev/null +++ b/api/store/leveldb.go @@ -0,0 +1,110 @@ +package store + +import ( + "encoding/json" + + "github.com/syndtr/goleveldb/leveldb" + "github.com/syndtr/goleveldb/leveldb/util" +) + +type LevelDB struct { + driver *leveldb.DB +} + +func NewLevelDB() (*LevelDB, error) { + db, err := leveldb.OpenFile("data", nil) + if err != nil { + return nil, err + } + return &LevelDB{ + driver: db, + }, nil +} + +func (db *LevelDB) Put(key string, value interface{}) error { + var byteData []byte + if v, ok := value.(string); ok { + byteData = []byte(v) + } else { + b, err := json.Marshal(value) + if err != nil { + return err + } + byteData = b + } + return db.driver.Put([]byte(key), byteData, nil) +} + +func (db *LevelDB) Get(key string) ([]byte, error) { + bytes, err := db.driver.Get([]byte(key), nil) + if err != nil { + return nil, err + } + + return bytes, nil +} + +func (db *LevelDB) Search(prefix string) []string { + var items = make([]string, 0) + iter := db.driver.NewIterator(util.BytesPrefix([]byte(prefix)), nil) + defer iter.Release() + + for iter.Next() { + items = append(items, string(iter.Value())) + } + return items +} + +type PageVo struct { + Items []string + Page int + PageSize int + Total int + TotalPage int +} + +func (db *LevelDB) SearchPage(prefix string, page int, pageSize int) *PageVo { + var items = make([]string, 0) + iter := db.driver.NewIterator(util.BytesPrefix([]byte(prefix)), nil) + defer iter.Release() + + res := &PageVo{Page: page, PageSize: pageSize} + // 计算数据总数和总页数 + total := 0 + for iter.Next() { + total++ + } + res.TotalPage = (total + pageSize - 1) / pageSize + res.Total = total + + // 计算目标页码的起始和结束位置 + start := (page - 1) * pageSize + if start > total { + return nil + } + end := start + pageSize + if end > total { + end = total + } + + // 跳转到目标页码的起始位置 + count := 0 + for iter.Next() { + if count >= start { + items = append(items, string(iter.Value())) + } + count++ + } + iter.Release() + res.Items = items + return res +} + +func (db *LevelDB) Delete(key string) error { + return db.driver.Delete([]byte(key), nil) +} + +// Close release resources +func (db *LevelDB) Close() error { + return db.driver.Close() +} diff --git a/api/test/test.go b/api/test/test.go index 79058077..cc826def 100644 --- a/api/test/test.go +++ b/api/test/test.go @@ -1,5 +1,12 @@ package main -func main() { +import ( + "fmt" + "reflect" +) +func main() { + text := 1 + bytes := reflect.ValueOf(text).Bytes() + fmt.Println(bytes) } diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml index 7c74477d..2a2c2c63 100644 --- a/deploy/docker-compose.yaml +++ b/deploy/docker-compose.yaml @@ -72,6 +72,7 @@ services: - ./conf/config.toml:/var/www/app/config.toml - ./logs/app:/var/www/app/logs - ./static:/var/www/app/static + - ./data/leveldb:/var/www/app/data # 前端应用 chatgpt-plus-web: diff --git a/web/src/assets/css/image-mj.css b/web/src/assets/css/image-mj.css index 9d362952..f595bc43 100644 --- a/web/src/assets/css/image-mj.css +++ b/web/src/assets/css/image-mj.css @@ -182,6 +182,11 @@ .page-mj .inner .el-form .el-slider { width: 180px; } +.page-mj .inner .el-form .uploader-icon { + font-size: 24px; + position: relative; + top: 3px; +} .page-mj .inner .task-list-box { width: 100%; padding: 10px; diff --git a/web/src/assets/css/image-mj.styl b/web/src/assets/css/image-mj.styl index 4d16d2f5..d42935c0 100644 --- a/web/src/assets/css/image-mj.styl +++ b/web/src/assets/css/image-mj.styl @@ -225,6 +225,12 @@ .el-input, .el-slider { width 180px } + + .uploader-icon { + font-size 24px + position relative + top 3px + } } @import "task-list.styl" diff --git a/web/src/views/ImageSd.vue b/web/src/views/ImageSd.vue index 75cdc24c..7443a50f 100644 --- a/web/src/views/ImageSd.vue +++ b/web/src/views/ImageSd.vue @@ -559,7 +559,7 @@ const connect = () => { }); } - const _socket = new WebSocket(host + `/api/sd/client?user_id=${userId.value}`); + const _socket = new WebSocket(host + `/api/sd/client`); _socket.addEventListener('open', () => { socket.value = _socket; @@ -621,9 +621,9 @@ const initData = () => { }); } -const fetchRunningJobs = (userId) => { +const fetchRunningJobs = () => { // 获取运行中的任务 - httpGet(`/api/sd/jobs?status=0&user_id=${userId}`).then(res => { + httpGet(`/api/sd/jobs?status=0`).then(res => { const jobs = res.data const _jobs = [] for (let i = 0; i < jobs.length; i++) {