From 21fbc855f9f4852e92b44dc452c6fddf8bab2f3f Mon Sep 17 00:00:00 2001
From: jack ning <github@bytedesk.com>
Date: Wed, 18 Dec 2024 16:30:02 +0800
Subject: [PATCH] Sync from bytedesk-private: update

---
 .../com/bytedesk/core/constant/I18Consts.java     |  6 +++++-
 .../bytedesk/core/message/MessageTypeEnum.java    |  2 +-
 .../com/bytedesk/core/push/PushRestService.java   | 15 ++++++++-------
 .../src/main/resources/application-dev.properties |  4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/modules/core/src/main/java/com/bytedesk/core/constant/I18Consts.java b/modules/core/src/main/java/com/bytedesk/core/constant/I18Consts.java
index 703d6413d7..da98f2451c 100644
--- a/modules/core/src/main/java/com/bytedesk/core/constant/I18Consts.java
+++ b/modules/core/src/main/java/com/bytedesk/core/constant/I18Consts.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-04-26 22:25:47
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2024-12-16 11:26:38
+ * @LastEditTime: 2024-12-18 16:26:29
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. 
@@ -30,6 +30,10 @@ public class I18Consts {
     public static final String I18N_PREFIX = "i18n.";
     // 
     public static final String I18N_USERNAME_OR_PASSWORD_INCORRECT = I18N_PREFIX + "username.or.password.incorrect";
+    public static final String I18N_MOBILE_ALREADY_EXISTS = I18N_PREFIX + "mobile.already.exists";
+    public static final String I18N_EMAIL_ALREADY_EXISTS = I18N_PREFIX + "email.already.exists";
+    public static final String I18N_MOBILE_NOT_EXISTS = I18N_PREFIX + "mobile.not.exists";
+    public static final String I18N_EMAIL_NOT_EXISTS = I18N_PREFIX + "email.not.exists";
     // captcha
     public static final String I18N_AUTH_CAPTCHA_SEND_SUCCESS = I18N_PREFIX + "auth.captcha.send.success";
     public static final String I18N_AUTH_CAPTCHA_ERROR = I18N_PREFIX + "auth.captcha.error";
diff --git a/modules/core/src/main/java/com/bytedesk/core/message/MessageTypeEnum.java b/modules/core/src/main/java/com/bytedesk/core/message/MessageTypeEnum.java
index 9b4c3ec49a..a7f06a29a3 100644
--- a/modules/core/src/main/java/com/bytedesk/core/message/MessageTypeEnum.java
+++ b/modules/core/src/main/java/com/bytedesk/core/message/MessageTypeEnum.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-06-05 21:50:54
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2024-12-03 17:06:25
+ * @LastEditTime: 2024-12-18 16:28:03
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. 
diff --git a/modules/core/src/main/java/com/bytedesk/core/push/PushRestService.java b/modules/core/src/main/java/com/bytedesk/core/push/PushRestService.java
index d2cb56867d..1c9bb001dd 100644
--- a/modules/core/src/main/java/com/bytedesk/core/push/PushRestService.java
+++ b/modules/core/src/main/java/com/bytedesk/core/push/PushRestService.java
@@ -2,7 +2,7 @@
  * @Author: jackning 270580156@qq.com
  * @Date: 2024-04-25 15:41:33
  * @LastEditors: jackning 270580156@qq.com
- * @LastEditTime: 2024-11-28 21:00:10
+ * @LastEditTime: 2024-12-18 16:26:47
  * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
  *   Please be aware of the BSL license restrictions before installing Bytedesk IM – 
  *  selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. 
@@ -31,6 +31,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.bytedesk.core.base.BaseRestService;
 import com.bytedesk.core.config.BytedeskProperties;
+import com.bytedesk.core.constant.I18Consts;
 import com.bytedesk.core.constant.TypeConsts;
 import com.bytedesk.core.exception.EmailExistsException;
 import com.bytedesk.core.exception.MobileExistsException;
@@ -89,30 +90,30 @@ public class PushRestService extends BaseRestService<PushEntity, PushRequest, Pu
         if (type.equals(AuthTypeEnum.MOBILE_REGISTER.name())) {
             // 注册验证码，如果账号已经存在，则直接抛出异常
             if (authRequest.isMobile() && userService.existsByMobileAndPlatform(receiver, platform)) {
-                throw new MobileExistsException("mobile already exists, please login directly");
+                throw new MobileExistsException(I18Consts.I18N_MOBILE_ALREADY_EXISTS);
             }
             if (authRequest.isEmail() && userService.existsByEmailAndPlatform(receiver, platform)) {
-                throw new EmailExistsException("email already exists, please login directly");
+                throw new EmailExistsException(I18Consts.I18N_EMAIL_ALREADY_EXISTS);
             }
         } else if (type.equals(AuthTypeEnum.EMAIL_RESET.name())) {
             // 修改邮箱，如果账号已经存在，则直接抛出异常
             if (authRequest.isEmail() && userService.existsByEmailAndPlatform(receiver, platform)) {
-                throw new EmailExistsException("email already exists, please use another one");
+                throw new EmailExistsException(I18Consts.I18N_EMAIL_ALREADY_EXISTS);
             }
         } else if (type.equals(AuthTypeEnum.MOBILE_RESET.name())) {
             // 修改手机号，如果账号已经存在，则直接抛出异常
             if (authRequest.isMobile() && userService.existsByMobileAndPlatform(receiver, platform)) {
-                throw new MobileExistsException("mobile already exists, please use another one");
+                throw new MobileExistsException(I18Consts.I18N_MOBILE_ALREADY_EXISTS);
             }
         } else if (type.equals(AuthTypeEnum.EMAIL_VERIFY.name())) {
             // 验证邮箱，如果账号不存在，则直接抛出异常
             if (authRequest.isEmail() && !userService.existsByEmailAndPlatform(receiver, platform)) {
-                throw new EmailExistsException("email not exists");
+                throw new EmailExistsException(I18Consts.I18N_EMAIL_NOT_EXISTS);
             } 
         } else if (type.equals(AuthTypeEnum.MOBILE_VERIFY.name())) {
             // 验证手机号，如果账号不存在，则直接抛出异常
             if (authRequest.isMobile() && !userService.existsByMobileAndPlatform(receiver, platform)) {
-                throw new MobileExistsException("mobile not exists");
+                throw new MobileExistsException(I18Consts.I18N_MOBILE_NOT_EXISTS);
             }
         }
         
diff --git a/starter/src/main/resources/application-dev.properties b/starter/src/main/resources/application-dev.properties
index 524e40e9e3..51d582f360 100644
--- a/starter/src/main/resources/application-dev.properties
+++ b/starter/src/main/resources/application-dev.properties
@@ -16,8 +16,8 @@ bytedesk.nickname=SuperAdmin
 # 默认管理员手机号
 bytedesk.mobile=13345678000
 # 白名单手机号默认发送短信验证码为：bytedesk.mobile-code 中设置的值，用于测试，否则随机发送6位验证码
-bytedesk.mobile-whitelist=18888888000,18888888001,18888888002,18888888003,18888888004,12345678001,12345678002
-bytedesk.email-whitelist=100@email.com,101@email.com,102@email.com,001@email.com,002@email.com
+bytedesk.mobile-whitelist=18888888000,18888888001,18888888002,18888888003,18888888004,18888888005,18888888006
+bytedesk.email-whitelist=100@email.com,101@email.com,102@email.com,103@email.com,104@email.com,105@email.com,106@email.com
 # 白名单和默认用户-手机号验证码，用于测试，否则随机发送6位验证码
 bytedesk.validate-code=123456
 # 默认生成组织昵称和唯一代码