Merge branch 'main' into bugfix/restart-bug

Author: mlhiter

frontend/desktop/.gitignore

@@ -42,5 +42,6 @@ yalc.lock
 
 config.yaml
 .env
+.env.local
 data/config.local.yaml
 #/prisma/region/generated/

frontend/desktop/package.json

@@ -42,7 +42,6 @@
     "decimal.js": "^10.4.3",
     "eslint": "8.38.0",
     "eslint-config-next": "13.3.0",
-    "formidable": "^3.5.1",
     "framer-motion": "^10.16.4",
     "i18next": "^23.11.5",
     "immer": "^10.0.2",
@@ -81,7 +80,6 @@
   "devDependencies": {
     "@testing-library/jest-dom": "^6.1.3",
     "@testing-library/react": "^14.0.0",
-    "@types/formidable": "^3.4.5",
     "@types/jest": "^29.5.10",
     "@types/js-cookie": "^3.0.4",
     "@types/js-yaml": "^4.0.6",

frontend/desktop/public/locales/en/common.json

@@ -3,6 +3,9 @@
   "accept": "Accept",
   "accept_invitation": "Accept Invitation",
   "access": "Access",
+  "account_bank_required": "Please enter the correct bank name of the enterprise",
+  "account_number": "Bank Account",
+  "account_number_required": "Please enter the correct recipient bank account of the enterprise",
   "account_settings": "Account Settings",
   "added": "Added",
   "agree_policy": "I have read and agree to the",
@@ -19,6 +22,7 @@
   "attachment": "appendix",
   "avatar": "Avatar",
   "balance": "Balance",
+  "bank_name": "Bank",
   "bind": "Link",
   "bind_success": "Binding successful",
   "bonus": "Bonus",
@@ -39,6 +43,9 @@
   "confirm": "Confirm",
   "confirm_again": "confirm again",
   "confirmnewpassword": "Confirm New Password",
+  "contact_info": "Phone Number",
+  "contact_info_must_be_numeric": "It must be a numeric string",
+  "contact_info_required": "Please enter the correct contact information",
   "core": "Core",
   "cost_center": "Cost Center",
   "create_team": "Create Workspace",
@@ -67,9 +74,22 @@
   "emailchangesuccess": "Email modified successfully",
   "enter": "Enter",
   "enter_confirm": "Please enter {{value}} to confirm",
+  "enterpriseKey": "Enterprise Name  (Bank Account Name)",
+  "enterpriseKeyPlaceholder": "Enter the name of your enterprise",
+  "enterprise_auth_tips": "We will deposit a small amount into your enterprise bank account.\nConfirm the amount to complete verification. ",
+  "enterprise_key": "Unified Social Credit Code",
+  "enterprise_key_required": "Please enter the correct Unified Social Credit Code (USCC) of the enterprise",
+  "enterprise_keyname": "Enterprise Name  (Bank Account Name) ",
+  "enterprise_keyname_placeholder": "Enter the name of your enterprise",
   "enterprise_name": "Company name",
-  "enterprise_name_required": "Please enter the correct company name",
-  "enterprise_verification": "Enterprise real name",
+  "enterprise_name_required": "Please enter the correct enterprise name",
+  "enterprise_realname_cancel_failed": "Cancellation failed.",
+  "enterprise_realname_cancel_success": "Cancellation successful.",
+  "enterprise_realname_payment_failed": "Verify that the payment amount failed to be transferred.",
+  "enterprise_realname_payment_success": "Verify that the amount has been transferred to your company's bank account.",
+  "enterprise_realname_verify_failed": "Enterprise real-name verification failed.",
+  "enterprise_realname_verify_success": "Enterprise real-name verification successful.",
+  "enterprise_verification": "Enterprise",
   "expected_to_use_next_month": "Usage for the next 30 days",
   "expected_used": "Estimated Runaway",
   "face_recognition_failed": "Personal real name failed",
@@ -83,6 +103,7 @@
   "generate_invitation_link": "Generate invitation link",
   "get_code": "verification",
   "get_code_failed": "Get code failed",
+  "get_verification_amount": "Request",
   "gift_amount": "Reward {{amount}} balance.",
   "github": "Github",
   "google": "Google",
@@ -109,6 +130,7 @@
   "invalid_phone_number": "Invalid phone number",
   "invalid_user_id": "Invalid User ID",
   "invalid_username_or_password": "Invalid username or password",
+  "invalid_verification_amount": "The verification amount format is invalid",
   "invalid_verification_code": "Invalid verification code",
   "invitation_reminder": "Invitation reminder",
   "invite_member": "Invite Member",
@@ -118,8 +140,10 @@
   "laf_on_sealos": "Laf on Sealos",
   "language": "Language",
   "launch_various_third-party_applications_with_one_click": "Launch various third-party applications with one click",
+  "legal_person": "Legal Representative",
   "license_buy": "License Buy",
   "link": "link",
+  "link_to_workorder": "Submit a Ticket",
   "loading": "Loading",
   "log_in": "Log In",
   "log_out": "Log Out",
@@ -149,7 +173,7 @@
   "next_time": "Next",
   "nickname": "Nickname",
   "no_apps_found": "No Apps Found",
-  "no_realname_auth": "NO REALNAME AUTH",
+  "no_realname_auth": "Identity Not Verified",
   "notification": "Notification",
   "noworkspacecreated": "You haven't created a workspace yet",
   "official_account_login": "Official account login",
@@ -168,17 +192,18 @@
   "payment_result": "Payment Result",
   "payment_status": "Payment Status",
   "payment_successful": "Payment Successful",
-  "personal_verification": "Personal real name",
+  "personal_verification": "Individual",
   "phone": "Phone",
   "phone_number_tips": "Phone Number",
   "phonechangesuccess": "Mobile phone number modified successfully",
   "please_enter": "Please enter",
+  "please_enter_account_number": "Enter the bank account number",
+  "please_enter_bank_name": "Enter a bank name",
+  "please_enter_contact_info": "Enter the phone number",
+  "please_enter_enterprise_key": "Enter the Unified Social Credit Code",
+  "please_enter_legal_person": "Enter the name of the legal representative",
   "please_enter_username": "Please enter your username",
-  "please_enter_your_enterprise_name": "Please enter your business name",
-  "please_fill_all_fields": "File cannot be empty",
-  "please_read_and_agree_to_the_agreement": "Please read and agree to the agreement",
-  "please_upload_the_business_license": "Please upload a photo of your business license",
-  "please_upload_the_supporting_materials": "Please sign and stamp the downloaded attachment and upload a photo",
+  "please_enter_verification_amount": "Enter the verification amount (in cents).",
   "privacy_policy": "Privacy Policy",
   "private_team_id_of_user": "User's ID",
   "purchase_history": "Purchase History",
@@ -190,12 +215,11 @@
   "read_all": "Read All",
   "read_and_agree": "Please read and agree to the agreement below",
   "realNameVerification": "Real Name Verification",
-  "realName_verification": "Real Name Verification",
+  "realName_verification": "Identity Verification",
   "realname_auth_now": "Click to verify your name",
   "realname_auth_reminder": "Real-name authentication reminder",
   "realname_auth_reminder_desc": "Real-name verification is required for regions in China. Without real-name verification, top-up will be restricted. Successful real-name verification will be rewarded with a {{reward}} Sealos balance.",
-  "realname_auth_tips_a": "1. Please ensure that the name, ID number and mobile phone number filled in are consistent.",
-  "realname_auth_tips_b": "2. The number segments provided by some virtual operators may not pass verification. Please apply for a work order and pass manual verification.",
+  "realname_auth_reminder_desc_no_reward": "Real-name verification is required for regions in China. Without real-name verification, top-up will be restricted.",
   "realname_info": "RealName",
   "receive_tips": "{{managerName}} invite you join in {{teamName}} as {{role}}",
   "recharge_amount": "Recharge Amount",
@@ -208,6 +232,7 @@
   "remain_other_region_resource_tips": "There are still associated resources that have not been deleted in your account. To help you successfully complete the account cancellation process, please clean up all region resources to ensure that nothing is missing.",
   "remain_template_tips": "There are still undeleted template resources in your account. To help you smoothly complete the account cancellation process, please manually delete all template resources to avoid data loss",
   "remain_workspace_tips": "There are still undeleted associated resources in your account. To help you successfully complete the account cancellation process, please clean up or transfer your workspace to avoid data loss.",
+  "remaining_attempts": "{{count}} times left",
   "remaining_time": "Remaining Time: ",
   "remove": "Remove",
   "remove_member_tips": "Determine that you want to remove the member?",
@@ -229,22 +254,23 @@
   "status": "Status",
   "storage": "Storage",
   "submit_error": "Submit Error",
-  "supporting_materials": "Proof material",
+  "submit_verification": "Submit ",
   "switching_disc": "Switching Disc",
   "team": "Workspace",
   "terminal": "Terminal",
   "the_invited_user_must_be_others": "The invited user must be others",
   "toggle_app_bar": "Toggle App Bar",
   "total_amount": "Total Amount",
+  "transAmt_not_match": "The verification amount does not match. Please note that the verification amount is in cents. For example, if the received amount is 0.23 yuan, enter 23.",
   "unbind": "Unbind",
   "unbind_success": "Unbinding successfully",
   "unbound": "Not Linked",
   "under_active_development": "Under active development 🚧",
   "unread": "Unread",
-  "upload_success": "Upload successful",
   "used_last_month": "Usage for the last 30 days",
   "used_resources": "Resources Used",
   "user_name": "User Name",
+  "user_name_required": "Please enter the correct name of the enterprise's legal representative",
   "username": "Username",
   "username_tips": "Username must be 3-16 characters, including letters, numbers",
   "usertask": {
@@ -255,6 +281,10 @@
     "task_launchpad_desc": "Create a container cluster with one click, automatically deploy container applications, and provide intranet/extranet access addresses",
     "task_launchpad_title": "Deploy App"
   },
+  "verification_amount": "Verification Amount",
+  "verification_amount_required": "The verification amount cannot be empty",
+  "verification_amount_tips": "Shanghai UnionPay will deposit a random amount into your bank account for\nverification, typically arriving in real-time. If not received in 3 business day, please ",
+  "verification_amount_tips2": "Please confirm the deposited verification amount with your finance team. It usually arrives in real-time.",
   "verification_code_login": "with Phone",
   "verify_code_tips": "6-digit Verification Code",
   "verify_password": "Verify password",
@@ -272,4 +302,4 @@
   "you_can_view_fees_through_the_fee_center": "You can view fees through the fee center",
   "you_have_not_purchased_the_license": "You have not purchased the License",
   "yuan": "Yuan"
-}
+}

frontend/desktop/public/locales/zh/common.json

@@ -3,6 +3,9 @@
   "accept": "接受",
   "accept_invitation": "接受邀请",
   "access": "权限",
+  "account_bank_required": "请输入正确的企业开户行",
+  "account_number": "银行账号",
+  "account_number_required": "请输入正确的企业开户行收款银行账号",
   "account_settings": "账户设置",
   "added": "已加入",
   "agree_policy": "我已阅读并同意",
@@ -18,6 +21,7 @@
   "attachment": "附件",
   "avatar": "头像",
   "balance": "余额",
+  "bank_name": "开户银行",
   "bind": "绑定",
   "bind_success": "绑定成功",
   "bonus": "赠",
@@ -38,6 +42,9 @@
   "confirm": "确认",
   "confirm_again": "再次确认",
   "confirmnewpassword": "确认新密码",
+  "contact_info": "联系方式 (手机号码)",
+  "contact_info_must_be_numeric": "必须是数字字符串",
+  "contact_info_required": "请输入正确的联系方式",
   "core": "核",
   "create_team": "创建工作空间",
   "created_time": "创建时间",
@@ -64,8 +71,19 @@
   "emailchangesuccess": "电子邮箱修改成功",
   "enter": "输入",
   "enter_confirm": "请输入 {{value}} 确认",
+  "enterprise_auth_tips": "我们会向你提交的对公账户进行小额打款, 请输入收到的金额完成验证。",
+  "enterprise_key": "统一社会信用代码",
+  "enterprise_key_required": "请输入正确的企业统一社会信用代码",
+  "enterprise_keyname": "企业名称 (需与银行开户名一致)",
+  "enterprise_keyname_placeholder": "请输入企业名称 (需与银行开户名一致)",
   "enterprise_name": "企业名称",
   "enterprise_name_required": "请输入正确的企业名字",
+  "enterprise_realname_cancel_failed": "取消失败",
+  "enterprise_realname_cancel_success": "取消成功",
+  "enterprise_realname_payment_failed": "验证金额打款失败",
+  "enterprise_realname_payment_success": "验证金额已经打款到您的企业开户银行",
+  "enterprise_realname_verify_failed": "企业实名失败",
+  "enterprise_realname_verify_success": "企业实名成功",
   "enterprise_verification": "企业实名",
   "expected_to_use_next_month": "未来30天预计使用",
   "expected_used": "预计还能使用",
@@ -80,6 +98,7 @@
   "generate_invitation_link": "生成邀请链接",
   "get_code": "获取验证码",
   "get_code_failed": "获取验证码失败",
+  "get_verification_amount": "获取验证金额",
   "gift_amount": "赠送 {{amount}} 余额.",
   "github": "Github",
   "google": "Google",
@@ -106,6 +125,7 @@
   "invalid_phone_number": "无效的手机号",
   "invalid_user_id": "用户的 ID 不合法",
   "invalid_username_or_password": "用户名或密码错误",
+  "invalid_verification_amount": "验证金额格式不合法",
   "invalid_verification_code": "无效的验证码",
   "invitation_reminder": "受邀提醒",
   "invite_member": "邀请成员",
@@ -114,8 +134,10 @@
   "jump_over": "跳过",
   "language": "语言",
   "launch_various_third-party_applications_with_one_click": "一键启动各种第三方应用",
+  "legal_person": "法定代表人",
   "license_buy": "License 购买",
   "link": "链接",
+  "link_to_workorder": "提交工单",
   "loading": "加载中",
   "log_in": "登录",
   "log_out": "登出",
@@ -169,12 +191,13 @@
   "phone_number_tips": "手机号",
   "phonechangesuccess": "手机号修改成功",
   "please_enter": "请输入",
+  "please_enter_account_number": "请输入银行账号",
+  "please_enter_bank_name": "请输入开户行名",
+  "please_enter_contact_info": "请输入联系方式",
+  "please_enter_enterprise_key": "请输入统一社会信用代码",
+  "please_enter_legal_person": "请输入法人姓名",
   "please_enter_username": "请输入您的用户名",
-  "please_enter_your_enterprise_name": "请输入您的企业名称",
-  "please_fill_all_fields": "文件不能为空",
-  "please_read_and_agree_to_the_agreement": "请阅读并同意协议",
-  "please_upload_the_business_license": "请上传企业的营业执照照片",
-  "please_upload_the_supporting_materials": "请在下载的附件上签名并盖好公章，上传照片",
+  "please_enter_verification_amount": "请输入验证金额（单位分）",
   "privacy_policy": "隐私政策",
   "private_team_id_of_user": "用户ID",
   "purchase_history": "购买记录",
@@ -190,8 +213,7 @@
   "realname_auth_now": "点击进行实名",
   "realname_auth_reminder": "实名认证提醒",
   "realname_auth_reminder_desc": "国内可用区需要实名认证，未实名认证将会被限制充值，实名认证成功奖励 Sealos 余额 {{reward}} 元。",
-  "realname_auth_tips_a": "1、请确保所填写的姓名、身份证号码和手机号码信息一致。",
-  "realname_auth_tips_b": "2、部分虚拟运营商提供的号段可能无法验证通过，请申请工单通过人工协助认证。",
+  "realname_auth_reminder_desc_no_reward": "国内可用区需要实名认证，未实名认证将会被限制充值。",
   "realname_info": "实名信息",
   "receive_tips": "{{managerName}} 邀请你到 {{teamName}} 成为 {{role}}",
   "recharge_amount": "充值金额",
@@ -204,6 +226,7 @@
   "remain_other_region_resource_tips": "您好，您的账户中仍有未删除的关联资源，为了帮助您顺利完成账户注销流程，请您清理所有可用区资源，确保无遗漏。",
   "remain_template_tips": "您的账户中仍有未删除的模板资源，为了帮助您顺利完成账户注销流程，请您手动删除所有模板资源，以避免数据丢失",
   "remain_workspace_tips": "您的账户中仍有未删除的关联资源，为了帮助您顺利完成账户注销流程，请您清理或转移您的工作空间，以避免数据丢失",
+  "remaining_attempts": "剩余 {{count}} 次",
   "remaining_time": "剩余激活时间: ",
   "remove": "移除",
   "remove_member_tips": "确认要移除该成员?",
@@ -224,20 +247,21 @@
   "status": "状态",
   "storage": "存储",
   "submit_error": "提交错误",
-  "supporting_materials": "证明材料",
+  "submit_verification": "提交认证 ",
   "switching_disc": "切换圆盘",
   "team": "工作空间",
   "the_invited_user_must_be_others": "只能邀请其他人",
   "toggle_app_bar": "切换应用栏",
+  "transAmt_not_match": "验证金额不匹配，注意验证金额单位是分，例如收到的打款金额为 0.23 元 则输入23。",
   "unbind": "解绑",
   "unbind_success": "解绑成功",
   "unbound": "未绑定",
   "under_active_development": "正在积极开发中 🚧",
   "unread": "未读",
-  "upload_success": "上传成功",
   "used_last_month": "过去30天已使用",
   "used_resources": "已用资源",
   "user_name": "用户名",
+  "user_name_required": "请输入正确的企业法人姓名",
   "username": "用户名",
   "username_tips": "用户名为3-16位的英文或数字的字符",
   "usertask": {
@@ -248,6 +272,10 @@
     "task_launchpad_desc": "一键创建容器集群，自动化 部署容器应用，并提供内 网/外网访问地址",
     "task_launchpad_title": "部署应用"
   },
+  "verification_amount": "验证金额",
+  "verification_amount_required": "验证金额不能为空",
+  "verification_amount_tips": "验证金额将由上海银联打入你提交的对公账号, 金额随机, 一般实时到账。若三个工作日内未收到, 请",
+  "verification_amount_tips2": "请联系公司财务确认企业银行账户收到的验证金额, 一般实时到账, 长期有效。",
   "verification_code_login": "手机号登录",
   "verify_code_tips": "6位验证码",
   "verify_password": "确认密码",