fusen/proto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.fusenpack.com:backend/proto

Browse Source
This commit is contained in:
menghaiwen@fusen.cn 2024-03-05 10:30:05 +08:00
commit 2320408b1d
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
goutils/proto_build/tpls/logic_grpc_struct.tpl
View File

@ -5,8 +5,10 @@ import (
"context" "context"
"sync" "sync"
"fmt" "fmt"
"runtime/debug"
"fusen-basic/env" "fusen-basic/env"
"fusen-basic/utils/log"
"{{.ProjectName}}/gen/go/service" "{{.ProjectName}}/gen/go/service"
"{{.ProjectName}}/server/config" "{{.ProjectName}}/server/config"
@ -53,6 +55,7 @@ func (lgrpc *{{.StructName}}Grpc) {{.MethodName}}({{range $index, $param := .Par
if _recoverErr := recover(); _recoverErr != nil { if _recoverErr := recover(); _recoverErr != nil {
_resp = nil _resp = nil
_err = fmt.Errorf("%v", _recoverErr) _err = fmt.Errorf("%v", _recoverErr)
log.Printf("recovered from panic: %v\n%s", _err, string(debug.Stack()))
} }
}() }()
return New{{.StructName}}(ctx).{{.MethodName}}Logic({{range $index, $param := .ParamsName}}{{if $index}}, {{end}}{{$param}}{{end}}) return New{{.StructName}}(ctx).{{.MethodName}}Logic({{range $index, $param := .ParamsName}}{{if $index}}, {{end}}{{$param}}{{end}})
@ -64,6 +67,7 @@ func (lgrpc *{{.StructName}}Grpc) {{.MethodName}}(stream {{range $index, $param
defer func() { defer func() {
if _recoverErr := recover(); _recoverErr != nil { if _recoverErr := recover(); _recoverErr != nil {
_err = fmt.Errorf("%v", _recoverErr) _err = fmt.Errorf("%v", _recoverErr)
log.Printf("recovered from panic: %v\n%s", _err, string(debug.Stack()))
} }
}() }()
return New{{.StructName}}(stream.Context()).{{.MethodName}}Logic(stream) return New{{.StructName}}(stream.Context()).{{.MethodName}}Logic(stream)

16
service/basic.proto
View File

@ -48,4 +48,20 @@ message FsUser {
string username = 4; // 用户名称 string username = 4; // 用户名称
string company = 5; // 公司 string company = 5; // 公司
string mobile = 6; // 电话号码 string mobile = 6; // 电话号码
}
message LdapUser {
int64 user_id = 1; //用户id
string user_dn = 2; //用户dn
string user_name = 3; //用户名
string email = 4; //邮箱
string mobile = 5; //手机号
string avatar = 6; //头像地址
int64 employee_type = 7; //雇佣类型 1正式 2实习 3外包
int64 gender = 8; //性别 1男 2女 3未知
string birthday = 9; //生日
repeated string belong_organizations = 10 ;//属于哪些部门
repeated string manage_organizations = 11 ;//管理哪些部门
int64 status = 12 ; //状态 1正常0离职
int64 group_id = 13; //权限分组id
} }

9
service/order.proto
View File

@ -61,7 +61,7 @@ message OrderListReq{
OrderFilter filter = 1; // 筛选条件 OrderFilter filter = 1; // 筛选条件
int64 handle_type = 2; // 处理类型：0=原数据，1=返回处理数据 int64 handle_type = 2; // 处理类型：0=原数据，1=返回处理数据
int64 channle_type = 3; // 处理类型：0=后台，1=前台 int64 channle_type = 3; // 处理类型：0=后台，1=前台
repeated int64 related = 4; // 关联数据：1=用户信息，2=支付记录 repeated int64 related = 4; // 关联数据：1=用户信息，2=支付记录，3=销售信息，4=设计信息，5=供应链信息
bool select_whole = 100; // 查询类型：false=分页 true=全部数据 bool select_whole = 100; // 查询类型：false=分页 true=全部数据
@ -100,6 +100,13 @@ message OrderInfo {
OrderDetailDb order_detail_db = 1; // 原数据 OrderDetailDb order_detail_db = 1; // 原数据
bytes order_detail = 2; // 处理后数据 bytes order_detail = 2; // 处理后数据
basic.FsUser user_info = 3; // 用户数据 basic.FsUser user_info = 3; // 用户数据
basic.LdapUser sale_info = 4; // 销售负责人
basic.LdapUser design_info = 5; // 设计负责人
OrderScm scm_info = 6;
}
message OrderScm {
repeated basic.LdapUser scm_info = 1; // 供应链信息
repeated int64 scm_ids = 2; // 供应链信息
} }
/* 数据库 */ /* 数据库 */