From e468ab323d3db01ff311136d91b6845b4450b53b Mon Sep 17 00:00:00 2001 From: truongpx396 Date: Sun, 8 Oct 2023 05:37:00 +0000 Subject: [PATCH] cicd: robot automated Change --- tools/data-conversion/chat/conversion/cmd.go | 1 + tools/data-conversion/chat/main.go | 6 +- tools/data-conversion/chat/v2/admin.go | 38 ++++----- tools/data-conversion/chat/v2/chat.go | 90 ++++++++++---------- 4 files changed, 69 insertions(+), 66 deletions(-) diff --git a/tools/data-conversion/chat/conversion/cmd.go b/tools/data-conversion/chat/conversion/cmd.go index 295a95011..b0a32e6ff 100644 --- a/tools/data-conversion/chat/conversion/cmd.go +++ b/tools/data-conversion/chat/conversion/cmd.go @@ -2,6 +2,7 @@ package conversion import ( "fmt" + "gorm.io/gorm" "gorm.io/gorm/schema" ) diff --git a/tools/data-conversion/chat/main.go b/tools/data-conversion/chat/main.go index 8c07249d1..306bf15ad 100644 --- a/tools/data-conversion/chat/main.go +++ b/tools/data-conversion/chat/main.go @@ -2,10 +2,12 @@ package main import ( "fmt" - "github.com/openimsdk/open-im-server/v3/tools/data-conversion/chat/conversion" + "log" + "gorm.io/driver/mysql" "gorm.io/gorm" - "log" + + "github.com/openimsdk/open-im-server/v3/tools/data-conversion/chat/conversion" ) func main() { diff --git a/tools/data-conversion/chat/v2/admin.go b/tools/data-conversion/chat/v2/admin.go index 4e23e19c2..7bc1b6c1b 100644 --- a/tools/data-conversion/chat/v2/admin.go +++ b/tools/data-conversion/chat/v2/admin.go @@ -6,45 +6,45 @@ import ( // AppVersion pc端版本管理 type AppVersion struct { - Version string `gorm:"column:version;size:64" json:"version"` + Version string `gorm:"column:version;size:64" json:"version"` Type int `gorm:"column:type;primary_key" json:"type"` - UpdateTime int `gorm:"column:update_time" json:"update_time"` - ForceUpdate bool `gorm:"column:force_update" json:"force_update"` - FileName string `gorm:"column:file_name" json:"file_name"` - YamlName string `gorm:"column:yaml_name" json:"yaml_name"` - UpdateLog string `gorm:"column:update_log" json:"update_log"` + UpdateTime int `gorm:"column:update_time" json:"update_time"` + ForceUpdate bool `gorm:"column:force_update" json:"force_update"` + FileName string `gorm:"column:file_name" json:"file_name"` + YamlName string `gorm:"column:yaml_name" json:"yaml_name"` + UpdateLog string `gorm:"column:update_log" json:"update_log"` } // Admin 后台管理员 type Admin struct { Account string `gorm:"column:account;primary_key;type:char(64)" json:"account"` - Password string `gorm:"column:Password;type:char(64)" json:"password"` - FaceURL string `gorm:"column:FaceURL;type:char(64)" json:"faceURL"` - Nickname string `gorm:"column:Nickname;type:char(64)" json:"nickname"` - UserID string `gorm:"column:UserID;type:char(64)" json:"userID"` //openIM userID - Level int32 `gorm:"column:level;default:1" json:"level"` - CreateTime time.Time `gorm:"column:create_time" json:"createTime"` + Password string `gorm:"column:Password;type:char(64)" json:"password"` + FaceURL string `gorm:"column:FaceURL;type:char(64)" json:"faceURL"` + Nickname string `gorm:"column:Nickname;type:char(64)" json:"nickname"` + UserID string `gorm:"column:UserID;type:char(64)" json:"userID"` //openIM userID + Level int32 `gorm:"column:level;default:1" json:"level"` + CreateTime time.Time `gorm:"column:create_time" json:"createTime"` } // RegisterAddFriend 注册时默认好友 type RegisterAddFriend struct { UserID string `gorm:"column:user_id;primary_key;type:char(64)" json:"userID"` - CreateTime time.Time `gorm:"column:create_time" json:"createTime"` + CreateTime time.Time `gorm:"column:create_time" json:"createTime"` } // RegisterAddGroup 注册时默认群组 type RegisterAddGroup struct { GroupID string `gorm:"column:group_id;primary_key;type:char(64)" json:"userID"` - CreateTime time.Time `gorm:"column:create_time" json:"createTime"` + CreateTime time.Time `gorm:"column:create_time" json:"createTime"` } // ClientInitConfig 系统相关配置项 type ClientInitConfig struct { - DiscoverPageURL string `gorm:"column:discover_page_url;size:128" json:"discoverPageURL"` - OrdinaryUserAddFriend int32 `gorm:"column:ordinary_user_add_friend; default:1" json:"ordinaryUserAddFriend"` - BossUserID string `gorm:"column:boss_user_id;type:char(64)" json:"bossUserID"` - AdminURL string `gorm:"column:admin_url;type:char(128)" json:"adminURL"` - AllowSendMsgNotFriend int32 `gorm:"column:allow_send_msg_not_friend;default:1" json:"allowSendMsgNotFriend"` + DiscoverPageURL string `gorm:"column:discover_page_url;size:128" json:"discoverPageURL"` + OrdinaryUserAddFriend int32 `gorm:"column:ordinary_user_add_friend; default:1" json:"ordinaryUserAddFriend"` + BossUserID string `gorm:"column:boss_user_id;type:char(64)" json:"bossUserID"` + AdminURL string `gorm:"column:admin_url;type:char(128)" json:"adminURL"` + AllowSendMsgNotFriend int32 `gorm:"column:allow_send_msg_not_friend;default:1" json:"allowSendMsgNotFriend"` NeedInvitationCodeRegister int32 `gorm:"column:need_invitation_code_register;default:0" json:"needInvitationCodeRegister"` } diff --git a/tools/data-conversion/chat/v2/chat.go b/tools/data-conversion/chat/v2/chat.go index 100e2566f..6690e110b 100644 --- a/tools/data-conversion/chat/v2/chat.go +++ b/tools/data-conversion/chat/v2/chat.go @@ -7,89 +7,89 @@ import ( // Register 注册信息表 type Register struct { UserID string `gorm:"column:user_id;primary_key;type:char(64)" json:"userID"` - DeviceID string `gorm:"column:device_id;type:varchar(255)" json:"deviceID"` - IP string `gorm:"column:ip;type:varchar(32)" json:"ip"` - Platform string `gorm:"column:platform;type:varchar(32)" json:"platform"` - AccountType string `gorm:"column:account_type;type:varchar(32)" json:"accountType"` //email phone account - Mode string `gorm:"column:mode;type:varchar(32)"` //user admin - CreateTime time.Time `gorm:"column:create_time" json:"createTime"` + DeviceID string `gorm:"column:device_id;type:varchar(255)" json:"deviceID"` + IP string `gorm:"column:ip;type:varchar(32)" json:"ip"` + Platform string `gorm:"column:platform;type:varchar(32)" json:"platform"` + AccountType string `gorm:"column:account_type;type:varchar(32)" json:"accountType"` //email phone account + Mode string `gorm:"column:mode;type:varchar(32)"` //user admin + CreateTime time.Time `gorm:"column:create_time" json:"createTime"` } // Account 账号密码表 type Account struct { UserID string `gorm:"column:user_id;primary_key;type:char(64)" json:"userID"` - Password string `gorm:"column:password;type:varchar(255)" json:"password"` - CreateTime time.Time `gorm:"column:create_time" json:"createTime"` - ChangeTime time.Time `gorm:"column:change_time" json:"changeTime"` + Password string `gorm:"column:password;type:varchar(255)" json:"password"` + CreateTime time.Time `gorm:"column:create_time" json:"createTime"` + ChangeTime time.Time `gorm:"column:change_time" json:"changeTime"` OperatorUserID string `gorm:"column:operator_user_id;type:varchar(64)" json:"operatorUserID"` } // Attribute 用户属性表 type Attribute struct { UserID string `gorm:"column:user_id;primary_key;type:char(64)" json:"userID"` - Account string `gorm:"column:account;type:char(64)" json:"account"` - PhoneNumber string `gorm:"column:phone_number;type:varchar(32)" json:"phoneNumber"` - AreaCode string `gorm:"column:area_code;type:varchar(8)" json:"areaCode"` - Email string `gorm:"column:email;type:varchar(64)" json:"email"` - Nickname string `gorm:"column:nickname;type:varchar(64)" json:"nickname"` - FaceURL string `gorm:"column:face_url;type:varchar(255)" json:"faceURL"` - Gender int32 `gorm:"column:gender" json:"gender"` - Birth uint32 `gorm:"column:birth" json:"birth"` - CreateTime time.Time `gorm:"column:create_time" json:"createTime"` - ChangeTime time.Time `gorm:"column:change_time" json:"changeTime"` - BirthTime time.Time `gorm:"column:birth_time" json:"birthTime"` - Level int32 `gorm:"column:level;default:1" json:"level"` - AllowVibration int32 `gorm:"column:allow_vibration;default:1" json:"allowVibration"` - AllowBeep int32 `gorm:"column:allow_beep;default:1" json:"allowBeep"` - AllowAddFriend int32 `gorm:"column:allow_add_friend;default:1" json:"allowAddFriend"` + Account string `gorm:"column:account;type:char(64)" json:"account"` + PhoneNumber string `gorm:"column:phone_number;type:varchar(32)" json:"phoneNumber"` + AreaCode string `gorm:"column:area_code;type:varchar(8)" json:"areaCode"` + Email string `gorm:"column:email;type:varchar(64)" json:"email"` + Nickname string `gorm:"column:nickname;type:varchar(64)" json:"nickname"` + FaceURL string `gorm:"column:face_url;type:varchar(255)" json:"faceURL"` + Gender int32 `gorm:"column:gender" json:"gender"` + Birth uint32 `gorm:"column:birth" json:"birth"` + CreateTime time.Time `gorm:"column:create_time" json:"createTime"` + ChangeTime time.Time `gorm:"column:change_time" json:"changeTime"` + BirthTime time.Time `gorm:"column:birth_time" json:"birthTime"` + Level int32 `gorm:"column:level;default:1" json:"level"` + AllowVibration int32 `gorm:"column:allow_vibration;default:1" json:"allowVibration"` + AllowBeep int32 `gorm:"column:allow_beep;default:1" json:"allowBeep"` + AllowAddFriend int32 `gorm:"column:allow_add_friend;default:1" json:"allowAddFriend"` } // 封号表 type ForbiddenAccount struct { UserID string `gorm:"column:user_id;index:userID;primary_key;type:char(64)" json:"userID"` - CreateTime time.Time `gorm:"column:create_time" json:"createTime"` - Reason string `gorm:"column:reason;type:varchar(255)" json:"reason"` - OperatorUserID string `gorm:"column:operator_user_id;type:varchar(255)" json:"operatorUserID"` + CreateTime time.Time `gorm:"column:create_time" json:"createTime"` + Reason string `gorm:"column:reason;type:varchar(255)" json:"reason"` + OperatorUserID string `gorm:"column:operator_user_id;type:varchar(255)" json:"operatorUserID"` } // 用户登录信息表 type UserLoginRecord struct { - UserID string `gorm:"column:user_id;size:64" json:"userID"` - LoginTime time.Time `gorm:"column:login_time" json:"loginTime"` - IP string `gorm:"column:ip;type:varchar(32)" json:"ip"` + UserID string `gorm:"column:user_id;size:64" json:"userID"` + LoginTime time.Time `gorm:"column:login_time" json:"loginTime"` + IP string `gorm:"column:ip;type:varchar(32)" json:"ip"` DeviceID string `gorm:"column:device_id;type:varchar(255)" json:"deviceID"` - Platform string `gorm:"column:platform;type:varchar(32)" json:"platform"` + Platform string `gorm:"column:platform;type:varchar(32)" json:"platform"` } // 禁止ip登录 注册 type IPForbidden struct { IP string `gorm:"column:ip;primary_key;type:char(32)" json:"ip"` - LimitRegister int32 `gorm:"column:limit_register" json:"limitRegister"` - LimitLogin int32 `gorm:"column:limit_login" json:"limitLogin"` - CreateTime time.Time `gorm:"column:create_time" json:"createTime"` + LimitRegister int32 `gorm:"column:limit_register" json:"limitRegister"` + LimitLogin int32 `gorm:"column:limit_login" json:"limitLogin"` + CreateTime time.Time `gorm:"column:create_time" json:"createTime"` } // 限制userID只能在某些ip登录 type LimitUserLoginIP struct { UserID string `gorm:"column:user_id;primary_key;type:char(64)" json:"userID"` - IP string `gorm:"column:ip;primary_key;type:char(32)" json:"ip"` - CreateTime time.Time `gorm:"column:create_time" json:"createTime"` + IP string `gorm:"column:ip;primary_key;type:char(32)" json:"ip"` + CreateTime time.Time `gorm:"column:create_time" json:"createTime"` } // 邀请码被注册使用 type InvitationRegister struct { InvitationCode string `gorm:"column:invitation_code;primary_key;type:char(32)" json:"invitationCode"` - CreateTime time.Time `gorm:"column:create_time" json:"createTime"` - UsedByUserID string `gorm:"column:user_id;index:userID;type:char(64)" json:"usedByUserID"` + CreateTime time.Time `gorm:"column:create_time" json:"createTime"` + UsedByUserID string `gorm:"column:user_id;index:userID;type:char(64)" json:"usedByUserID"` } type SignalRecord struct { - FileName string `gorm:"column:file_name;primary_key;type:char(128)" json:"fileName"` + FileName string `gorm:"column:file_name;primary_key;type:char(128)" json:"fileName"` MediaType string `gorm:"column:media_type;type:char(64);index:media_type_index" json:"mediaType"` - RoomType string `gorm:"column:room_type;type:char(20)" json:"roomType"` - SenderID string `gorm:"column:sender_id;type:char(64);index:sender_id_index" json:"senderID"` - RecvID string `gorm:"column:recv_id;type:char(64);index:recv_id_index" json:"recvID"` - GroupID string `gorm:"column:group_id;type:char(64)" json:"groupID"` - DownloadURL string `gorm:"column:download_url;type:text" json:"downloadURL"` - CreateTime time.Time `gorm:"create_time;index:create_time_index" json:"createTime"` + RoomType string `gorm:"column:room_type;type:char(20)" json:"roomType"` + SenderID string `gorm:"column:sender_id;type:char(64);index:sender_id_index" json:"senderID"` + RecvID string `gorm:"column:recv_id;type:char(64);index:recv_id_index" json:"recvID"` + GroupID string `gorm:"column:group_id;type:char(64)" json:"groupID"` + DownloadURL string `gorm:"column:download_url;type:text" json:"downloadURL"` + CreateTime time.Time `gorm:"create_time;index:create_time_index" json:"createTime"` }