From 1702aab538dca840d3afa68afbdce92fd764d51e Mon Sep 17 00:00:00 2001 From: kuaifan Date: Mon, 14 Oct 2024 16:24:47 +0800 Subject: [PATCH] no message --- cmd | 17 +++++++++++------ docker/mysql/conf.d/docker.cnf | 2 +- language/original-web.txt | 5 +++++ package.json | 2 +- resources/mobile | 2 +- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/cmd b/cmd index 6f9e42e0a..60197d6eb 100755 --- a/cmd +++ b/cmd @@ -428,13 +428,18 @@ if [ $# -gt 0 ]; then exit 1 fi chmod -R 775 "${cur_path}/docker/mysql/data" - sleep 3 done - run_exec php "php artisan migrate --seed" - if [ ! -f "${cur_path}/docker/mysql/data/$(env_get DB_DATABASE)/$(env_get DB_PREFIX)migrations.ibd" ]; then - error "数据库安装失败!" - exit 1 - fi + # 数据库迁移 + remaining=20 + while [ ! -f "${cur_path}/docker/mysql/data/$(env_get DB_DATABASE)/$(env_get DB_PREFIX)migrations.ibd" ]; do + ((remaining=$remaining-1)) + if [ $remaining -lt 0 ]; then + error "数据库安装失败!" + exit 1 + fi + sleep 3 + run_exec php "php artisan migrate --seed" + done # 设置初始化密码 res=`run_exec mariadb "sh /etc/mysql/repassword.sh"` $COMPOSE up -d diff --git a/docker/mysql/conf.d/docker.cnf b/docker/mysql/conf.d/docker.cnf index 2fde942d3..c49d60c3e 100644 --- a/docker/mysql/conf.d/docker.cnf +++ b/docker/mysql/conf.d/docker.cnf @@ -12,7 +12,7 @@ default_storage_engine = InnoDB performance_schema_max_table_instances = 400 table_definition_cache = 400 key_buffer_size = 1024M -max_allowed_packet = 8192M +max_allowed_packet = 1024M table_open_cache = 2048 sort_buffer_size = 4096K net_buffer_length = 4K diff --git a/language/original-web.txt b/language/original-web.txt index cbc3b9e61..35671c548 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1611,3 +1611,8 @@ License Key 视频 发起会议 + +返回参数错误 +未知错误 +网络异常 +请求失败 diff --git a/package.json b/package.json index 45788d06c..37222a14a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "DooTask", - "version": "0.38.27", + "version": "0.38.28", "codeVerson": 141, "description": "DooTask is task management system.", "scripts": { diff --git a/resources/mobile b/resources/mobile index c359b7d11..f197723f8 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit c359b7d11daca3d6adba287089c4705f2ec5d652 +Subproject commit f197723f80e3d9753a6e1d82c0cae8c95ec2fa3d