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 42c15af6eb..703d6413d7 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-03 12:32:19 + * @LastEditTime: 2024-12-16 11:26:38 * @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. @@ -28,6 +28,8 @@ public class I18Consts { // public static final String ZH_TW = "zh-TW"; public static final String I18N_PREFIX = "i18n."; + // + public static final String I18N_USERNAME_OR_PASSWORD_INCORRECT = I18N_PREFIX + "username.or.password.incorrect"; // 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/exception/GlobalControllerAdvice.java b/modules/core/src/main/java/com/bytedesk/core/exception/GlobalControllerAdvice.java index 016592e8e5..92f377e7bb 100644 --- a/modules/core/src/main/java/com/bytedesk/core/exception/GlobalControllerAdvice.java +++ b/modules/core/src/main/java/com/bytedesk/core/exception/GlobalControllerAdvice.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-04-26 09:31:29 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2024-11-28 17:46:33 + * @LastEditTime: 2024-12-16 11:26:59 * @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. @@ -117,7 +117,7 @@ public class GlobalControllerAdvice { @ExceptionHandler(BadCredentialsException.class) public ResponseEntity> handleBadCredentialsException(BadCredentialsException e) { - return ResponseEntity.ok().body(JsonResult.error("Username or password is incorrect")); + return ResponseEntity.ok().body(JsonResult.error(I18Consts.I18N_USERNAME_OR_PASSWORD_INCORRECT)); } @ExceptionHandler(value = NullPointerException.class) diff --git a/modules/python/poetry.lock b/modules/python/poetry.lock index 7c9ae1292b..214353b3f7 100644 --- a/modules/python/poetry.lock +++ b/modules/python/poetry.lock @@ -3429,12 +3429,12 @@ reference = "mirrors" [[package]] name = "pdfplumber" -version = "0.5.3" +version = "0.5.4" description = "Plumb a PDF for detailed information about each char, rectangle, and line." optional = false python-versions = "*" files = [ - {file = "pdfplumber-0.5.3.tar.gz", hash = "sha256:48b318b5f3e618115ff34c492b7061665a1c4d35daae89605e20abe79f3d33b1"}, + {file = "pdfplumber-0.5.4.tar.gz", hash = "sha256:48b318b5f3e618115ff34c492b7061665a1c4d35daae89605e20abe79f3d33b1"}, ] [package.dependencies] diff --git a/starter/docker-compose.yaml b/starter/docker-compose.yaml index 549e28a481..f73dc54964 100644 --- a/starter/docker-compose.yaml +++ b/starter/docker-compose.yaml @@ -17,7 +17,7 @@ services: - "6379:6379" bytedesk: # image: bytedesk/bytedesk:latest - image: registry.cn-hangzhou.aliyuncs.com/weiyuai/bytedesk:0.5.3 + image: registry.cn-hangzhou.aliyuncs.com/weiyuai/bytedesk:0.5.4 container_name: bytedesk depends_on: - bytedesk-db diff --git a/starter/docker.md b/starter/docker.md index a084c032f1..4db41d14ce 100644 --- a/starter/docker.md +++ b/starter/docker.md @@ -1,17 +1,3 @@ - # docker ```bash diff --git a/starter/src/main/resources/templates/admin/asset-manifest.json b/starter/src/main/resources/templates/admin/asset-manifest.json index 7be7a73673..2ce7b3f4bc 100644 --- a/starter/src/main/resources/templates/admin/asset-manifest.json +++ b/starter/src/main/resources/templates/admin/asset-manifest.json @@ -1,8 +1,8 @@ { "/admin/umi.css": "/admin/umi.999685c6.css", - "/admin/umi.js": "/admin/umi.5f3baee5.js", + "/admin/umi.js": "/admin/umi.082ccafe.js", "/admin/4994.caecc91d.async.js": "/admin/4994.caecc91d.async.js", - "/admin/p__Auth__Login__index.js": "/admin/p__Auth__Login__index.e6a73a4c.async.js", + "/admin/p__Auth__Login__index.js": "/admin/p__Auth__Login__index.7c9aeeea.async.js", "/admin/p__Auth__Register__index.js": "/admin/p__Auth__Register__index.888c6210.async.js", "/admin/p__OAuth__Github.js": "/admin/p__OAuth__Github.580071ed.async.js", "/admin/p__OAuth__Google.js": "/admin/p__OAuth__Google.2e7cc6a4.async.js", @@ -98,7 +98,7 @@ "/admin/p__Dashboard__Knowledge__Faq__FaqStatistic.js": "/admin/p__Dashboard__Knowledge__Faq__FaqStatistic.7b344d22.async.js", "/admin/p__Dashboard__Knowledge__AutoReply__index.js": "/admin/p__Dashboard__Knowledge__AutoReply__index.3f9da60f.async.js", "/admin/p__Dashboard__Knowledge__AutoReply__AutoReplyData.css": "/admin/p__Dashboard__Knowledge__AutoReply__AutoReplyData.f9c908ef.chunk.css", - "/admin/p__Dashboard__Knowledge__AutoReply__AutoReplyData.js": "/admin/p__Dashboard__Knowledge__AutoReply__AutoReplyData.7bddef2e.async.js", + "/admin/p__Dashboard__Knowledge__AutoReply__AutoReplyData.js": "/admin/p__Dashboard__Knowledge__AutoReply__AutoReplyData.860249e9.async.js", "/admin/p__Dashboard__Knowledge__AutoReply__AutoReplyStatistic.js": "/admin/p__Dashboard__Knowledge__AutoReply__AutoReplyStatistic.9ec44268.async.js", "/admin/p__Dashboard__Knowledge__QuickReply__index.js": "/admin/p__Dashboard__Knowledge__QuickReply__index.f2503ccf.async.js", "/admin/p__Dashboard__Knowledge__QuickReply__QuickReplyData.css": "/admin/p__Dashboard__Knowledge__QuickReply__QuickReplyData.f9c908ef.chunk.css", diff --git a/starter/src/main/resources/templates/admin/index.html b/starter/src/main/resources/templates/admin/index.html index 1930b6adef..a00b3d6e09 100644 --- a/starter/src/main/resources/templates/admin/index.html +++ b/starter/src/main/resources/templates/admin/index.html @@ -7,10 +7,10 @@