diff --git a/deploy/docker/docker-compose-ollama.yaml b/deploy/docker/docker-compose-ollama.yaml index f499f9c127..7a92aa6c46 100644 --- a/deploy/docker/docker-compose-ollama.yaml +++ b/deploy/docker/docker-compose-ollama.yaml @@ -196,6 +196,9 @@ services: BYTEDESK_CUSTOM_DOC_URL_SHOW: "true" BYTEDESK_CUSTOM_DOC_URL: https://www.weiyuai.cn/docs/zh-CN/ BYTEDESK_CUSTOM_LANG: zh-CN + BYTEDESK_CUSTOM_ALLOW_REGISTER: "true" + BYTEDESK_CUSTOM_FORCE_VALIDATE_MOBILE: "true" + BYTEDESK_CUSTOM_FORCE_VALIDATE_EMAIL: "true" # Admin config BYTEDESK_ADMIN_EMAIL: admin@email.com BYTEDESK_ADMIN_PASSWORD: admin @@ -204,9 +207,6 @@ services: BYTEDESK_ADMIN_MOBILE_WHITELIST: 18888888000,18888888001,18888888002,18888888003,18888888004,18888888005 BYTEDESK_ADMIN_EMAIL_WHITELIST: 100@email.com,101@email.com,102@email.com,103@email.com,104@email.com,105@email.com BYTEDESK_ADMIN_VALIDATE_CODE: 123456 - BYTEDESK_ADMIN_ALLOW_REGISTER: "true" - BYTEDESK_ADMIN_FORCE_VALIDATE_MOBILE: "true" - BYTEDESK_ADMIN_FORCE_VALIDATE_EMAIL: "true" # Member config BYTEDESK_MEMBER_PASSWORD: 123456 # Performance Testing config diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml index e37f8de4c0..b432c77f5a 100644 --- a/deploy/docker/docker-compose.yaml +++ b/deploy/docker/docker-compose.yaml @@ -176,6 +176,9 @@ services: BYTEDESK_CUSTOM_DOC_URL_SHOW: "true" BYTEDESK_CUSTOM_DOC_URL: https://www.weiyuai.cn/docs/zh-CN/ BYTEDESK_CUSTOM_LANG: zh-CN + BYTEDESK_CUSTOM_ALLOW_REGISTER: "true" + BYTEDESK_CUSTOM_FORCE_VALIDATE_MOBILE: "true" + BYTEDESK_CUSTOM_FORCE_VALIDATE_EMAIL: "true" # Admin config BYTEDESK_ADMIN_EMAIL: admin@email.com BYTEDESK_ADMIN_PASSWORD: admin @@ -184,9 +187,7 @@ services: BYTEDESK_ADMIN_MOBILE_WHITELIST: 18888888000,18888888001,18888888002,18888888003,18888888004,18888888005 BYTEDESK_ADMIN_EMAIL_WHITELIST: 100@email.com,101@email.com,102@email.com,103@email.com,104@email.com,105@email.com BYTEDESK_ADMIN_VALIDATE_CODE: 123456 - BYTEDESK_ADMIN_ALLOW_REGISTER: "true" - BYTEDESK_ADMIN_FORCE_VALIDATE_MOBILE: "true" - BYTEDESK_ADMIN_FORCE_VALIDATE_EMAIL: "true" + # Member config BYTEDESK_MEMBER_PASSWORD: 123456 # Performance Testing config diff --git a/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskProperties.java b/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskProperties.java index f5c50635d9..1ae2f0e059 100644 --- a/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskProperties.java +++ b/modules/core/src/main/java/com/bytedesk/core/config/properties/BytedeskProperties.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-01-30 09:14:39 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-08-03 17:11:55 + * @LastEditTime: 2025-08-03 17:12:57 * @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. @@ -238,10 +238,6 @@ public class BytedeskProperties { private List mobileWhitelist = new ArrayList<>(); private List emailWhitelist = new ArrayList<>(); private String validateCode; - // - private Boolean allowRegister; - private Boolean forceValidateMobile; - private Boolean forceValidateEmail; } @Getter diff --git a/starter/src/main/resources/application-open.properties b/starter/src/main/resources/application-open.properties index e514981648..ce448d328a 100644 --- a/starter/src/main/resources/application-open.properties +++ b/starter/src/main/resources/application-open.properties @@ -37,6 +37,13 @@ bytedesk.custom.doc-url-show=true bytedesk.custom.doc-url=https://www.weiyuai.cn/docs/zh-CN/ # lang: zh-CN/en-US/zh-TW bytedesk.custom.lang=zh-CN +# allow register +bytedesk.custom.allow-register=true +# force validate mobile +bytedesk.custom.force-validate-mobile=true +# force validate email +bytedesk.custom.force-validate-email=true + # =============================== # Admin config @@ -55,12 +62,6 @@ bytedesk.admin.mobile-whitelist=18888888000,18888888001,18888888002,18888888003, bytedesk.admin.email-whitelist=100@email.com,101@email.com,102@email.com,103@email.com,104@email.com,105@email.com # validate code for white list mobile and email, otherwise random 6 digits bytedesk.admin.validate-code=123456 -# allow register -bytedesk.admin.allow-register=true -# force validate mobile -bytedesk.admin.force-validate-mobile=true -# force validate email -bytedesk.admin.force-validate-email=true # =============================== #= Member config