diff --git a/build/rpc.json b/build/rpc.json index 908d750..cf8c871 100644 --- a/build/rpc.json +++ b/build/rpc.json @@ -1692,7 +1692,9 @@ "responseMessageName": "RPCSuccess", "code": "rpc deleteAllDNSTasks(DeleteAllDNSTasksRequest) returns (RPCSuccess);", "doc": "删除所有同步任务", - "roles": [], + "roles": [ + "admin" + ], "isDeprecated": false } ], @@ -22742,7 +22744,7 @@ }, { "name": "User", - "code": "message User {\n\tint64 id = 1;\n\tstring username = 2;\n\tstring fullname = 3;\n\tstring mobile = 4;\n\tstring tel = 5;\n\tstring email = 6;\n\tstring verifiedEmail = 20;\n\tstring remark = 7;\n\tbool isOn = 8;\n\tint64 createdAt = 9;\n\tstring registeredIP = 12;\n\tbool isVerified = 13;\n\tbool isRejected = 14;\n\tstring rejectReason = 15;\n\tbool isDeleted = 16;\n\tbool isIndividualIdentified = 17;\n\tbool isEnterpriseIdentified = 18;\n\tstring bandwidthAlgo = 21; // 带宽算法\n\n\tLogin otpLogin = 19; // OTP认证\n\n\tNodeCluster nodeCluster = 10;\n\trepeated UserFeature features = 11;\n}", + "code": "message User {\n\tint64 id = 1; // 用户ID\n\tstring username = 2; // 用户名\n\tstring fullname = 3; // 全称\n\tstring mobile = 4;\n\tstring tel = 5;\n\tstring email = 6;\n\tstring verifiedEmail = 20;\n\tstring remark = 7;\n\tbool isOn = 8;\n\tint64 createdAt = 9;\n\tstring registeredIP = 12;\n\tbool isVerified = 13;\n\tbool isRejected = 14;\n\tstring rejectReason = 15;\n\tbool isDeleted = 16;\n\tbool isIndividualIdentified = 17;\n\tbool isEnterpriseIdentified = 18;\n\tstring bandwidthAlgo = 21; // 带宽算法\n\tstring lang = 22; // 语言代号\n\n\tLogin otpLogin = 19; // OTP认证\n\n\tNodeCluster nodeCluster = 10;\n\trepeated UserFeature features = 11;\n}", "doc": "" }, { diff --git a/pkg/langs/codes/codes.go b/pkg/langs/codes/codes.go index 8999d2e..c803e0a 100644 --- a/pkg/langs/codes/codes.go +++ b/pkg/langs/codes/codes.go @@ -355,12 +355,12 @@ const ( NodeTOA_LogUpdateClusterTOA langs.MessageCode = "node_toa@log_update_cluster_toa" // 修改集群 %d 的TOA设置 NS_LogCreateNSDomainsBatch langs.MessageCode = "ns@log_create_ns_domains_batch" // 批量添加域名 NS_LogCreateNSRecordsBatch langs.MessageCode = "ns@log_create_ns_records_batch" // 批量添加解析 - NS_LogDeleteNSDomainsBatch langs.MessageCode = "ns@log_delete_ns_domains_batch" // 批量删除NS域名,用户 %d - NS_LogDeleteNSRecordsBatch langs.MessageCode = "ns@log_delete_ns_records_batch" // 批量删除NS域名记录 - NS_LogDisableNSRecordsBatch langs.MessageCode = "ns@log_disable_ns_records_batch" // 批量停用NS域名记录 - NS_LogEnableNSRecordsBatch langs.MessageCode = "ns@log_enable_ns_records_batch" // 批量启用NS域名记录 + NS_LogDeleteNSDomainsBatch langs.MessageCode = "ns@log_delete_ns_domains_batch" // 批量删除域名,用户 %d + NS_LogDeleteNSRecordsBatch langs.MessageCode = "ns@log_delete_ns_records_batch" // 批量删除域名记录 + NS_LogDisableNSRecordsBatch langs.MessageCode = "ns@log_disable_ns_records_batch" // 批量停用域名记录 + NS_LogEnableNSRecordsBatch langs.MessageCode = "ns@log_enable_ns_records_batch" // 批量启用域名记录 NS_LogImportRecordsBatch langs.MessageCode = "ns@log_import_records_batch" // 批量导入记录 - NS_LogUpdateNSRecordsBatch langs.MessageCode = "ns@log_update_ns_records_batch" // 批量修改NS域名记录 + NS_LogUpdateNSRecordsBatch langs.MessageCode = "ns@log_update_ns_records_batch" // 批量修改域名记录 NS_LogUpdateNSUserConfig langs.MessageCode = "ns@log_update_ns_user_config" // 修改NS全局设置--用户相关设置 NS_SettingAccessLogs langs.MessageCode = "ns@setting_access_logs" // 访问日志设置 NS_SettingUser langs.MessageCode = "ns@setting_user" // 用户设置 @@ -396,9 +396,10 @@ const ( NSDomain_LogUpdateNSDomainHealthCheck langs.MessageCode = "ns_domain@log_update_ns_domain_health_check" // 修改域名 %d 健康检查设置 NSDomain_LogUpdateNSDomainStatus langs.MessageCode = "ns_domain@log_update_ns_domain_status" // 修改域名 %d 状态为 %s NSDomain_LogUpdateNSDomainTSIG langs.MessageCode = "ns_domain@log_update_ns_domain_tsig" // 修改域名 %d 的TSIG配置 - NSDomainGroup_LogCreateNSDomainGroup langs.MessageCode = "ns_domain_group@log_create_ns_domain_group" // 创建NS域名分组 %d - NSDomainGroup_LogDeleteNSDomainGroup langs.MessageCode = "ns_domain_group@log_delete_ns_domain_group" // 删除NS域名分组 %d - NSDomainGroup_LogUpdateNSDomainGroup langs.MessageCode = "ns_domain_group@log_update_ns_domain_group" // 修改NS域名分组 %d + NSDomain_LogValidateNSDomains langs.MessageCode = "ns_domain@log_validate_ns_domains" // 批量验证域名 + NSDomainGroup_LogCreateNSDomainGroup langs.MessageCode = "ns_domain_group@log_create_ns_domain_group" // 创建域名分组 %d + NSDomainGroup_LogDeleteNSDomainGroup langs.MessageCode = "ns_domain_group@log_delete_ns_domain_group" // 删除域名分组 %d + NSDomainGroup_LogUpdateNSDomainGroup langs.MessageCode = "ns_domain_group@log_update_ns_domain_group" // 修改域名分组 %d NSKey_LogCreateNSKey langs.MessageCode = "ns_key@log_create_ns_key" // 创建DNS密钥 %d NSKey_LogDeleteNSKey langs.MessageCode = "ns_key@log_delete_ns_key" // 删除DNS密钥 %d NSKey_LogUpdateNSKey langs.MessageCode = "ns_key@log_update_ns_key" // 修改DNS密钥 %d @@ -414,8 +415,8 @@ const ( NSPlan_LogDeleteNSPlan langs.MessageCode = "ns_plan@log_delete_ns_plan" // 删除套餐 %d NSPlan_LogSortNSPlans langs.MessageCode = "ns_plan@log_sort_ns_plans" // 套餐排序 NSPlan_LogUpdateNSPlan langs.MessageCode = "ns_plan@log_update_ns_plan" // 修改套餐 %d - NSRecord_LogCreateNSRecord langs.MessageCode = "ns_record@log_create_ns_record" // 创建NS域名记录 %d - NSRecord_LogCreateNSRecordsBatch langs.MessageCode = "ns_record@log_create_ns_records_batch" // 批量创建NS域名记录 + NSRecord_LogCreateNSRecord langs.MessageCode = "ns_record@log_create_ns_record" // 创建域名记录 %d + NSRecord_LogCreateNSRecordsBatch langs.MessageCode = "ns_record@log_create_ns_records_batch" // 批量创建域名记录 NSRecord_LogDeleteNSRecord langs.MessageCode = "ns_record@log_delete_ns_record" // 删除域名记录 %d NSRecord_LogUpNSRecord langs.MessageCode = "ns_record@log_up_ns_record" // 手动设置DNS记录 %d 为上线状态 NSRecord_LogUpdateNSRecord langs.MessageCode = "ns_record@log_update_ns_record" // 修改域名记录 %d @@ -466,12 +467,17 @@ const ( Server_CopySettingSelectGroup langs.MessageCode = "server@copy_setting_select_group" // 选择分组 Server_CopySettingSelectServer langs.MessageCode = "server@copy_setting_select_server" // 选择网站 Server_CopySettingSelectUser langs.MessageCode = "server@copy_setting_select_user" // 选择用户 - Server_LogCopyServerConfigs langs.MessageCode = "server@log_copy_server_configs" // 从服务 %d 中同步配置 %s + Server_LogCopyServerConfigs langs.MessageCode = "server@log_copy_server_configs" // 从网站 %d 中同步配置 %s Server_LogCreateServer langs.MessageCode = "server@log_create_server" // 创建网站 %d Server_LogDeleteServer langs.MessageCode = "server@log_delete_server" // 删除网站 %d - Server_LogSubmitAuditingServer langs.MessageCode = "server@log_submit_auditing_server" // 提交服务 %d 域名审核 + Server_LogDisableServer langs.MessageCode = "server@log_disable_server" // 停用网站 %d + Server_LogEnableServer langs.MessageCode = "server@log_enable_server" // 启用网站 %d + Server_LogSubmitAuditingServer langs.MessageCode = "server@log_submit_auditing_server" // 提交网站 %d 域名审核 Server_LogUpdateGlobalSettings langs.MessageCode = "server@log_update_global_settings" // 保存网站全局配置 Server_LogUpdateServerBasic langs.MessageCode = "server@log_update_server_basic" // 修改网站 %d 基本信息 + Server_LogUpdateServerGroups langs.MessageCode = "server@log_update_server_groups" // 修改网站 %d 所属分组 + Server_LogUpdateServerIsOn langs.MessageCode = "server@log_update_server_is_on" // 修改网站 %d 启用状态 + Server_LogUpdateServerName langs.MessageCode = "server@log_update_server_name" // 修改网站名称 Server_MenuAccesslogHistory langs.MessageCode = "server@menu_accesslog_history" // 历史 Server_MenuAccesslogRealtime langs.MessageCode = "server@menu_accesslog_realtime" // 实时 Server_MenuAccesslogToday langs.MessageCode = "server@menu_accesslog_today" // 今天 @@ -544,11 +550,11 @@ const ( ServerCC_LogUpdateCCSettings langs.MessageCode = "server_cc@log_update_cc_settings" // 修改Web %d CC防护配置 ServerCC_LogUpdateClusterHTTPCCPolicy langs.MessageCode = "server_cc@log_update_cluster_http_cc_policy" // 修改集群 %d 的HTTP CC策略设置 ServerCharset_LogUpdateCharsetSetting langs.MessageCode = "server_charset@log_update_charset_setting" // 修改Web %d 的字符集设置 - ServerCommon_LogUpdateCommonSettings langs.MessageCode = "server_common@log_update_common_settings" // 修改服务Web %d 设置的其他设置 + ServerCommon_LogUpdateCommonSettings langs.MessageCode = "server_common@log_update_common_settings" // 修改网站Web %d 设置的其他设置 ServerCompression_LogUpdateCompressionSettings langs.MessageCode = "server_compression@log_update_compression_settings" // 修改Web %d 的压缩设置 - ServerDNS_LogRegenerateDNSName langs.MessageCode = "server_dns@log_regenerate_dns_name" // 重新生成服务 %d 的CNAME - ServerDNS_LogUpdateDNSName langs.MessageCode = "server_dns@log_update_dns_name" // 修改服务 %d CNAME为 %s - ServerDNS_LogUpdateDNSSettings langs.MessageCode = "server_dns@log_update_dns_settings" // 修改服务 %d 的DNS设置 + ServerDNS_LogRegenerateDNSName langs.MessageCode = "server_dns@log_regenerate_dns_name" // 重新生成网站 %d 的CNAME + ServerDNS_LogUpdateDNSName langs.MessageCode = "server_dns@log_update_dns_name" // 修改网站 %d CNAME为 %s + ServerDNS_LogUpdateDNSSettings langs.MessageCode = "server_dns@log_update_dns_settings" // 修改网站 %d 的DNS设置 ServerFastcgi_LogUpdateHTTPFastcgi langs.MessageCode = "server_fastcgi@log_update_http_fastcgi" // 修改Web %d 的Fastcgi设置 ServerGlobalSetting_LogUpdateClusterGlobalServerConfig langs.MessageCode = "server_global_setting@log_update_cluster_global_server_config" // 修改集群 %d 全局配置 ServerGroup_LogCreateServerGroup langs.MessageCode = "server_group@log_create_server_group" // 创建网站分组 %d @@ -565,7 +571,7 @@ const ( ServerHTTPHeader_LogDeleteHeader langs.MessageCode = "server_http_header@log_delete_header" // 删除报头,HeaderPolicyId:%d, HeaderId:%d ServerHTTPHeader_LogDeleteNonStandardHeader langs.MessageCode = "server_http_header@log_delete_non_standard_header" // 删除需要非标的报头,HeaderPolicyId:%d, HeaderName:%s ServerHTTPHeader_LogUpdateHTTPHeaders langs.MessageCode = "server_http_header@log_update_http_headers" // 修改Web %d 的报头设置 - ServerHTTPHeader_LogUpdateSettingHeader langs.MessageCode = "server_http_header@log_update_setting_header" // 修改设置报头,HeaderPolicyId:%d, Name:%s, Value:%s + ServerHTTPHeader_LogUpdateSettingHeader langs.MessageCode = "server_http_header@log_update_setting_header" // 修改设置报头,HeaderId:%d, Name:%s, Value:%s ServerHTTPS_LogUpdateHTTPSSettings langs.MessageCode = "server_https@log_update_https_settings" // 修改网站 %d 的HTTPS设置 ServerOrigin_LogCreateOrigin langs.MessageCode = "server_origin@log_create_origin" // 创建源站 %d ServerOrigin_LogDeleteOrigin langs.MessageCode = "server_origin@log_delete_origin" // 删除源站 %d @@ -579,12 +585,12 @@ const ( ServerRequestLimit_LogUpdateRequestLimitSettings langs.MessageCode = "server_request_limit@log_update_request_limit_settings" // 修改Web %d 请求限制 ServerReverseProxy_LogUpdateLocationReverseProxySettings langs.MessageCode = "server_reverse_proxy@log_update_location_reverse_proxy_settings" // 修改路由规则 %d 的反向代理设置 ServerReverseProxy_LogUpdateServerGroupReverseProxySettings langs.MessageCode = "server_reverse_proxy@log_update_server_group_reverse_proxy_settings" // 修改分组 %d 的反向代理设置 - ServerReverseProxy_LogUpdateServerReverseProxySettings langs.MessageCode = "server_reverse_proxy@log_update_server_reverse_proxy_settings" // 修改代理服务 %d 的反向代理设置 + ServerReverseProxy_LogUpdateServerReverseProxySettings langs.MessageCode = "server_reverse_proxy@log_update_server_reverse_proxy_settings" // 修改网站 %d 的反向代理设置 ServerRoot_LogUpdateRoot langs.MessageCode = "server_root@log_update_root" // 修改Web %d 静态分发设置 ServerScript_LogUpdateScripts langs.MessageCode = "server_script@log_update_scripts" // 修改Web %d 边缘脚本 ServerStat_LogUpdateStatSettings langs.MessageCode = "server_stat@log_update_stat_settings" // 修改Web %d 的统计设置 ServerTCP_LogUpdateTCPSettings langs.MessageCode = "server_tcp@log_update_tcp_settings" // 修改网站 %d TCP设置 - ServerTLS_LogUpdateTLSSettings langs.MessageCode = "server_tls@log_update_tls_settings" // 修改代理服务 %d TLS设置 + ServerTLS_LogUpdateTLSSettings langs.MessageCode = "server_tls@log_update_tls_settings" // 修改网站 %d TLS设置 ServerTrafficLimit_LogUpdateTrafficLimitSettings langs.MessageCode = "server_traffic_limit@log_update_traffic_limit_settings" // 修改网站 %d 流量限制 ServerTrafficStat_AllServers langs.MessageCode = "server_traffic_stat@all_servers" // 全部网站(%d) ServerUAM_LogUpdateClusterUAMPolicy langs.MessageCode = "server_uam@log_update_cluster_uam_policy" // 修改集群 %d 的UAM设置 @@ -624,6 +630,9 @@ const ( User_LogUpdateUserEmailSettings langs.MessageCode = "user@log_update_user_email_settings" // 修改用户邮件设置 User_LogUpdateUserFeatures langs.MessageCode = "user@log_update_user_features" // 设置用户 %d 的功能列表 User_LogUpdateUserGlobalSettings langs.MessageCode = "user@log_update_user_global_settings" // 修改用户设置 + User_LogUpdateUserPricePeriod langs.MessageCode = "user@log_update_user_price_period" // 修改计费周期为 %s + User_LogUpdateUserPriceType langs.MessageCode = "user@log_update_user_price_type" // 修改计费类型为 %s + User_LogUpdateUserProfile langs.MessageCode = "user@log_update_user_profile" // 修改个人资料 User_LogVerifyUser langs.MessageCode = "user@log_verify_user" // 审核用户:%d 结果:%s UserAccessKey_LogCreateUserAccessKey langs.MessageCode = "user_access_key@log_create_user_access_key" // 创建AccessKey %d UserAccessKey_LogDeleteUserAccessKey langs.MessageCode = "user_access_key@log_delete_user_access_key" // 删除AccessKey %d @@ -633,16 +642,28 @@ const ( UserADInstance_LogRenewUserADInstance langs.MessageCode = "user_ad_instance@log_renew_user_ad_instance" // 为用户高防实例 %d 续期 UserADInstance_LogUpdateUserADInstanceObjects langs.MessageCode = "user_ad_instance@log_update_user_ad_instance_objects" // 修改用户高防实例 %d 防护对象 UserBill_LogPayUserBill langs.MessageCode = "user_bill@log_pay_user_bill" // 支付账单 %d + UserCommon_Canceled langs.MessageCode = "user_common@canceled" // 已取消 + UserCommon_LogSystemError langs.MessageCode = "user_common@log_system_error" // 系统发生错误:%s + UserCommon_ServerError langs.MessageCode = "user_common@server_error" // 服务器出了点小问题,请联系技术人员处理。 + UserCommon_System langs.MessageCode = "user_common@system" // 系统 + UserIdentity_LogCancelUserIdentity langs.MessageCode = "user_identity@log_cancel_user_identity" // 取消身份认证审核 UserIdentity_LogRejectUserIdentity langs.MessageCode = "user_identity@log_reject_user_identity" // 驳回用户 %d 的实名认证 UserIdentity_LogResetUserIdentity langs.MessageCode = "user_identity@log_reset_user_identity" // 重置用户 %d 的实名认证 + UserIdentity_LogSubmitUserIdentity langs.MessageCode = "user_identity@log_submit_user_identity" // 提交身份认证审核 + UserIdentity_LogUpdateUserIdentityEnterprise langs.MessageCode = "user_identity@log_update_user_identity_enterprise" // 修改/上传企业实名认证信息 + UserIdentity_LogUpdateUserIdentityIndividual langs.MessageCode = "user_identity@log_update_user_identity_individual" // 修改/上传个人实名认证信息 UserIdentity_LogVerifyUserIdentity langs.MessageCode = "user_identity@log_verify_user_identity" // 通过用户 %d 的实名认证 + UserLogin_LogUpdateLogin langs.MessageCode = "user_login@log_update_login" // 修改登录设置 UserNode_LogCreateUserNode langs.MessageCode = "user_node@log_create_user_node" // 创建用户节点 %d UserNode_LogDeleteUserNode langs.MessageCode = "user_node@log_delete_user_node" // 删除用户节点 %d UserNode_LogUpdateUserNode langs.MessageCode = "user_node@log_update_user_node" // 修改用户节点 %d UserOrder_LogFinishUserOrder langs.MessageCode = "user_order@log_finish_user_order" // 设置订单 %s 为完成支付 + UserPlan_LogBindUserPlanToServer langs.MessageCode = "user_plan@log_bind_user_plan_to_server" // 修改网站 %d 绑定的套餐为 %d UserPlan_LogBuyUserPlan langs.MessageCode = "user_plan@log_buy_user_plan" // 为用户 %d 购买套餐 %d + UserPlan_LogCancelUserPlanFromServer langs.MessageCode = "user_plan@log_cancel_user_plan_from_server" // 取消网站 %d 绑定的套餐 UserPlan_LogDeleteUserPlan langs.MessageCode = "user_plan@log_delete_user_plan" // 删除用户已购套餐 %d UserPlan_LogRenewUserPlan langs.MessageCode = "user_plan@log_renew_user_plan" // 续费已购套餐 %d + UserTicket_LogCreateUserTicket langs.MessageCode = "user_ticket@log_create_user_ticket" // 创建工单 %d UserTicketLog_LogReplyTicket langs.MessageCode = "user_ticket_log@log_reply_ticket" // 回复工单 %d UserTrafficPackage_LogCreateUserTrafficPackage langs.MessageCode = "user_traffic_package@log_create_user_traffic_package" // 为用户 %d 创建流量包:%d,区域:%d,有效期:%d,数量:%d UserTrafficPackage_LogDeleteUserTrafficPackage langs.MessageCode = "user_traffic_package@log_delete_user_traffic_package" // 删除用户流量包 %d diff --git a/pkg/langs/messages/messages_zh_cn.go b/pkg/langs/messages/messages_zh_cn.go index 4ec4f32..4309cce 100644 --- a/pkg/langs/messages/messages_zh_cn.go +++ b/pkg/langs/messages/messages_zh_cn.go @@ -356,12 +356,12 @@ func init() { "node_toa@log_update_cluster_toa": "修改集群 %d 的TOA设置", "ns@log_create_ns_domains_batch": "批量添加域名", "ns@log_create_ns_records_batch": "批量添加解析", - "ns@log_delete_ns_domains_batch": "批量删除NS域名,用户 %d", - "ns@log_delete_ns_records_batch": "批量删除NS域名记录", - "ns@log_disable_ns_records_batch": "批量停用NS域名记录", - "ns@log_enable_ns_records_batch": "批量启用NS域名记录", + "ns@log_delete_ns_domains_batch": "批量删除域名,用户 %d", + "ns@log_delete_ns_records_batch": "批量删除域名记录", + "ns@log_disable_ns_records_batch": "批量停用域名记录", + "ns@log_enable_ns_records_batch": "批量启用域名记录", "ns@log_import_records_batch": "批量导入记录", - "ns@log_update_ns_records_batch": "批量修改NS域名记录", + "ns@log_update_ns_records_batch": "批量修改域名记录", "ns@log_update_ns_user_config": "修改NS全局设置--用户相关设置", "ns@setting_access_logs": "访问日志设置", "ns@setting_user": "用户设置", @@ -397,9 +397,10 @@ func init() { "ns_domain@log_update_ns_domain_health_check": "修改域名 %d 健康检查设置", "ns_domain@log_update_ns_domain_status": "修改域名 %d 状态为 %s", "ns_domain@log_update_ns_domain_tsig": "修改域名 %d 的TSIG配置", - "ns_domain_group@log_create_ns_domain_group": "创建NS域名分组 %d", - "ns_domain_group@log_delete_ns_domain_group": "删除NS域名分组 %d", - "ns_domain_group@log_update_ns_domain_group": "修改NS域名分组 %d", + "ns_domain@log_validate_ns_domains": "批量验证域名", + "ns_domain_group@log_create_ns_domain_group": "创建域名分组 %d", + "ns_domain_group@log_delete_ns_domain_group": "删除域名分组 %d", + "ns_domain_group@log_update_ns_domain_group": "修改域名分组 %d", "ns_key@log_create_ns_key": "创建DNS密钥 %d", "ns_key@log_delete_ns_key": "删除DNS密钥 %d", "ns_key@log_update_ns_key": "修改DNS密钥 %d", @@ -415,8 +416,8 @@ func init() { "ns_plan@log_delete_ns_plan": "删除套餐 %d", "ns_plan@log_sort_ns_plans": "套餐排序", "ns_plan@log_update_ns_plan": "修改套餐 %d", - "ns_record@log_create_ns_record": "创建NS域名记录 %d", - "ns_record@log_create_ns_records_batch": "批量创建NS域名记录", + "ns_record@log_create_ns_record": "创建域名记录 %d", + "ns_record@log_create_ns_records_batch": "批量创建域名记录", "ns_record@log_delete_ns_record": "删除域名记录 %d", "ns_record@log_up_ns_record": "手动设置DNS记录 %d 为上线状态", "ns_record@log_update_ns_record": "修改域名记录 %d", @@ -467,12 +468,17 @@ func init() { "server@copy_setting_select_group": "选择分组", "server@copy_setting_select_server": "选择网站", "server@copy_setting_select_user": "选择用户", - "server@log_copy_server_configs": "从服务 %d 中同步配置 %s", + "server@log_copy_server_configs": "从网站 %d 中同步配置 %s", "server@log_create_server": "创建网站 %d", "server@log_delete_server": "删除网站 %d", - "server@log_submit_auditing_server": "提交服务 %d 域名审核", + "server@log_disable_server": "停用网站 %d", + "server@log_enable_server": "启用网站 %d", + "server@log_submit_auditing_server": "提交网站 %d 域名审核", "server@log_update_global_settings": "保存网站全局配置", "server@log_update_server_basic": "修改网站 %d 基本信息", + "server@log_update_server_groups": "修改网站 %d 所属分组", + "server@log_update_server_is_on": "修改网站 %d 启用状态", + "server@log_update_server_name": "修改网站名称", "server@menu_accesslog_history": "历史", "server@menu_accesslog_realtime": "实时", "server@menu_accesslog_today": "今天", @@ -545,11 +551,11 @@ func init() { "server_cc@log_update_cc_settings": "修改Web %d CC防护配置", "server_cc@log_update_cluster_http_cc_policy": "修改集群 %d 的HTTP CC策略设置", "server_charset@log_update_charset_setting": "修改Web %d 的字符集设置", - "server_common@log_update_common_settings": "修改服务Web %d 设置的其他设置", + "server_common@log_update_common_settings": "修改网站Web %d 设置的其他设置", "server_compression@log_update_compression_settings": "修改Web %d 的压缩设置", - "server_dns@log_regenerate_dns_name": "重新生成服务 %d 的CNAME", - "server_dns@log_update_dns_name": "修改服务 %d CNAME为 %s", - "server_dns@log_update_dns_settings": "修改服务 %d 的DNS设置", + "server_dns@log_regenerate_dns_name": "重新生成网站 %d 的CNAME", + "server_dns@log_update_dns_name": "修改网站 %d CNAME为 %s", + "server_dns@log_update_dns_settings": "修改网站 %d 的DNS设置", "server_fastcgi@log_update_http_fastcgi": "修改Web %d 的Fastcgi设置", "server_global_setting@log_update_cluster_global_server_config": "修改集群 %d 全局配置", "server_group@log_create_server_group": "创建网站分组 %d", @@ -566,7 +572,7 @@ func init() { "server_http_header@log_delete_header": "删除报头,HeaderPolicyId:%d, HeaderId:%d", "server_http_header@log_delete_non_standard_header": "删除需要非标的报头,HeaderPolicyId:%d, HeaderName:%s", "server_http_header@log_update_http_headers": "修改Web %d 的报头设置", - "server_http_header@log_update_setting_header": "修改设置报头,HeaderPolicyId:%d, Name:%s, Value:%s", + "server_http_header@log_update_setting_header": "修改设置报头,HeaderId:%d, Name:%s, Value:%s", "server_https@log_update_https_settings": "修改网站 %d 的HTTPS设置", "server_origin@log_create_origin": "创建源站 %d", "server_origin@log_delete_origin": "删除源站 %d", @@ -580,12 +586,12 @@ func init() { "server_request_limit@log_update_request_limit_settings": "修改Web %d 请求限制", "server_reverse_proxy@log_update_location_reverse_proxy_settings": "修改路由规则 %d 的反向代理设置", "server_reverse_proxy@log_update_server_group_reverse_proxy_settings": "修改分组 %d 的反向代理设置", - "server_reverse_proxy@log_update_server_reverse_proxy_settings": "修改代理服务 %d 的反向代理设置", + "server_reverse_proxy@log_update_server_reverse_proxy_settings": "修改网站 %d 的反向代理设置", "server_root@log_update_root": "修改Web %d 静态分发设置", "server_script@log_update_scripts": "修改Web %d 边缘脚本", "server_stat@log_update_stat_settings": "修改Web %d 的统计设置", "server_tcp@log_update_tcp_settings": "修改网站 %d TCP设置", - "server_tls@log_update_tls_settings": "修改代理服务 %d TLS设置", + "server_tls@log_update_tls_settings": "修改网站 %d TLS设置", "server_traffic_limit@log_update_traffic_limit_settings": "修改网站 %d 流量限制", "server_traffic_stat@all_servers": "全部网站(%d)", "server_uam@log_update_cluster_uam_policy": "修改集群 %d 的UAM设置", @@ -625,6 +631,9 @@ func init() { "user@log_update_user_email_settings": "修改用户邮件设置", "user@log_update_user_features": "设置用户 %d 的功能列表", "user@log_update_user_global_settings": "修改用户设置", + "user@log_update_user_price_period": "修改计费周期为 %s", + "user@log_update_user_price_type": "修改计费类型为 %s", + "user@log_update_user_profile": "修改个人资料", "user@log_verify_user": "审核用户:%d 结果:%s", "user_access_key@log_create_user_access_key": "创建AccessKey %d", "user_access_key@log_delete_user_access_key": "删除AccessKey %d", @@ -634,16 +643,28 @@ func init() { "user_ad_instance@log_renew_user_ad_instance": "为用户高防实例 %d 续期", "user_ad_instance@log_update_user_ad_instance_objects": "修改用户高防实例 %d 防护对象", "user_bill@log_pay_user_bill": "支付账单 %d", + "user_common@canceled": "已取消", + "user_common@log_system_error": "系统发生错误:%s", + "user_common@server_error": "服务器出了点小问题,请联系技术人员处理。", + "user_common@system": "系统", + "user_identity@log_cancel_user_identity": "取消身份认证审核", "user_identity@log_reject_user_identity": "驳回用户 %d 的实名认证", "user_identity@log_reset_user_identity": "重置用户 %d 的实名认证", + "user_identity@log_submit_user_identity": "提交身份认证审核", + "user_identity@log_update_user_identity_enterprise": "修改/上传企业实名认证信息", + "user_identity@log_update_user_identity_individual": "修改/上传个人实名认证信息", "user_identity@log_verify_user_identity": "通过用户 %d 的实名认证", + "user_login@log_update_login": "修改登录设置", "user_node@log_create_user_node": "创建用户节点 %d", "user_node@log_delete_user_node": "删除用户节点 %d", "user_node@log_update_user_node": "修改用户节点 %d", "user_order@log_finish_user_order": "设置订单 %s 为完成支付", + "user_plan@log_bind_user_plan_to_server": "修改网站 %d 绑定的套餐为 %d", "user_plan@log_buy_user_plan": "为用户 %d 购买套餐 %d", + "user_plan@log_cancel_user_plan_from_server": "取消网站 %d 绑定的套餐", "user_plan@log_delete_user_plan": "删除用户已购套餐 %d", "user_plan@log_renew_user_plan": "续费已购套餐 %d", + "user_ticket@log_create_user_ticket": "创建工单 %d", "user_ticket_log@log_reply_ticket": "回复工单 %d", "user_traffic_package@log_create_user_traffic_package": "为用户 %d 创建流量包:%d,区域:%d,有效期:%d,数量:%d", "user_traffic_package@log_delete_user_traffic_package": "删除用户流量包 %d", diff --git a/pkg/langs/protos/zh-cn/ns.json b/pkg/langs/protos/zh-cn/ns.json index de90f23..3b86fc5 100644 --- a/pkg/langs/protos/zh-cn/ns.json +++ b/pkg/langs/protos/zh-cn/ns.json @@ -3,13 +3,13 @@ "setting_access_logs": "访问日志设置", "log_create_ns_records_batch": "批量添加解析", - "log_delete_ns_domains_batch": "批量删除NS域名,用户 %d", - "log_delete_ns_records_batch": "批量删除NS域名记录", - "log_enable_ns_records_batch": "批量启用NS域名记录", - "log_disable_ns_records_batch": "批量停用NS域名记录", + "log_delete_ns_domains_batch": "批量删除域名,用户 %d", + "log_delete_ns_records_batch": "批量删除域名记录", + "log_enable_ns_records_batch": "批量启用域名记录", + "log_disable_ns_records_batch": "批量停用域名记录", "log_import_records_batch": "批量导入记录", "log_create_ns_domains_batch": "批量添加域名", - "log_update_ns_records_batch": "批量修改NS域名记录", + "log_update_ns_records_batch": "批量修改域名记录", "log_update_ns_user_config": "修改NS全局设置--用户相关设置" } \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/ns_domain.json b/pkg/langs/protos/zh-cn/ns_domain.json index 9b1e33d..810767c 100644 --- a/pkg/langs/protos/zh-cn/ns_domain.json +++ b/pkg/langs/protos/zh-cn/ns_domain.json @@ -6,5 +6,7 @@ "log_update_ns_domain": "修改域名 %d", "log_update_ns_domain_health_check": "修改域名 %d 健康检查设置", - "log_update_ns_domain_tsig": "修改域名 %d 的TSIG配置" + "log_update_ns_domain_tsig": "修改域名 %d 的TSIG配置", + + "log_validate_ns_domains": "批量验证域名" } \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/ns_domain_group.json b/pkg/langs/protos/zh-cn/ns_domain_group.json index ebf8d80..e225b24 100644 --- a/pkg/langs/protos/zh-cn/ns_domain_group.json +++ b/pkg/langs/protos/zh-cn/ns_domain_group.json @@ -1,5 +1,5 @@ { - "log_create_ns_domain_group": "创建NS域名分组 %d", - "log_delete_ns_domain_group": "删除NS域名分组 %d", - "log_update_ns_domain_group": "修改NS域名分组 %d" + "log_create_ns_domain_group": "创建域名分组 %d", + "log_delete_ns_domain_group": "删除域名分组 %d", + "log_update_ns_domain_group": "修改域名分组 %d" } \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/ns_record.json b/pkg/langs/protos/zh-cn/ns_record.json index d5c6131..18dffb1 100644 --- a/pkg/langs/protos/zh-cn/ns_record.json +++ b/pkg/langs/protos/zh-cn/ns_record.json @@ -1,6 +1,6 @@ { - "log_create_ns_records_batch": "批量创建NS域名记录", - "log_create_ns_record": "创建NS域名记录 %d", + "log_create_ns_records_batch": "批量创建域名记录", + "log_create_ns_record": "创建域名记录 %d", "log_delete_ns_record": "删除域名记录 %d", "log_update_ns_record_health_check": "修改记录 %d 的健康检查", "log_update_ns_record": "修改域名记录 %d", diff --git a/pkg/langs/protos/zh-cn/server.json b/pkg/langs/protos/zh-cn/server.json index 522e0b5..5d97cbc 100644 --- a/pkg/langs/protos/zh-cn/server.json +++ b/pkg/langs/protos/zh-cn/server.json @@ -73,7 +73,12 @@ "log_delete_server": "删除网站 %d", "log_update_server_basic": "修改网站 %d 基本信息", - "log_copy_server_configs": "从服务 %d 中同步配置 %s", + "log_copy_server_configs": "从网站 %d 中同步配置 %s", - "log_submit_auditing_server": "提交服务 %d 域名审核" + "log_submit_auditing_server": "提交网站 %d 域名审核", + "log_update_server_groups": "修改网站 %d 所属分组", + "log_enable_server": "启用网站 %d", + "log_disable_server": "停用网站 %d", + "log_update_server_name": "修改网站名称", + "log_update_server_is_on":"修改网站 %d 启用状态" } \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/server_common.json b/pkg/langs/protos/zh-cn/server_common.json index 3d1f3b5..f09e3d7 100644 --- a/pkg/langs/protos/zh-cn/server_common.json +++ b/pkg/langs/protos/zh-cn/server_common.json @@ -1,3 +1,3 @@ { - "log_update_common_settings": "修改服务Web %d 设置的其他设置" + "log_update_common_settings": "修改网站Web %d 设置的其他设置" } \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/server_dns.json b/pkg/langs/protos/zh-cn/server_dns.json index ffbb413..e01fc4c 100644 --- a/pkg/langs/protos/zh-cn/server_dns.json +++ b/pkg/langs/protos/zh-cn/server_dns.json @@ -1,5 +1,5 @@ { - "log_update_dns_settings": "修改服务 %d 的DNS设置", - "log_regenerate_dns_name": "重新生成服务 %d 的CNAME", - "log_update_dns_name": "修改服务 %d CNAME为 %s" + "log_update_dns_settings": "修改网站 %d 的DNS设置", + "log_regenerate_dns_name": "重新生成网站 %d 的CNAME", + "log_update_dns_name": "修改网站 %d CNAME为 %s" } \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/server_http_header.json b/pkg/langs/protos/zh-cn/server_http_header.json index 55f3bac..7e6a0c2 100644 --- a/pkg/langs/protos/zh-cn/server_http_header.json +++ b/pkg/langs/protos/zh-cn/server_http_header.json @@ -6,6 +6,6 @@ "log_delete_header": "删除报头,HeaderPolicyId:%d, HeaderId:%d", "log_delete_deleting_header": "删除需要删除的报头,HeaderPolicyId:%d, HeaderName:%s", "log_delete_non_standard_header": "删除需要非标的报头,HeaderPolicyId:%d, HeaderName:%s", - "log_update_setting_header": "修改设置报头,HeaderPolicyId:%d, Name:%s, Value:%s", + "log_update_setting_header": "修改设置报头,HeaderId:%d, Name:%s, Value:%s", "log_update_http_headers": "修改Web %d 的报头设置" } \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/server_reverse_proxy.json b/pkg/langs/protos/zh-cn/server_reverse_proxy.json index c7b5314..4cb729c 100644 --- a/pkg/langs/protos/zh-cn/server_reverse_proxy.json +++ b/pkg/langs/protos/zh-cn/server_reverse_proxy.json @@ -1,5 +1,5 @@ { "log_update_server_group_reverse_proxy_settings": "修改分组 %d 的反向代理设置", "log_update_location_reverse_proxy_settings": "修改路由规则 %d 的反向代理设置", - "log_update_server_reverse_proxy_settings": "修改代理服务 %d 的反向代理设置" + "log_update_server_reverse_proxy_settings": "修改网站 %d 的反向代理设置" } \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/server_tls.json b/pkg/langs/protos/zh-cn/server_tls.json index 044988c..9f03b27 100644 --- a/pkg/langs/protos/zh-cn/server_tls.json +++ b/pkg/langs/protos/zh-cn/server_tls.json @@ -1,3 +1,3 @@ { - "log_update_tls_settings": "修改代理服务 %d TLS设置" + "log_update_tls_settings": "修改网站 %d TLS设置" } \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/user.json b/pkg/langs/protos/zh-cn/user.json index f1875ca..3c347e9 100644 --- a/pkg/langs/protos/zh-cn/user.json +++ b/pkg/langs/protos/zh-cn/user.json @@ -5,5 +5,10 @@ "log_delete_user": "删除用户 %d", "log_update_user_features": "设置用户 %d 的功能列表", "log_update_user": "修改用户 %d", - "log_verify_user": "审核用户:%d 结果:%s" + "log_verify_user": "审核用户:%d 结果:%s", + + "log_update_user_profile": "修改个人资料", + + "log_update_user_price_period": "修改计费周期为 %s", + "log_update_user_price_type": "修改计费类型为 %s" } \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/user_common.json b/pkg/langs/protos/zh-cn/user_common.json new file mode 100644 index 0000000..fb8f426 --- /dev/null +++ b/pkg/langs/protos/zh-cn/user_common.json @@ -0,0 +1,7 @@ +{ + "system": "系统", + "canceled": "已取消", + + "server_error": "服务器出了点小问题,请联系技术人员处理。", + "log_system_error": "系统发生错误:%s" +} \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/user_identity.json b/pkg/langs/protos/zh-cn/user_identity.json index f5fca4e..8bdd9b9 100644 --- a/pkg/langs/protos/zh-cn/user_identity.json +++ b/pkg/langs/protos/zh-cn/user_identity.json @@ -1,5 +1,10 @@ { "log_reject_user_identity":"驳回用户 %d 的实名认证", "log_reset_user_identity": "重置用户 %d 的实名认证", - "log_verify_user_identity": "通过用户 %d 的实名认证" + "log_verify_user_identity": "通过用户 %d 的实名认证", + + "log_cancel_user_identity": "取消身份认证审核", + "log_submit_user_identity": "提交身份认证审核", + "log_update_user_identity_individual": "修改/上传个人实名认证信息", + "log_update_user_identity_enterprise": "修改/上传企业实名认证信息" } \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/user_login.json b/pkg/langs/protos/zh-cn/user_login.json new file mode 100644 index 0000000..5f7d886 --- /dev/null +++ b/pkg/langs/protos/zh-cn/user_login.json @@ -0,0 +1,3 @@ +{ + "log_update_login": "修改登录设置" +} \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/user_plan.json b/pkg/langs/protos/zh-cn/user_plan.json index 8976d34..9a555e9 100644 --- a/pkg/langs/protos/zh-cn/user_plan.json +++ b/pkg/langs/protos/zh-cn/user_plan.json @@ -1,5 +1,7 @@ { "log_buy_user_plan": "为用户 %d 购买套餐 %d", "log_delete_user_plan": "删除用户已购套餐 %d", - "log_renew_user_plan": "续费已购套餐 %d" + "log_renew_user_plan": "续费已购套餐 %d", + "log_cancel_user_plan_from_server": "取消网站 %d 绑定的套餐", + "log_bind_user_plan_to_server": "修改网站 %d 绑定的套餐为 %d" } \ No newline at end of file diff --git a/pkg/langs/protos/zh-cn/user_ticket.json b/pkg/langs/protos/zh-cn/user_ticket.json new file mode 100644 index 0000000..99a97ed --- /dev/null +++ b/pkg/langs/protos/zh-cn/user_ticket.json @@ -0,0 +1,3 @@ +{ + "log_create_user_ticket": "创建工单 %d" +} \ No newline at end of file diff --git a/pkg/rpc/pb/model_user.pb.go b/pkg/rpc/pb/model_user.pb.go index 99dc8a8..8732bcc 100644 --- a/pkg/rpc/pb/model_user.pb.go +++ b/pkg/rpc/pb/model_user.pb.go @@ -30,9 +30,9 @@ type User struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` - Fullname string `protobuf:"bytes,3,opt,name=fullname,proto3" json:"fullname,omitempty"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` // 用户ID + Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` // 用户名 + Fullname string `protobuf:"bytes,3,opt,name=fullname,proto3" json:"fullname,omitempty"` // 全称 Mobile string `protobuf:"bytes,4,opt,name=mobile,proto3" json:"mobile,omitempty"` Tel string `protobuf:"bytes,5,opt,name=tel,proto3" json:"tel,omitempty"` Email string `protobuf:"bytes,6,opt,name=email,proto3" json:"email,omitempty"` @@ -48,6 +48,7 @@ type User struct { IsIndividualIdentified bool `protobuf:"varint,17,opt,name=isIndividualIdentified,proto3" json:"isIndividualIdentified,omitempty"` IsEnterpriseIdentified bool `protobuf:"varint,18,opt,name=isEnterpriseIdentified,proto3" json:"isEnterpriseIdentified,omitempty"` BandwidthAlgo string `protobuf:"bytes,21,opt,name=bandwidthAlgo,proto3" json:"bandwidthAlgo,omitempty"` // 带宽算法 + Lang string `protobuf:"bytes,22,opt,name=lang,proto3" json:"lang,omitempty"` // 语言代号 OtpLogin *Login `protobuf:"bytes,19,opt,name=otpLogin,proto3" json:"otpLogin,omitempty"` // OTP认证 NodeCluster *NodeCluster `protobuf:"bytes,10,opt,name=nodeCluster,proto3" json:"nodeCluster,omitempty"` Features []*UserFeature `protobuf:"bytes,11,rep,name=features,proto3" json:"features,omitempty"` @@ -211,6 +212,13 @@ func (x *User) GetBandwidthAlgo() string { return "" } +func (x *User) GetLang() string { + if x != nil { + return x.Lang + } + return "" +} + func (x *User) GetOtpLogin() *Login { if x != nil { return x.OtpLogin @@ -242,7 +250,7 @@ var file_models_model_user_proto_rawDesc = []byte{ 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x18, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6c, 0x6f, - 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc1, 0x05, 0x0a, 0x04, 0x55, 0x73, + 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd5, 0x05, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 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, 0x1a, @@ -278,16 +286,18 @@ var file_models_model_user_proto_rawDesc = []byte{ 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x41, 0x6c, 0x67, 0x6f, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x41, 0x6c, 0x67, 0x6f, 0x12, 0x25, 0x0a, 0x08, 0x6f, 0x74, 0x70, 0x4c, 0x6f, 0x67, - 0x69, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x6f, - 0x67, 0x69, 0x6e, 0x52, 0x08, 0x6f, 0x74, 0x70, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x31, 0x0a, - 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, - 0x74, 0x65, 0x72, 0x52, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, - 0x12, 0x2b, 0x0a, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x65, 0x61, 0x74, - 0x75, 0x72, 0x65, 0x52, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x68, 0x41, 0x6c, 0x67, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x61, 0x6e, 0x67, 0x18, 0x16, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x61, 0x6e, 0x67, 0x12, 0x25, 0x0a, 0x08, 0x6f, 0x74, + 0x70, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x70, + 0x62, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x08, 0x6f, 0x74, 0x70, 0x4c, 0x6f, 0x67, 0x69, + 0x6e, 0x12, 0x31, 0x0a, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, + 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, + 0x73, 0x74, 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, + 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, + 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x08, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, + 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/pkg/rpc/protos/models/model_user.proto b/pkg/rpc/protos/models/model_user.proto index 60fa016..30712a8 100644 --- a/pkg/rpc/protos/models/model_user.proto +++ b/pkg/rpc/protos/models/model_user.proto @@ -8,9 +8,9 @@ import "models/model_user_feature.proto"; import "models/model_login.proto"; message User { - int64 id = 1; - string username = 2; - string fullname = 3; + int64 id = 1; // 用户ID + string username = 2; // 用户名 + string fullname = 3; // 全称 string mobile = 4; string tel = 5; string email = 6; @@ -26,6 +26,7 @@ message User { bool isIndividualIdentified = 17; bool isEnterpriseIdentified = 18; string bandwidthAlgo = 21; // 带宽算法 + string lang = 22; // 语言代号 Login otpLogin = 19; // OTP认证