fiee/micro-account
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
桀尼龟 2025-05-26 16:32:59 +08:00
parent 648b55f43a
commit 6a5039fca3
12 changed files with 2183 additions and 2157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3850
api/account/account.pb.go → api/accountFiee/accountFiee.pb.go
View File

File diff suppressed because it is too large Load Diff

6
api/account/account.proto → api/accountFiee/accountFiee.proto
View File

@ -16,12 +16,12 @@
*/
syntax = "proto3";
package account;
package accountFiee;
import "github.com/mwitkow/go-proto-validators@v0.3.2/validator.proto";
option go_package = "./;account";
option go_package = "./;accountFiee";
service Account {
service AccountFiee {
rpc Login (LoginRequest) returns (TokenInfo) {}
rpc RefreshToken (RefreshTokenRequest) returns (TokenInfo) {} //刷新token
rpc Logout (DecryptJwtRequest) returns (CommonResponse) {}

4
api/account/account.validator.pb.go → api/accountFiee/accountFiee.validator.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: api/account/account.proto
// source: api/accountFiee/accountFiee.proto
package account
package accountFiee
import (
fmt "fmt"

384
api/account/account_triple.pb.go → api/accountFiee/accountFiee_triple.pb.go
View File

File diff suppressed because it is too large Load Diff

2
cmd/app.go
View File

@ -47,7 +47,7 @@ func main() {
}
//注册服务
config.SetProviderService(&service.AccountProvider{})
config.SetProviderService(&service.AccountFieeProvider{})
//config.SetProviderService(&service.CoinProvider{})
if err := config.Load(); err != nil {
panic(err)

4
docs/env/dev/dubbogo.yaml vendored
View File

@ -9,8 +9,8 @@ dubbo:
port: 20001
provider:
services:
AccountProvider:
interface: com.fontree.microservices.common.micro.account # must be compatible with grpc or dubbo-java
AccountFieeProvider:
interface: com.fontree.microservices.common.micro.account.fiee # must be compatible with grpc or dubbo-java
auth: "true"
# filter: echo,metrics,token,accesslog,sign,tps,generic_service,execute,pshutdown,auth,fonValidateFilter
# params:

4
docs/env/prod/dubbogo.yaml vendored
View File

@ -9,8 +9,8 @@ dubbo:
port: 20001
provider:
services:
AccountProvider:
interface: com.fontree.microservices.common.micro.account # must be compatible with grpc or dubbo-java
AccountFieeProvider:
interface: com.fontree.microservices.common.micro.account.fiee # must be compatible with grpc or dubbo-java
auth: "true"
filter: echo,metrics,token,accesslog,sign,tps,generic_service,execute,pshutdown,auth,fonValidateFilter
params:

2
pkg/application/order.go
View File

@ -2,7 +2,7 @@ package application
import (
"fmt"
"github.com/fonchain_enterprise/micro-account/api/account"
account "github.com/fonchain_enterprise/micro-account/api/accountFiee"
"github.com/fonchain_enterprise/micro-account/cmd/config"
"github.com/fonchain_enterprise/micro-account/pkg/cache"
"github.com/fonchain_enterprise/micro-account/pkg/common/jwt"

2
pkg/application/user.go
View File

@ -2,7 +2,7 @@ package application
import (
"fmt"
"github.com/fonchain_enterprise/micro-account/api/account"
account "github.com/fonchain_enterprise/micro-account/api/accountFiee"
"github.com/fonchain_enterprise/micro-account/pkg/model"
)

2
pkg/model/user.go
View File

@ -5,7 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/fonchain_enterprise/micro-account/api/account"
account "github.com/fonchain_enterprise/micro-account/api/accountFiee"
"github.com/fonchain_enterprise/micro-account/pkg/cache"
"github.com/fonchain_enterprise/micro-account/pkg/common/redis_key"
"github.com/fonchain_enterprise/micro-account/pkg/common/utils"

2
pkg/serializer/user.go
View File

@ -1,7 +1,7 @@
package serializer
import (
"github.com/fonchain_enterprise/micro-account/api/account"
account "github.com/fonchain_enterprise/micro-account/api/accountFiee"
"github.com/fonchain_enterprise/micro-account/pkg/common/utils"
"github.com/fonchain_enterprise/micro-account/pkg/model"
)

78
pkg/service/account.go
View File

@ -7,7 +7,7 @@ import (
_ "dubbo.apache.org/dubbo-go/v3/imports"
"errors"
"fmt"
"github.com/fonchain_enterprise/micro-account/api/account"
account "github.com/fonchain_enterprise/micro-account/api/accountFiee"
"github.com/fonchain_enterprise/micro-account/pkg/application"
"github.com/fonchain_enterprise/micro-account/pkg/cache"
"github.com/fonchain_enterprise/micro-account/pkg/common/jwt"
@ -32,12 +32,12 @@ import (
"time"
)
type AccountProvider struct {
account.UnimplementedAccountServer
type AccountFieeProvider struct {
account.UnimplementedAccountFieeServer
}
// OffLine 踢出
func (a *AccountProvider) OffLine(ctx context.Context, in *account.CommonRequest) (*account.CommonResponse, error) {
func (a *AccountFieeProvider) OffLine(ctx context.Context, in *account.CommonRequest) (*account.CommonResponse, error) {
response := &account.CommonResponse{}
@ -52,7 +52,7 @@ func (a *AccountProvider) OffLine(ctx context.Context, in *account.CommonRequest
}
// Logout 登出
func (a *AccountProvider) Logout(ctx context.Context, in *account.DecryptJwtRequest) (*account.CommonResponse, error) {
func (a *AccountFieeProvider) Logout(ctx context.Context, in *account.DecryptJwtRequest) (*account.CommonResponse, error) {
response := &account.CommonResponse{}
@ -66,7 +66,7 @@ func (a *AccountProvider) Logout(ctx context.Context, in *account.DecryptJwtRequ
}
// OnlineLogById 获取某个id的在线数据
func (a *AccountProvider) OnlineLogById(ctx context.Context, in *account.OnlineLogByIdRequest) (*account.LoginLog, error) {
func (a *AccountFieeProvider) OnlineLogById(ctx context.Context, in *account.OnlineLogByIdRequest) (*account.LoginLog, error) {
response := &account.LoginLog{}
response, err := application.OnlineLogById(in.ID)
if err != nil {
@ -77,13 +77,13 @@ func (a *AccountProvider) OnlineLogById(ctx context.Context, in *account.OnlineL
}
// OnlineLog 获取某个人的在线数据
func (a *AccountProvider) OnlineLog(ctx context.Context, in *account.LoginInfosByUserIdRequest) (*account.LoginLogsResponse, error) {
func (a *AccountFieeProvider) OnlineLog(ctx context.Context, in *account.LoginInfosByUserIdRequest) (*account.LoginLogsResponse, error) {
response := &account.LoginLogsResponse{}
response.Data = application.OnlineLogList(in)
return response, nil
}
func (a *AccountProvider) Login(ctx context.Context, in *account.LoginRequest) (*account.TokenInfo, error) {
func (a *AccountFieeProvider) Login(ctx context.Context, in *account.LoginRequest) (*account.TokenInfo, error) {
timeNow := time.Now()
tokenInfo := &account.TokenInfo{IsSampleAddress: true}
//nowIpAddress := ""
@ -145,7 +145,7 @@ func (a *AccountProvider) Login(ctx context.Context, in *account.LoginRequest) (
}
func (a *AccountProvider) RefreshToken(_ context.Context, in *account.RefreshTokenRequest) (*account.TokenInfo, error) {
func (a *AccountFieeProvider) RefreshToken(_ context.Context, in *account.RefreshTokenRequest) (*account.TokenInfo, error) {
response := &account.TokenInfo{}
oldRefreshToken := in.RefreshToken
@ -190,7 +190,7 @@ func (a *AccountProvider) RefreshToken(_ context.Context, in *account.RefreshTok
return response, nil
}
func (a *AccountProvider) OnlySendMsg(_ context.Context, in *account.SendMsgRequest) (*account.SendMsgStatusResponse, error) {
func (a *AccountFieeProvider) OnlySendMsg(_ context.Context, in *account.SendMsgRequest) (*account.SendMsgStatusResponse, error) {
response := &account.SendMsgStatusResponse{}
//telTodayNum := redis_key.GetAccountKeyCountToday(in.Domain, in.TelNum, in.Scope)
@ -239,7 +239,7 @@ func (a *AccountProvider) OnlySendMsg(_ context.Context, in *account.SendMsgRequ
}
func (a *AccountProvider) OnlyCheckMsg(_ context.Context, in *account.CheckMsgRequest) (*account.SendMsgStatusResponse, error) {
func (a *AccountFieeProvider) OnlyCheckMsg(_ context.Context, in *account.CheckMsgRequest) (*account.SendMsgStatusResponse, error) {
response := &account.SendMsgStatusResponse{}
fmt.Println(in)
@ -259,7 +259,7 @@ func (a *AccountProvider) OnlyCheckMsg(_ context.Context, in *account.CheckMsgRe
}
// SendMsg 发送验证码
func (a *AccountProvider) SendMsg(_ context.Context, in *account.SendMsgRequest) (*account.SendMsgStatusResponse, error) {
func (a *AccountFieeProvider) SendMsg(_ context.Context, in *account.SendMsgRequest) (*account.SendMsgStatusResponse, error) {
response := &account.SendMsgStatusResponse{}
//var user *model.User
@ -309,7 +309,7 @@ func (a *AccountProvider) SendMsg(_ context.Context, in *account.SendMsgRequest)
}
func (a *AccountProvider) SendMsgRegister(_ context.Context, in *account.SendMsgRequest) (*account.SendMsgStatusResponse, error) {
func (a *AccountFieeProvider) SendMsgRegister(_ context.Context, in *account.SendMsgRequest) (*account.SendMsgStatusResponse, error) {
response := &account.SendMsgStatusResponse{}
telTodayNum := redis_key.GetAccountKeyCountToday(in.Domain, in.TelNum)
@ -348,7 +348,7 @@ func (a *AccountProvider) SendMsgRegister(_ context.Context, in *account.SendMsg
}
func (a *AccountProvider) CheckMsg(_ context.Context, in *account.CheckMsgRequest) (*account.SendMsgStatusResponse, error) {
func (a *AccountFieeProvider) CheckMsg(_ context.Context, in *account.CheckMsgRequest) (*account.SendMsgStatusResponse, error) {
response := &account.SendMsgStatusResponse{}
str := cache.RedisClient.Get(redis_key.GetAccountKey(in.Domain, in.TelNum)) //校验验证码
@ -365,7 +365,7 @@ func (a *AccountProvider) CheckMsg(_ context.Context, in *account.CheckMsgReques
}
func (a *AccountProvider) RealName(_ context.Context, in *account.RealNameRequest) (*account.RealNameResponse, error) {
func (a *AccountFieeProvider) RealName(_ context.Context, in *account.RealNameRequest) (*account.RealNameResponse, error) {
// 检查用户是否存在
var existingUser model.User
if err := model.DB.First(&existingUser, "id = ?", in.Id).Error; err != nil {
@ -435,7 +435,7 @@ func (a *AccountProvider) RealName(_ context.Context, in *account.RealNameReques
return &account.RealNameResponse{Status: m.SUCCESS}, nil
}
func (a *AccountProvider) CheckRealName(ctx context.Context, in *account.CheckRealNameRequest) (*account.CheckRealNameResponse, error) {
func (a *AccountFieeProvider) CheckRealName(ctx context.Context, in *account.CheckRealNameRequest) (*account.CheckRealNameResponse, error) {
// 根据用户 ID 查询用户
var user model.User
if err := model.DB.First(&user, "id = ?", in.Id).Error; err != nil {
@ -469,7 +469,7 @@ func (a *AccountProvider) CheckRealName(ctx context.Context, in *account.CheckRe
}
// Register 注册
func (a *AccountProvider) Register(_ context.Context, in *account.RegistRequest) (*account.RegisterResponse, error) {
func (a *AccountFieeProvider) Register(_ context.Context, in *account.RegistRequest) (*account.RegisterResponse, error) {
var err error
// 验证验证码
if in.Code == "" {
@ -541,7 +541,7 @@ func (a *AccountProvider) Register(_ context.Context, in *account.RegistRequest)
}
// CheckPwd 检测密码是否正确
func (a *AccountProvider) CheckPwd(_ context.Context, in *account.CheckPwdRequest) (*account.UpdateResponse, error) {
func (a *AccountFieeProvider) CheckPwd(_ context.Context, in *account.CheckPwdRequest) (*account.UpdateResponse, error) {
response := &account.UpdateResponse{}
claims, err := jwt.ParseToken(in.Token, m.JWTSecret)
if err != nil {
@ -562,7 +562,7 @@ func (a *AccountProvider) CheckPwd(_ context.Context, in *account.CheckPwdReques
return response, nil
}
func (a *AccountProvider) Authentication(_ context.Context, in *account.AuthenticationRequest) (*account.RequestStatus, error) {
func (a *AccountFieeProvider) Authentication(_ context.Context, in *account.AuthenticationRequest) (*account.RequestStatus, error) {
claims, err := jwt.ParseToken(in.Token, m.JWTSecret)
if err != nil {
return nil, err
@ -599,7 +599,7 @@ func (a *AccountProvider) Authentication(_ context.Context, in *account.Authenti
return &account.RequestStatus{Status: m.SUCCESS}, nil
}
func (a *AccountProvider) Info(ctx context.Context, in *account.InfoRequest) (*account.UserInfoResponse, error) {
func (a *AccountFieeProvider) Info(ctx context.Context, in *account.InfoRequest) (*account.UserInfoResponse, error) {
//获取该用户信息
var user *model.User
@ -643,7 +643,7 @@ func (a *AccountProvider) Info(ctx context.Context, in *account.InfoRequest) (*a
return response, nil
}
func (a *AccountProvider) UserList(ctx context.Context, in *account.UserListRequest) (*account.UserListResponse, error) {
func (a *AccountFieeProvider) UserList(ctx context.Context, in *account.UserListRequest) (*account.UserListResponse, error) {
var count int64
var users []*model.User
modelObj := model.DB.Model(&model.User{}).Joins("RealName")
@ -687,7 +687,7 @@ func (a *AccountProvider) UserList(ctx context.Context, in *account.UserListRequ
}
// 艺术商城，发送国际短信验证码
func (a *AccountProvider) SendNationMsg(_ context.Context, in *account.SendNationMsgRequest) (*account.SendMsgStatusResponse, error) {
func (a *AccountFieeProvider) SendNationMsg(_ context.Context, in *account.SendNationMsgRequest) (*account.SendMsgStatusResponse, error) {
response := &account.SendMsgStatusResponse{}
// var user *model.User
@ -737,7 +737,7 @@ func (a *AccountProvider) SendNationMsg(_ context.Context, in *account.SendNatio
return response, nil
}
func (a *AccountProvider) GenerateSliderCaptcha(_ context.Context, in *account.GenerateSliderCaptchaRequest) (*account.GenerateSliderCaptchaResponse, error) {
func (a *AccountFieeProvider) GenerateSliderCaptcha(_ context.Context, in *account.GenerateSliderCaptchaRequest) (*account.GenerateSliderCaptchaResponse, error) {
captcha := &model.Captcha{
CanvasWidth: int(in.CanvasWidth),
@ -787,7 +787,7 @@ func (a *AccountProvider) GenerateSliderCaptcha(_ context.Context, in *account.G
return resp, nil
}
func (a *AccountProvider) VerifySliderCaptcha(_ context.Context, in *account.VerifySliderCaptchaRequest) (*account.VerifySliderCaptchaResponse, error) {
func (a *AccountFieeProvider) VerifySliderCaptcha(_ context.Context, in *account.VerifySliderCaptchaRequest) (*account.VerifySliderCaptchaResponse, error) {
resp := &account.VerifySliderCaptchaResponse{}
@ -816,7 +816,7 @@ func (a *AccountProvider) VerifySliderCaptcha(_ context.Context, in *account.Ver
return resp, nil
}
func (a *AccountProvider) DecryptJwt(_ context.Context, in *account.DecryptJwtRequest) (*account.DecryptJwtResponse, error) {
func (a *AccountFieeProvider) DecryptJwt(_ context.Context, in *account.DecryptJwtRequest) (*account.DecryptJwtResponse, error) {
//默认在线
fmt.Println()
@ -848,7 +848,7 @@ func (a *AccountProvider) DecryptJwt(_ context.Context, in *account.DecryptJwtRe
return response, nil
}
func (a *AccountProvider) UserByTel(_ context.Context, in *account.UserByTelRequest) (*account.UserInfoResponse, error) {
func (a *AccountFieeProvider) UserByTel(_ context.Context, in *account.UserByTelRequest) (*account.UserInfoResponse, error) {
response := &account.UserInfoResponse{}
@ -896,7 +896,7 @@ func (a *AccountProvider) UserByTel(_ context.Context, in *account.UserByTelRequ
return response, nil
}
func (a *AccountProvider) UsersByTel(_ context.Context, in *account.UsersByTelRequest) (*account.ListResponse, error) {
func (a *AccountFieeProvider) UsersByTel(_ context.Context, in *account.UsersByTelRequest) (*account.ListResponse, error) {
response := &account.ListResponse{}
if len(in.Tels) == 0 {
@ -913,7 +913,7 @@ func (a *AccountProvider) UsersByTel(_ context.Context, in *account.UsersByTelRe
return response, nil
}
func (a *AccountProvider) ListByIDs(_ context.Context, in *account.ListByIDsRequest) (*account.ListResponse, error) {
func (a *AccountFieeProvider) ListByIDs(_ context.Context, in *account.ListByIDsRequest) (*account.ListResponse, error) {
var count int64
//获取该用户信息
@ -955,7 +955,7 @@ func (a *AccountProvider) ListByIDs(_ context.Context, in *account.ListByIDsRequ
return response, nil
}
func (a *AccountProvider) RandList(_ context.Context, in *account.ListRequest) (*account.ListResponse, error) {
func (a *AccountFieeProvider) RandList(_ context.Context, in *account.ListRequest) (*account.ListResponse, error) {
//获取该用户信息
//var user model.User
@ -969,7 +969,7 @@ func (a *AccountProvider) RandList(_ context.Context, in *account.ListRequest) (
return response, nil
}
func (a *AccountProvider) Remove(_ context.Context, in *account.RemoveRequest) (*account.RemoveResponse, error) {
func (a *AccountFieeProvider) Remove(_ context.Context, in *account.RemoveRequest) (*account.RemoveResponse, error) {
response := &account.RemoveResponse{}
err := model.DB.Transaction(func(tx *gorm.DB) error {
@ -989,7 +989,7 @@ func (a *AccountProvider) Remove(_ context.Context, in *account.RemoveRequest) (
}
// SendNewTelNumMsg 给新手机号发送验证码
func (a *AccountProvider) SendNewTelNumMsg(_ context.Context, in *account.SendNewTelNumMsgRequest) (*account.SendMsgStatusResponse, error) {
func (a *AccountFieeProvider) SendNewTelNumMsg(_ context.Context, in *account.SendNewTelNumMsgRequest) (*account.SendMsgStatusResponse, error) {
var user *model.User
response := &account.SendMsgStatusResponse{}
if err := model.DB.First(&user, in.ID).Error; err != nil {
@ -1011,7 +1011,7 @@ func (a *AccountProvider) SendNewTelNumMsg(_ context.Context, in *account.SendNe
}
// UpdateTelNum 更新新手机号
func (a *AccountProvider) UpdateTelNum(_ context.Context, in *account.SendNewTelNumMsgRequest) (*account.SendMsgStatusResponse, error) {
func (a *AccountFieeProvider) UpdateTelNum(_ context.Context, in *account.SendNewTelNumMsgRequest) (*account.SendMsgStatusResponse, error) {
var user *model.User
response := &account.SendMsgStatusResponse{}
if err := model.DB.First(&user, in.ID).Error; err != nil {
@ -1022,7 +1022,7 @@ func (a *AccountProvider) UpdateTelNum(_ context.Context, in *account.SendNewTel
return response, err
}
func (a *AccountProvider) Update(_ context.Context, in *account.UpdateRequest) (*account.UpdateResponse, error) {
func (a *AccountFieeProvider) Update(_ context.Context, in *account.UpdateRequest) (*account.UpdateResponse, error) {
response := &account.UpdateResponse{}
var user *model.User
if err := model.DB.First(&user, in.ID).Error; err != nil {
@ -1034,7 +1034,7 @@ func (a *AccountProvider) Update(_ context.Context, in *account.UpdateRequest) (
}
return response, nil
}
func (a *AccountProvider) SendCustomMsg(ctx context.Context, in *account.SendCustomMsgRequest) (*account.SendMsgStatusResponse, error) {
func (a *AccountFieeProvider) SendCustomMsg(ctx context.Context, in *account.SendCustomMsgRequest) (*account.SendMsgStatusResponse, error) {
response := &account.SendMsgStatusResponse{}
var user *model.User
uuid := uuid2.NewString()
@ -1062,7 +1062,7 @@ func (a *AccountProvider) SendCustomMsg(ctx context.Context, in *account.SendCus
}
func (a *AccountProvider) SendExCustomMsg(ctx context.Context, in *account.SendCustomMsgRequest) (*account.SendMsgStatusResponse, error) {
func (a *AccountFieeProvider) SendExCustomMsg(ctx context.Context, in *account.SendCustomMsgRequest) (*account.SendMsgStatusResponse, error) {
response := &account.SendMsgStatusResponse{}
fmt.Println("对外的发送短信参数:", in.TelNum, in.Url, in.MId)
@ -1071,7 +1071,7 @@ func (a *AccountProvider) SendExCustomMsg(ctx context.Context, in *account.SendC
}
func (a *AccountProvider) MailAccountByNickName(_ context.Context, in *account.MailAccountByNickNameRequest) (*account.MaiAccountResponse, error) {
func (a *AccountFieeProvider) MailAccountByNickName(_ context.Context, in *account.MailAccountByNickNameRequest) (*account.MaiAccountResponse, error) {
var err error
response := &account.MaiAccountResponse{}
@ -1080,7 +1080,7 @@ func (a *AccountProvider) MailAccountByNickName(_ context.Context, in *account.M
return response, err
}
func (a *AccountProvider) QueryPersonnelWithTheSameName(_ context.Context, req *account.QueryPersonnelWithTheSameNameRequest) (*account.QueryPersonnelWithTheSameNameResponse, error) {
func (a *AccountFieeProvider) QueryPersonnelWithTheSameName(_ context.Context, req *account.QueryPersonnelWithTheSameNameRequest) (*account.QueryPersonnelWithTheSameNameResponse, error) {
var duplicateNames []string
query := model.DB.Table("user").
Select("nickname").
@ -1106,7 +1106,7 @@ func (a *AccountProvider) QueryPersonnelWithTheSameName(_ context.Context, req *
return response, nil
}
func (a *AccountProvider) UsersByJobNum(_ context.Context, in *account.UsersByJobNumRequest) (*account.ListResponse, error) {
func (a *AccountFieeProvider) UsersByJobNum(_ context.Context, in *account.UsersByJobNumRequest) (*account.ListResponse, error) {
response := &account.ListResponse{}
if len(in.JobNum) == 0 {
@ -1122,7 +1122,7 @@ func (a *AccountProvider) UsersByJobNum(_ context.Context, in *account.UsersByJo
return response, nil
}
func (a *AccountProvider) VerifySliderStatus(_ context.Context, in *account.VerifySliderStatusRequest) (*account.VerifySliderStatusResponse, error) {
func (a *AccountFieeProvider) VerifySliderStatus(_ context.Context, in *account.VerifySliderStatusRequest) (*account.VerifySliderStatusResponse, error) {
resp := &account.VerifySliderStatusResponse{}
status, err := cache.RedisClient.Get("SliderStatus:" + in.NonceStr).Result()
if err != nil {