From 9c4ea12b88fdd2f4f4b21ecc492fa0a73b7b1cbe Mon Sep 17 00:00:00 2001 From: "daniel.w" Date: Sat, 3 Aug 2024 22:37:12 +0800 Subject: [PATCH] feat: remove role id --- .../mysql/20230529020011_user_table.up.sql | 1 - generate/protobuf/member.proto | 40 +++++++++---------- internal/logic/bind_user_info_logic.go | 2 - internal/logic/list_member_logic.go | 6 --- internal/model/user_table_model.go | 5 +-- readme.md | 2 + 6 files changed, 21 insertions(+), 35 deletions(-) diff --git a/generate/database/mysql/20230529020011_user_table.up.sql b/generate/database/mysql/20230529020011_user_table.up.sql index 86010e2..40f58c5 100644 --- a/generate/database/mysql/20230529020011_user_table.up.sql +++ b/generate/database/mysql/20230529020011_user_table.up.sql @@ -4,7 +4,6 @@ CREATE TABLE `user_table` ( `alarm_type` tinyint DEFAULT 0 NOT NULL COMMENT '告警狀態 0. 異常 1. 正常（未告警） 2.系統告警中', `status` tinyint DEFAULT 0 NOT NULL COMMENT '會員狀態 0. 異常 1. 尚未驗證 2. 啟用 3. 停權中 4. 信箱以驗證 5. 手機以驗證 6. GA 以驗證', `uid` VARCHAR(255) NOT NULL, - `role_id` VARCHAR(255) NOT NULL DEFAULT '', `language` VARCHAR(255) NOT NULL DEFAULT '', `currency` VARCHAR(255) NOT NULL DEFAULT '', `nick_name` VARCHAR(255) DEFAULT '', diff --git a/generate/protobuf/member.proto b/generate/protobuf/member.proto index a70280f..932e3dd 100644 --- a/generate/protobuf/member.proto +++ b/generate/protobuf/member.proto @@ -72,12 +72,11 @@ message CreateUserInfoReq { VerifyType verify_type = 2; AlarmType alarm_type = 3; MemberStatus status = 4; - string role_id = 5; - string language = 6; - string currency = 7; - optional string nick_name = 8; - optional uint32 gender = 9; - optional int64 birthday = 10; + string language = 5; + string currency = 6; + optional string nick_name = 7; + optional uint32 gender = 8; + optional int64 birthday = 9; } message GetAccountInfoResp { @@ -95,8 +94,7 @@ message UpdateUserInfoReq { optional int64 birthday = 6; optional VerifyType verify_type = 7; optional AlarmType alarm_type = 8; - optional string role_id = 9; - optional MemberStatus status = 10; + optional MemberStatus status = 9; } message GetUIDByAccountReq { @@ -152,12 +150,11 @@ message UserInfo { VerifyType verify_type = 2; AlarmType alarm_type = 3; MemberStatus status = 4; - string role_id = 5; - string language = 6; - string currency = 7; - optional string nick_name = 8; - optional uint32 gender = 9; - optional int64 birthday = 10; + string language = 5; + string currency = 6; + optional string nick_name = 7; + optional uint32 gender = 8; + optional int64 birthday = 9; } message GetUserInfoResp { @@ -166,14 +163,13 @@ message GetUserInfoResp { } message ListUserInfoReq { - optional string role_id = 1; - optional VerifyType verify_type = 2; - optional AlarmType alarm_type = 3; - optional MemberStatus status = 4; - optional int64 create_start_time = 5; - optional int64 create_end_time = 6; - int64 page_size =7; - int64 page_index=8; + optional VerifyType verify_type = 1; + optional AlarmType alarm_type = 2; + optional MemberStatus status = 3; + optional int64 create_start_time = 4; + optional int64 create_end_time = 5; + int64 page_size =6; + int64 page_index=7; } message ListUserInfoResp { diff --git a/internal/logic/bind_user_info_logic.go b/internal/logic/bind_user_info_logic.go index ff2f32b..8521396 100644 --- a/internal/logic/bind_user_info_logic.go +++ b/internal/logic/bind_user_info_logic.go @@ -51,7 +51,6 @@ func (l *BindUserInfoLogic) BindUserInfo(in *member.CreateUserInfoReq) (*member. VerifyType: int32(in.GetVerifyType()), AlarmType: int32(in.GetAlarmType()), Status: int32(in.GetStatus()), - RoleId: in.GetRoleId(), Language: in.GetLanguage(), Currency: in.GetCurrency(), NickName: in.GetNickName(), @@ -67,7 +66,6 @@ func (l *BindUserInfoLogic) BindUserInfo(in *member.CreateUserInfoReq) (*member. VerifyType: int64(in.GetVerifyType()), AlarmType: int64(in.GetAlarmType()), Status: int64(in.GetStatus()), - RoleId: in.GetRoleId(), Language: in.GetLanguage(), Currency: in.GetCurrency(), NickName: in.GetNickName(), diff --git a/internal/logic/list_member_logic.go b/internal/logic/list_member_logic.go index 5a0902b..3c687c7 100644 --- a/internal/logic/list_member_logic.go +++ b/internal/logic/list_member_logic.go @@ -36,11 +36,6 @@ func parse(in *member.ListUserInfoReq) (model.UserQueryParams, error) { // 設置 PageIndex filter.PageIndex = getValidPageIndex(in.PageIndex) - // 設置 RoleId - if in.RoleId != nil { - filter.RoleId = in.RoleId - } - // 設置 VerifyType svt := fmt.Sprintf("%d", in.GetVerifyType().Number()) vt, err := getInt32FromStringPointer(&svt) @@ -142,7 +137,6 @@ func (l *ListMemberLogic) ListMember(in *member.ListUserInfoReq) (*member.ListUs VerifyType: member.VerifyType(item.VerifyType), AlarmType: member.AlarmType(item.AlarmType), Status: member.MemberStatus(item.Status), - RoleId: item.RoleId, Language: item.Language, Currency: item.Currency, NickName: &item.NickName, diff --git a/internal/model/user_table_model.go b/internal/model/user_table_model.go index 2ee4efc..153c864 100755 --- a/internal/model/user_table_model.go +++ b/internal/model/user_table_model.go @@ -177,10 +177,7 @@ func (m *defaultUserTableModel) UpdateSome(ctx context.Context, newData *member. updates = append(updates, "status = ?") args = append(args, *newData.Status) } - if newData.RoleId != nil { - updates = append(updates, "role_id = ?") - args = append(args, *newData.RoleId) - } + if newData.Language != nil { updates = append(updates, "language = ?") args = append(args, *newData.Language) diff --git a/readme.md b/readme.md index c425dbc..e60092f 100644 --- a/readme.md +++ b/readme.md @@ -4,6 +4,8 @@ goctl +goctl rpc protoc ./generate/protobuf/member.proto --style=go_zero --go_out=./gen_result/pb --go-grpc_out=./gen_result/pb --zrpc_out=. + go get -d github.com/envoyproxy/protoc-gen-validate mockgen -source=./validate.go -destination=../../mock/lib/validate.go -package=lib