From a7d927f98b7aa81fc5f73212be6a48a023dabef8 Mon Sep 17 00:00:00 2001 From: godLei6 <603785348@qq.com> Date: Sat, 12 Oct 2024 14:35:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 4 ++-- go.sum | 8 ++++---- .../logic/devicemanage/deviceInfoMultiUpdateLogic.go | 2 +- .../logic/devicemanage/deviceInfoUpdateLogic.go | 2 +- .../logic/devicemanage/deviceTransferLogic.go | 2 +- shell/gittag.sh | 11 ++++------- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index e404ee982..c56724f77 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ go 1.21.4 //gitee.com/unitedrhino/share => ../share require ( - gitee.com/unitedrhino/core v0.2.3 - gitee.com/unitedrhino/share v0.2.4 + gitee.com/unitedrhino/core v0.2.4 + gitee.com/unitedrhino/share v0.2.5 gitee.com/unitedrhino/squirrel v1.20.5 github.com/dgraph-io/ristretto v0.1.0 github.com/dop251/goja v0.0.0-20230402114112-623f9dda9079 diff --git a/go.sum b/go.sum index f5a3066aa..661d3b490 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,11 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -gitee.com/unitedrhino/core v0.2.3 h1:e6m8oD24nDB4GNk+Bf8UUKVYB0cFyStv/OJtywTunk0= -gitee.com/unitedrhino/core v0.2.3/go.mod h1:C5UnqkWHzzsgBZQsr0GBxaA1f7J2H9yznuPwRDNhUVo= +gitee.com/unitedrhino/core v0.2.4 h1:nlwZfsOciFCvRlAILfnfvAQWqFM2z3jQADZQM1MAP3c= +gitee.com/unitedrhino/core v0.2.4/go.mod h1:C5UnqkWHzzsgBZQsr0GBxaA1f7J2H9yznuPwRDNhUVo= gitee.com/unitedrhino/driver-go/v3 v3.30.1 h1:hVBG8jRPaPL+fS/tAvsG60Jt7QvLW50OQuD0Ms+6iao= gitee.com/unitedrhino/driver-go/v3 v3.30.1/go.mod h1:Kdr+5rPmtqqxpliQ0NJrg24F9jCHcwywyWiDaVA5eEQ= -gitee.com/unitedrhino/share v0.2.4 h1:hkEaSCnnCTddy+Gtb6J4Eu0hFESz3vd5c1KqicvPc80= -gitee.com/unitedrhino/share v0.2.4/go.mod h1:Dl3q5/yyaPFigYpf/e0YEiLypkM8nkKR2m/C06IOvZs= +gitee.com/unitedrhino/share v0.2.5 h1:0qXSvCxBGmWBxOqalbczguwWCfuHC5VkFkrPDvx4B30= +gitee.com/unitedrhino/share v0.2.5/go.mod h1:Dl3q5/yyaPFigYpf/e0YEiLypkM8nkKR2m/C06IOvZs= gitee.com/unitedrhino/squirrel v1.20.5 h1:Mi11U2zk3VEPUMh2+TxThcjRkFA3rtBwVK6qL8dnTmU= gitee.com/unitedrhino/squirrel v1.20.5/go.mod h1:NVTC7zI2TMArBB7L0eOp67c0TVBOJ3TKpY+Qbs8R+TU= github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= diff --git a/service/dmsvr/internal/logic/devicemanage/deviceInfoMultiUpdateLogic.go b/service/dmsvr/internal/logic/devicemanage/deviceInfoMultiUpdateLogic.go index a9cad2e37..f7bb4c630 100644 --- a/service/dmsvr/internal/logic/devicemanage/deviceInfoMultiUpdateLogic.go +++ b/service/dmsvr/internal/logic/devicemanage/deviceInfoMultiUpdateLogic.go @@ -89,7 +89,7 @@ func (l *DeviceInfoMultiUpdateLogic) DeviceInfoMultiUpdate(in *dm.DeviceInfoMult if len(changeAreaIDPaths) > 0 { ctxs.GoNewCtx(l.ctx, func(ctx2 context.Context) { logic.FillAreaDeviceCount(ctx2, l.svcCtx, utils.SetToSlice(changeAreaIDPaths)...) - logic.FillProjectDeviceCount(l.ctx, l.svcCtx, utils.SetToSlice(projectIDSet)...) + logic.FillProjectDeviceCount(ctx2, l.svcCtx, utils.SetToSlice(projectIDSet)...) }) } return &dm.Empty{}, err diff --git a/service/dmsvr/internal/logic/devicemanage/deviceInfoUpdateLogic.go b/service/dmsvr/internal/logic/devicemanage/deviceInfoUpdateLogic.go index 292782ff2..d909a79a3 100644 --- a/service/dmsvr/internal/logic/devicemanage/deviceInfoUpdateLogic.go +++ b/service/dmsvr/internal/logic/devicemanage/deviceInfoUpdateLogic.go @@ -59,7 +59,7 @@ func (l *DeviceInfoUpdateLogic) SetDevicePoByDto(old *relationDB.DmDeviceInfo, d if data.ProjectID != 0 && data.ProjectID != int64(old.ProjectID) { ctxs.GoNewCtx(l.ctx, func(ctx2 context.Context) { time.Sleep(2 * time.Second) - logic.FillProjectDeviceCount(l.ctx, l.svcCtx, data.ProjectID, int64(old.ProjectID)) + logic.FillProjectDeviceCount(ctx2, l.svcCtx, data.ProjectID, int64(old.ProjectID)) }) old.ProjectID = stores.ProjectID(data.ProjectID) } diff --git a/service/dmsvr/internal/logic/devicemanage/deviceTransferLogic.go b/service/dmsvr/internal/logic/devicemanage/deviceTransferLogic.go index 0a572c5fe..0ad5092ba 100644 --- a/service/dmsvr/internal/logic/devicemanage/deviceTransferLogic.go +++ b/service/dmsvr/internal/logic/devicemanage/deviceTransferLogic.go @@ -195,7 +195,7 @@ func (l *DeviceTransferLogic) DeviceTransfer(in *dm.DeviceTransferReq) (*dm.Empt if len(changeAreaIDPaths) > 0 { ctxs.GoNewCtx(l.ctx, func(ctx2 context.Context) { logic.FillAreaDeviceCount(ctx2, l.svcCtx, utils.SetToSlice(changeAreaIDPaths)...) - logic.FillProjectDeviceCount(l.ctx, l.svcCtx, utils.SetToSlice(projectIDSet)...) + logic.FillProjectDeviceCount(ctx2, l.svcCtx, utils.SetToSlice(projectIDSet)...) }) } return &dm.Empty{}, nil diff --git a/shell/gittag.sh b/shell/gittag.sh index 93faf63f5..a5513e619 100644 --- a/shell/gittag.sh +++ b/shell/gittag.sh @@ -9,11 +9,8 @@ fi # 获取第一个参数 tag="$1" git tag $tag +git push -f gitee dev:master +git push -f github dev:master git push origin $tag -#git push github $tag -git push gitee $tag -git checkout master -git pull origin master -git push gitee master -#git push github master -git checkout dev +git push github $tag +git push gitee $tag \ No newline at end of file