切换公司修改

@@ -44,6 +44,7 @@ type SwitchCompanyRequest struct {
 	CompanyId int64 `json:"companyId" valid:"Required"`
 	CompanyId int64 `json:"companyId" valid:"Required"`
 }
 }
 type SwitchCompanyResponse struct {
 type SwitchCompanyResponse struct {
+	AuthCode string `json:"authCode"`
 }
 }
 
 
 /*用户信息 UserInfo */
 /*用户信息 UserInfo */

@@ -3,6 +3,7 @@ package user
 import (
 import (
 	"fmt"
 	"fmt"
 	"github.com/astaxie/beego/orm"
 	"github.com/astaxie/beego/orm"
+	"gitlab.fjmaimaimai.com/mmm-go/gocomm/identity/uid"
 	"gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
 	"gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
 	"opp/internal/utils"
 	"opp/internal/utils"
 	"opp/models"
 	"opp/models"
@@ -10,6 +11,7 @@ import (
 	"opp/services/agg"
 	"opp/services/agg"
 	"opp/services/auth"
 	"opp/services/auth"
 	"strings"
 	"strings"
+	"time"
 )
 )
 
 
 //验证smscode
 //验证smscode
@@ -226,7 +228,7 @@ func UserCompanys(header *protocol.RequestHeader, request *protocol.UserCompanys
 }
 }
 
 
 //切换公司
 //切换公司
-func SwitchCompany(header *protocol.RequestHeader, request *protocol.SwitchCompanyRequest) (rsp *protocol.UserInfoResponse, err error) {
+func SwitchCompany(header *protocol.RequestHeader, request *protocol.SwitchCompanyRequest) (rsp *protocol.SwitchCompanyResponse, err error) {
 	var (
 	var (
 		userCompany *models.UserCompany
 		userCompany *models.UserCompany
 		auth        *models.UserAuth
 		auth        *models.UserAuth
@@ -244,17 +246,19 @@ func SwitchCompany(header *protocol.RequestHeader, request *protocol.SwitchCompa
 		log.Error(fmt.Sprintf("uid:%v 当前公司已经是:%v", header.Uid, request.CompanyId))
 		log.Error(fmt.Sprintf("uid:%v 当前公司已经是:%v", header.Uid, request.CompanyId))
 		//return
 		//return
 	} else {
 	} else {
-		if err = utils.UpdateTableByMap(&models.UserAuth{Id: auth.Id}, map[string]interface{}{"CurrentCompanyId": userCompany.CompanyId, "CurrentUserCompanyId": userCompany.Id}); err != nil {
+		auth.AuthCode = uid.NewV1().StringNoDash()
+		auth.AuthCodeExp = time.Now().Add(time.Second * protocol.TokenExpire)
+		if err = utils.UpdateTableByMap(&models.UserAuth{Id: auth.Id}, map[string]interface{}{
+			"CurrentCompanyId": userCompany.CompanyId, "CurrentUserCompanyId": userCompany.Id, "AuthCode": auth.AuthCode, "AuthCodeExp": auth.AuthCodeExp},
+		); err != nil {
 			log.Error(err)
 			log.Error(err)
 			return
 			return
 		}
 		}
 		header.CompanyId = userCompany.CompanyId
 		header.CompanyId = userCompany.CompanyId
 		header.UserId = userCompany.Id
 		header.UserId = userCompany.Id
 	}
 	}
-	if rsp, err = UserInfo(header, &protocol.UserInfoRequest{}); err != nil {
-		log.Error(err)
-		return
-	}
+	rsp = &protocol.SwitchCompanyResponse{}
+	rsp.AuthCode = auth.AuthCode
 	return
 	return
 }
 }