浏览代码

三期用户表增加账户状态

kobe6258 6 月之前
父节点
当前提交
953a193ac7
共有 8 个文件被更改,包括 241 次插入104 次删除
  1. 5 0
      controllers/merchant.go
  2. 44 37
      controllers/user_login.go
  3. 二进制
      eta_mini_crm_ht
  4. 0 3
      go.mod
  5. 35 33
      models/template_users.go
  6. 136 25
      rpc/sso/sso.pb.go
  7. 17 4
      rpc/sso/sso_rpc.go
  8. 4 2
      services/sso_service.go

+ 5 - 0
controllers/merchant.go

@@ -0,0 +1,5 @@
+package controllers
+
+type MerchantController struct {
+	BaseAuthController
+}

+ 44 - 37
controllers/user_login.go

@@ -21,48 +21,55 @@ func ssoLogin(req request.UserLoginReq, br *models.BaseResponse) {
 		br.Msg = "code不能为空"
 		return
 	}
-	_, err := services.SSOLogin(req.Code)
-	////sysUser, err := models.GetSysUserBySysUserName(req.UserName)
+	ssoResp, err := services.SSOLogin(req.Code)
+	utils.FileLog.Info(fmt.Sprintf("sso 登录请求结果:%s", ssoResp))
+	sysUser, err := models.GetSysUserBySysUserName(ssoResp.UserName)
 	if err != nil {
 		br.ErrMsg = err.Error()
-		br.Msg = "sso登录失败"
+		br.Msg = "sso登录失败,获取用户信息失败"
+		return
+	}
+	sysRole, err := models.GetSysRoleById(sysUser.SysRoleId)
+	if err != nil {
+		br.Msg = "登录失败"
+		br.ErrMsg = "查询角色失败, Err:" + err.Error()
+		return
+	}
+	account := utils.MD5(sysUser.SysUserName)
+	token := utils.GenToken(account)
+	sysSession := new(models.SysSession)
+	sysSession.UserName = sysUser.SysUserName
+	sysSession.SysUserId = sysUser.SysUserId
+	sysSession.ExpiredTime = time.Now().AddDate(0, 0, 60)
+	sysSession.CreatedTime = time.Now()
+	sysSession.LastUpdatedTime = time.Now()
+	sysSession.AccessToken = token
+	err = sysSession.AddSysSession()
+	if err != nil {
+		br.Msg = "登录失败"
+		br.ErrMsg = "新增session信息失败, Err:" + err.Error()
 		return
 	}
-	//sysRole, err := models.GetSysRoleById(sysUser.SysRoleId)
-	//if err != nil {
-	//	br.Msg = "登录失败"
-	//	br.ErrMsg = "查询角色失败, Err:" + err.Error()
-	//	return
-	//}
-
-	//account := utils.MD5(sysUser.SysUserName)
-	//token := utils.GenToken(account)
-	//sysSession := new(models.SysSession)
-	//sysSession.UserName = sysUser.SysUserName
-	//sysSession.SysUserId = sysUser.SysUserId
-	//sysSession.ExpiredTime = time.Now().AddDate(0, 0, 60)
-	//sysSession.CreatedTime = time.Now()
-	//sysSession.LastUpdatedTime = time.Now()
-	//sysSession.AccessToken = token
-	//err = sysSession.AddSysSession()
-	//if err != nil {
-	//	br.Msg = "登录失败"
-	//	br.ErrMsg = "新增session信息失败, Err:" + err.Error()
-	//	return
-	//}
 	resp := new(response.LoginResp)
-	// 获取不可信的登录态,并将该登录态重置掉,不允许多次登录
-	//	noTrustLoginKey := fmt.Sprint(utils.CACHE_ACCESS_TOKEN_LOGIN_NO_TRUST, sysUser.SysUserId)
-	//noTrustLoginId, _ := utils.Rc.RedisString(noTrustLoginKey)
-	//fmt.Println("noTrustLoginId:", noTrustLoginId)
-	//if noTrustLoginId != `` { // 如果存在不可信设备,那么将其下架
-	//	oldNoTrustLoginKey := fmt.Sprint(utils.CACHE_ACCESS_TOKEN_LOGIN, noTrustLoginId)
-	//	utils.Rc.Put(oldNoTrustLoginKey, "0", time.Hour*24)
-	//}
-	//// 设置redis缓存,记录用户登录态
-	//loginKey := fmt.Sprint(utils.CACHE_ACCESS_TOKEN_LOGIN, sysSession.SysSessionId)
-	//utils.Rc.Put(loginKey, "1", time.Hour*24)
-	//utils.Rc.Put(noTrustLoginKey, sysSession.SysSessionId, time.Hour*24*60)
+	resp.Authorization = "authorization=" + token
+	resp.SysUserName = sysUser.SysUserName
+	resp.SysRealName = sysUser.SysRealName
+	resp.SysUserId = sysUser.SysUserId
+	resp.RoleName = sysRole.SysRoleName
+	resp.RoleId = sysUser.SysRoleId
+	//获取不可信的登录态,并将该登录态重置掉,不允许多次登录
+	noTrustLoginKey := fmt.Sprint(utils.CACHE_ACCESS_TOKEN_LOGIN_NO_TRUST, sysUser.SysUserId)
+	noTrustLoginId, _ := utils.Rc.RedisString(noTrustLoginKey)
+	fmt.Println("noTrustLoginId:", noTrustLoginId)
+	if noTrustLoginId != `` { // 如果存在不可信设备,那么将其下架
+		oldNoTrustLoginKey := fmt.Sprint(utils.CACHE_ACCESS_TOKEN_LOGIN, noTrustLoginId)
+		utils.Rc.Put(oldNoTrustLoginKey, "0", time.Hour*24)
+	}
+	// 设置redis缓存,记录用户登录态
+	loginKey := fmt.Sprint(utils.CACHE_ACCESS_TOKEN_LOGIN, sysSession.SysSessionId)
+	utils.Rc.Put(loginKey, "1", time.Hour*24)
+	utils.Rc.Put(noTrustLoginKey, sysSession.SysSessionId, time.Hour*24*60)
+
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true

二进制
eta_mini_crm_ht


+ 0 - 3
go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
 	github.com/beego/bee/v2 v2.1.0
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/go-kit/kit v0.12.1-0.20220826005032-a7ba4fa4e289
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/go-sql-driver/mysql v1.8.1
 	github.com/minio/minio-go/v7 v7.0.74
@@ -30,8 +29,6 @@ require (
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
-	github.com/go-kit/log v0.2.1 // indirect
-	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/goccy/go-json v0.10.3 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect

+ 35 - 33
models/template_users.go

@@ -9,33 +9,35 @@ import (
 // TemplateUsers
 // @Description: 临时用户表
 type TemplateUsers struct {
-	Id           int       `orm:"pk" description:"用户id"`
-	UserName     string    `description:"姓名"`
-	Mobile       string    `description:"手机号"`
-	OpenId       string    `description:"用户openid"`
-	UnionId      string    `description:"用户unionid"`
-	IsDeleted    int       `description:"是否已删除"`
-	GzhOpenId    string    `description:"用户公众号openid"`
-	ReadCount    int       `description:"阅读次数"`
-	FollowingGzh bool      `description:"是否关注公众号"`
-	LastReadTime time.Time `description:"最近一次阅读时间"`
-	CreatedTime  time.Time `description:"创建时间"`
-	UpdatedTime  time.Time `description:"变更时间"`
+	Id            int       `orm:"pk" description:"用户id"`
+	UserName      string    `description:"姓名"`
+	Mobile        string    `description:"手机号"`
+	OpenId        string    `description:"用户openid"`
+	UnionId       string    `description:"用户unionid"`
+	IsDeleted     int       `description:"是否已删除"`
+	GzhOpenId     string    `description:"用户公众号openid"`
+	ReadCount     int       `description:"阅读次数"`
+	FollowingGzh  bool      `description:"是否关注公众号"`
+	AccountStatus string    `description:"账号状态"`
+	LastReadTime  time.Time `description:"最近一次阅读时间"`
+	CreatedTime   time.Time `description:"创建时间"`
+	UpdatedTime   time.Time `description:"变更时间"`
 }
 
 // TemplateUsers
 // @Description: 临时用户表
 type TemplateUsersItem struct {
-	Id           int    `orm:"pk" description:"用户id"`
-	UserName     string `description:"姓名"`
-	Mobile       string `description:"手机号"`
-	OpenId       string `description:"用户openid"`
-	UnionId      string `description:"用户unionid"`
-	GzhOpenId    string `description:"用户公众号openid"`
-	ReadCount    int    `description:"阅读次数"`
-	LastReadTime string `description:"最近一次阅读时间"`
-	CreatedTime  string `description:"创建时间"`
-	UpdatedTime  string `description:"变更时间"`
+	Id            int    `orm:"pk" description:"用户id"`
+	UserName      string `description:"姓名"`
+	Mobile        string `description:"手机号"`
+	OpenId        string `description:"用户openid"`
+	UnionId       string `description:"用户unionid"`
+	GzhOpenId     string `description:"用户公众号openid"`
+	ReadCount     int    `description:"阅读次数"`
+	AccountStatus string `description:"账号状态"`
+	LastReadTime  string `description:"最近一次阅读时间"`
+	CreatedTime   string `description:"创建时间"`
+	UpdatedTime   string `description:"变更时间"`
 }
 
 // GetPageTemplateUserList
@@ -89,20 +91,20 @@ func GetTemplateUserList() (items []*TemplateUsers, err error) {
 // @return item TemplateUsersItem
 func (m *TemplateUsers) ToItem() (item TemplateUsersItem) {
 	item = TemplateUsersItem{
-		Id:           m.Id,
-		UserName:     m.UserName,
-		Mobile:       m.Mobile,
-		OpenId:       m.OpenId,
-		UnionId:      m.UnionId,
-		GzhOpenId:    m.GzhOpenId,
-		ReadCount:    m.ReadCount,
-		LastReadTime: "",
-		CreatedTime:  m.CreatedTime.Format(utils.FormatDateTime),
-		UpdatedTime:  m.UpdatedTime.Format(utils.FormatDateTime),
+		Id:            m.Id,
+		UserName:      m.UserName,
+		Mobile:        m.Mobile,
+		OpenId:        m.OpenId,
+		UnionId:       m.UnionId,
+		GzhOpenId:     m.GzhOpenId,
+		ReadCount:     m.ReadCount,
+		AccountStatus: m.AccountStatus,
+		LastReadTime:  "",
+		CreatedTime:   m.CreatedTime.Format(utils.FormatDateTime),
+		UpdatedTime:   m.UpdatedTime.Format(utils.FormatDateTime),
 	}
 	if !m.LastReadTime.IsZero() {
 		item.LastReadTime = m.LastReadTime.Format(utils.FormatDateTime)
 	}
-
 	return
 }

+ 136 - 25
rpc/sso/sso.pb.go

@@ -77,18 +77,84 @@ func (x *LoginRequest) GetSource() string {
 	return ""
 }
 
+type UserInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	UserId   string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`
+	Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`
+	Name     string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+}
+
+func (x *UserInfo) Reset() {
+	*x = UserInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_rpc_protos_sso_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *UserInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*UserInfo) ProtoMessage() {}
+
+func (x *UserInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_rpc_protos_sso_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use UserInfo.ProtoReflect.Descriptor instead.
+func (*UserInfo) Descriptor() ([]byte, []int) {
+	return file_rpc_protos_sso_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *UserInfo) GetUserId() string {
+	if x != nil {
+		return x.UserId
+	}
+	return ""
+}
+
+func (x *UserInfo) GetUsername() string {
+	if x != nil {
+		return x.Username
+	}
+	return ""
+}
+
+func (x *UserInfo) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
 type LoginResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Result string `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
+	ErrCode int32     `protobuf:"varint,1,opt,name=errCode,proto3" json:"errCode,omitempty"`
+	ErrMsg  string    `protobuf:"bytes,2,opt,name=errMsg,proto3" json:"errMsg,omitempty"`
+	Msg     string    `protobuf:"bytes,3,opt,name=msg,proto3" json:"msg,omitempty"`
+	Data    *UserInfo `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
 }
 
 func (x *LoginResponse) Reset() {
 	*x = LoginResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_rpc_protos_sso_proto_msgTypes[1]
+		mi := &file_rpc_protos_sso_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -101,7 +167,7 @@ func (x *LoginResponse) String() string {
 func (*LoginResponse) ProtoMessage() {}
 
 func (x *LoginResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_rpc_protos_sso_proto_msgTypes[1]
+	mi := &file_rpc_protos_sso_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -114,16 +180,37 @@ func (x *LoginResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LoginResponse.ProtoReflect.Descriptor instead.
 func (*LoginResponse) Descriptor() ([]byte, []int) {
-	return file_rpc_protos_sso_proto_rawDescGZIP(), []int{1}
+	return file_rpc_protos_sso_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *LoginResponse) GetErrCode() int32 {
+	if x != nil {
+		return x.ErrCode
+	}
+	return 0
+}
+
+func (x *LoginResponse) GetErrMsg() string {
+	if x != nil {
+		return x.ErrMsg
+	}
+	return ""
 }
 
-func (x *LoginResponse) GetResult() string {
+func (x *LoginResponse) GetMsg() string {
 	if x != nil {
-		return x.Result
+		return x.Msg
 	}
 	return ""
 }
 
+func (x *LoginResponse) GetData() *UserInfo {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
 var File_rpc_protos_sso_proto protoreflect.FileDescriptor
 
 var file_rpc_protos_sso_proto_rawDesc = []byte{
@@ -132,15 +219,25 @@ var file_rpc_protos_sso_proto_rawDesc = []byte{
 	0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x63,
 	0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12,
 	0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x27, 0x0a, 0x0d, 0x4c, 0x6f, 0x67, 0x69, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x32, 0x3c, 0x0a, 0x08, 0x53, 0x53, 0x4f, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x30, 0x0a, 0x05,
-	0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x6f, 0x67, 0x69,
-	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c,
-	0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x10,
-	0x5a, 0x0e, 0x2e, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x73, 0x73, 0x6f, 0x2f, 0x3b, 0x73, 0x73, 0x6f,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x52, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x49,
+	0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x75,
+	0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75,
+	0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x76, 0x0a, 0x0d, 0x4c,
+	0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65,
+	0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x10,
+	0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67,
+	0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
+	0x2e, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64,
+	0x61, 0x74, 0x61, 0x32, 0x3c, 0x0a, 0x08, 0x53, 0x53, 0x4f, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12,
+	0x30, 0x0a, 0x05, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c,
+	0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x72, 0x70,
+	0x63, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x42, 0x10, 0x5a, 0x0e, 0x2e, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x73, 0x73, 0x6f, 0x2f, 0x3b,
+	0x73, 0x73, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -155,19 +252,21 @@ func file_rpc_protos_sso_proto_rawDescGZIP() []byte {
 	return file_rpc_protos_sso_proto_rawDescData
 }
 
-var file_rpc_protos_sso_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_rpc_protos_sso_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_rpc_protos_sso_proto_goTypes = []any{
 	(*LoginRequest)(nil),  // 0: rpc.LoginRequest
-	(*LoginResponse)(nil), // 1: rpc.LoginResponse
+	(*UserInfo)(nil),      // 1: rpc.UserInfo
+	(*LoginResponse)(nil), // 2: rpc.LoginResponse
 }
 var file_rpc_protos_sso_proto_depIdxs = []int32{
-	0, // 0: rpc.SSOLogin.Login:input_type -> rpc.LoginRequest
-	1, // 1: rpc.SSOLogin.Login:output_type -> rpc.LoginResponse
-	1, // [1:2] is the sub-list for method output_type
-	0, // [0:1] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
+	1, // 0: rpc.LoginResponse.data:type_name -> rpc.UserInfo
+	0, // 1: rpc.SSOLogin.Login:input_type -> rpc.LoginRequest
+	2, // 2: rpc.SSOLogin.Login:output_type -> rpc.LoginResponse
+	2, // [2:3] is the sub-list for method output_type
+	1, // [1:2] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
 }
 
 func init() { file_rpc_protos_sso_proto_init() }
@@ -189,6 +288,18 @@ func file_rpc_protos_sso_proto_init() {
 			}
 		}
 		file_rpc_protos_sso_proto_msgTypes[1].Exporter = func(v any, i int) any {
+			switch v := v.(*UserInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_rpc_protos_sso_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*LoginResponse); i {
 			case 0:
 				return &v.state
@@ -207,7 +318,7 @@ func file_rpc_protos_sso_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_rpc_protos_sso_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   2,
+			NumMessages:   3,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

+ 17 - 4
rpc/sso/sso_rpc.go

@@ -3,9 +3,10 @@ package sso
 import (
 	"context"
 	"encoding/base64"
-	"encoding/json"
+	"errors"
 	"eta/eta_mini_crm_ht/rpc"
 	"eta/eta_mini_crm_ht/utils"
+	"fmt"
 	"google.golang.org/grpc/metadata"
 	"sync"
 )
@@ -32,7 +33,11 @@ func GetSSOService() *SSOService {
 	return SSOServiceImpl
 }
 
-func (s *SSOService) SSOLogin(request *LoginRequest) (resp string, err error) {
+type UserResp struct {
+	UserName string
+}
+
+func (s *SSOService) SSOLogin(request *LoginRequest) (resp UserResp, err error) {
 	conn := rpcPool.Get()
 	defer rpcPool.Put(conn)
 	ssoLoginService := NewSSOLoginClient(conn)
@@ -67,8 +72,16 @@ func (s *SSOService) SSOLogin(request *LoginRequest) (resp string, err error) {
 		utils.FileLog.Error("sso login failed:%v", err)
 		return
 	}
-	bytessss, _ := json.Marshal(ssoResp)
-	resp = string(bytessss)
+	if ssoResp.ErrCode != 0 {
+		err = errors.New(fmt.Sprintf("sso登录失败:%s", ssoResp.ErrMsg))
+		utils.FileLog.Error("sso登录失败:%v", ssoResp.ErrMsg)
+		return
+	}
+	userinfo := ssoResp.Data
+	utils.FileLog.Info("sso请求成功")
+	resp = UserResp{
+		UserName: userinfo.Username,
+	}
 	return
 }
 func base64Encode(data []byte) string {

+ 4 - 2
services/sso_service.go

@@ -1,12 +1,14 @@
 package services
 
-import "eta/eta_mini_crm_ht/rpc/sso"
+import (
+	"eta/eta_mini_crm_ht/rpc/sso"
+)
 
 const (
 	crmSource = "weapp"
 )
 
-func SSOLogin(code string) (resp string, err error) {
+func SSOLogin(code string) (resp sso.UserResp, err error) {
 	req := &sso.LoginRequest{
 		Code:   code,
 		Source: crmSource,