From 4b15160f8821d9b4c223a817c2632ae1425be533 Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期五, 10 十一月 2023 10:51:54 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS --- go.sum | 2 ++ utils/image/image.go | 8 +++++++- go.mod | 2 +- models/material.go | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a4fbfbc..b0eb8b4 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ require ( basic.com/aps/nsqclient.git v0.0.0-20230517072415-37491f4a5d25 - basic.com/fileserver/WeedFSClient.git v0.0.0-20210224075854-9e78086ab4bf + basic.com/fileserver/WeedFSClient.git v0.0.0-20231110020027-b2e7576d21e7 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.9.0 github.com/golang-jwt/jwt/v4 v4.5.0 diff --git a/go.sum b/go.sum index 8e7f225..ba1f922 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ basic.com/aps/nsqclient.git v0.0.0-20230517072415-37491f4a5d25/go.mod h1:1RnwEtePLR7ATQorQTxdgvs1o7uuUy1Vw8W7GYtVnoY= basic.com/fileserver/WeedFSClient.git v0.0.0-20210224075854-9e78086ab4bf h1:HGhtGSBibh1OV4oUe1SWw8DLfL4hXGGBFNW3dpcr+70= basic.com/fileserver/WeedFSClient.git v0.0.0-20210224075854-9e78086ab4bf/go.mod h1:oiXPn3wwwOi/Sbm6cDWpNWofoG5iV2Nb1V/DxLEAqYY= +basic.com/fileserver/WeedFSClient.git v0.0.0-20231110020027-b2e7576d21e7 h1:oiqEv6At6JhABnPtG6btvCf4Aq1MJflB9bL5arazkE0= +basic.com/fileserver/WeedFSClient.git v0.0.0-20231110020027-b2e7576d21e7/go.mod h1:oiXPn3wwwOi/Sbm6cDWpNWofoG5iV2Nb1V/DxLEAqYY= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= diff --git a/models/material.go b/models/material.go index 5084258..69c33d0 100644 --- a/models/material.go +++ b/models/material.go @@ -341,7 +341,7 @@ db = slf.build() ) - if err := db.Count(&total).Error; err != nil { + if err := db.Model(&Material{}).Count(&total).Error; err != nil { return records, total, fmt.Errorf("find count err: %v", err) } if slf.PageNum*slf.PageSize > 0 { diff --git a/utils/image/image.go b/utils/image/image.go index 237bae9..7491a7f 100644 --- a/utils/image/image.go +++ b/utils/image/image.go @@ -44,7 +44,13 @@ b = sz.Y } - thumbnailImg = canvas.(*image.YCbCr).SubImage(image.Rect(l, t, r, b)).(*image.YCbCr) + if ycbcr, ok := canvas.(*image.YCbCr); ok { + thumbnailImg = ycbcr.SubImage(image.Rect(l, t, r, b)).(*image.YCbCr) + } else if rgba, ok := canvas.(*image.RGBA); ok { + thumbnailImg = rgba.SubImage(image.Rect(l, t, r, b)).(*image.RGBA) + } else { + return nil, errors.New("鏈瘑鍒殑鍥剧墖鑹插僵绫诲瀷") + } } else { w := width h := height -- Gitblit v1.8.0