opt

Author: yuwnloyblog

services/groupservice.go

@@ -8,7 +8,6 @@ import (
 	"github.com/juggleim/commons/ctxs"
 	"github.com/juggleim/commons/errs"
 	"github.com/juggleim/commons/imsdk"
-	"github.com/juggleim/commons/tools"
 	utils "github.com/juggleim/commons/tools"
 	apimodels "github.com/juggleim/jugglechat-server/apis/models"
 	"github.com/juggleim/jugglechat-server/storages"
@@ -512,7 +511,7 @@ func GroupConfirm(ctx context.Context, req *apimodels.GroupConfirm) errs.IMError
 	appkey := ctxs.GetAppKeyFromCtx(ctx)
 	//TODO check admin
 	storage := storages.NewGrpApplicationStorage()
-	id, err := tools.DecodeInt(req.ApplicationId)
+	id, err := utils.DecodeInt(req.ApplicationId)
 	if err != nil || id <= 0 {
 		return errs.IMErrorCode_APP_REQ_BODY_ILLEGAL
 	}
@@ -1008,7 +1007,7 @@ func QryGrpApplications(ctx context.Context, startTime int64, count int32, order
 	if err == nil {
 		grpInfo := GetGroupInfo(ctx, groupId)
 		for _, application := range applications {
-			idStr, _ := tools.EncodeInt(application.ID)
+			idStr, _ := utils.EncodeInt(application.ID)
 
 			ret.Items = append(ret.Items, &apimodels.GrpApplicationItem{
 				ApplicationId: idStr,

services/userservice.go

@@ -10,7 +10,6 @@ import (
 	"github.com/juggleim/commons/ctxs"
 	"github.com/juggleim/commons/errs"
 	"github.com/juggleim/commons/imsdk"
-	"github.com/juggleim/commons/tools"
 	utils "github.com/juggleim/commons/tools"
 	apimodels "github.com/juggleim/jugglechat-server/apis/models"
 	"github.com/juggleim/jugglechat-server/events"
@@ -387,15 +386,15 @@ func QryBlockUsers(ctx context.Context, limit int64, offset string) (errs.IMErro
 	}
 	var startId int64 = 0
 	if offset != "" {
-		intVal, err := tools.DecodeInt(offset)
+		intVal, err := utils.DecodeInt(offset)
 		if err == nil && intVal > 0 {
 			startId = intVal
 		}
 	}
 	users, err := storage.QryBlockUsers(appkey, userId, limit, startId)
 	if err == nil {
 		for _, user := range users {
-			o, err := tools.EncodeInt(user.ID)
+			o, err := utils.EncodeInt(user.ID)
 			if err == nil && o != "" {
 				ret.Offset = o
 			}