Merge branch 'dev' of http://172.16.100.91:3000/fiee/fonchain-fiee into dev

pkg/middleware/check_login.go

@@ -1,7 +1,6 @@
 package middleware
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/common/logger"
 	"errors"
 	"fmt"
 	"fonchain-fiee/api/account"
@@ -14,8 +13,10 @@ import (
 	"fonchain-fiee/pkg/model/login"
 	"fonchain-fiee/pkg/service"
 	"fonchain-fiee/pkg/utils/secret"
-	"github.com/gin-gonic/gin"
 	"time"
+
+	"dubbo.apache.org/dubbo-go/v3/common/logger"
+	"github.com/gin-gonic/gin"
 )
 
 // CheckLogin 检测登陆
@@ -150,7 +151,7 @@ func CheckWebLogin(provider *account.AccountClientImpl) gin.HandlerFunc {
 		loginInfo := login.Info{
 			Domain: info.Domain,
 			ID:     info.ID,
-			//Account:        info.Account,
+			Name:   info.NickName,
 			//NickName:       info.NickName,
 			//PositionUsers:  qres.PositionUsers,
 			//Extend:         infoRes.Info.Extend,

pkg/service/governance/governance.go

@@ -1,8 +1,6 @@
 package governance
 
 import (
-	"encoding/json"
-	"fmt"
 	"strconv"
 
 	"github.com/gin-gonic/gin"
@@ -79,8 +77,6 @@ func Edit(ctx *gin.Context) {
 		return
 	}
 	user := login.GetUserInfoFromC(ctx)
-	b, _ := json.Marshal(user)
-	fmt.Println("用户信息", string(b))
 	req.Operator = user.Name
 	req.OperatorId = int32(user.ID)
 	resp, err := service.GovernanceProvider.Edit(ctx, &req)