github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-08-01 19:05:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Pang 2024-03-09 10:44:36 +08:00
parent 9be0642ba5
commit f63c2da37a
14 changed files with 67 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -88,7 +88,6 @@ cd dootask
./cmd redis "your command" # To run a redis command ./cmd redis "your command" # To run a redis command
./cmd composer "your command" # To run a composer command ./cmd composer "your command" # To run a composer command
./cmd supervisorctl "your command" # To run a supervisorctl command ./cmd supervisorctl "your command" # To run a supervisorctl command
./cmd test "your command" # To run a phpunit command
./cmd mysql "your command" # To run a mysql command (backup: Backup database, recovery: Restore database) ./cmd mysql "your command" # To run a mysql command (backup: Backup database, recovery: Restore database)
``` ```
@ -101,7 +100,7 @@ cd dootask
./cmd https ./cmd https
``` ```
#### Method 2: Nginx Agent Configuration #### Or Method 2: Nginx Agent Configuration
```bash ```bash
# 1、Nginx config add # 1、Nginx config add

5
README_CN.md
View File

@ -89,20 +89,19 @@ cd dootask
./cmd redis "your command" # 运行 redis 命令 ./cmd redis "your command" # 运行 redis 命令
./cmd composer "your command" # 运行 composer 命令 ./cmd composer "your command" # 运行 composer 命令
./cmd supervisorctl "your command" # 运行 supervisorctl 命令 ./cmd supervisorctl "your command" # 运行 supervisorctl 命令
./cmd test "your command" # 运行 phpunit 命令
./cmd mysql "your command" # 运行 mysql 命令 (backup: 备份数据库，recovery: 还原数据库) ./cmd mysql "your command" # 运行 mysql 命令 (backup: 备份数据库，recovery: 还原数据库)
``` ```
### SSL 配置 ### SSL 配置
#### 方式一：自动配置 #### 方法1：自动配置
```bash ```bash
# 在项目下运行命令，根据提示执行即可 # 在项目下运行命令，根据提示执行即可
./cmd https ./cmd https
``` ```
#### 方式二：Nginx 代理配置 #### （或者）方法2：Nginx 代理配置
```bash ```bash
# 1、Nginx 代理配置添加 # 1、Nginx 代理配置添加

70
cmd
View File

@ -20,10 +20,10 @@ COMPOSE="docker-compose"
judge() { judge() {
if [[ 0 -eq $? ]]; then if [[ 0 -eq $? ]]; then
echo -e "${OK} ${GreenBG} $1 完成 ${Font}" success "$1 完成"
sleep 1 sleep 1
else else
echo -e "${Error} ${RedBG} $1 失败${Font}" error "$1 失败"
exit 1 exit 1
fi fi
} }
@ -40,6 +40,10 @@ error() {
echo -e "${Error} ${RedBG}$1${Font}" echo -e "${Error} ${RedBG}$1${Font}"
} }
info() {
echo -e "$1"
}
rand() { rand() {
local min=$1 local min=$1
local max=$(($2-$min+1)) local max=$(($2-$min+1))
@ -66,7 +70,7 @@ restart_php() {
$COMPOSE stop php $COMPOSE stop php
$COMPOSE start php $COMPOSE start php
else else
echo -e "$RES" info "$RES"
fi fi
} }
@ -84,21 +88,21 @@ switch_debug() {
check_docker() { check_docker() {
docker --version &> /dev/null docker --version &> /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo -e "${Error} ${RedBG} 未安装 Docker！${Font}" error "未安装 Docker！"
exit 1 exit 1
fi fi
docker-compose version &> /dev/null docker-compose version &> /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
docker compose version &> /dev/null docker compose version &> /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo -e "${Error} ${RedBG} 未安装 Docker-compose！${Font}" error "未安装 Docker-compose！"
exit 1 exit 1
fi fi
COMPOSE="docker compose" COMPOSE="docker compose"
fi fi
if [[ -n `$COMPOSE version | grep -E "\sv*1"` ]]; then if [[ -n `$COMPOSE version | grep -E "\sv1"` ]]; then
$COMPOSE version $COMPOSE version
echo -e "${Error} ${RedBG} Docker-compose 版本过低，请升级至v2+！${Font}" error "Docker-compose 版本过低，请升级至v2+！"
exit 1 exit 1
fi fi
} }
@ -106,7 +110,17 @@ check_docker() {
check_node() { check_node() {
npm --version &> /dev/null npm --version &> /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo -e "${Error} ${RedBG} 未安装nodejs！${Font}" error "未安装 npm！"
exit 1
fi
node --version &> /dev/null
if [ $? -ne 0 ]; then
error "未安装 Node.js！"
exit 1
fi
if [[ -n `node --version | grep -E "v1"` ]]; then
node --version
error "Node.js 版本过低，请升级至v20+！"
exit 1 exit 1
fi fi
} }
@ -169,7 +183,7 @@ run_exec() {
local cmd=$2 local cmd=$2
local name=`docker_name $container` local name=`docker_name $container`
if [ -z "$name" ]; then if [ -z "$name" ]; then
echo -e "${Error} ${RedBG} 没有找到 $container 容器! ${Font}" error "没有找到 $container 容器!"
exit 1 exit 1
fi fi
docker exec -it "$name" /bin/sh -c "$cmd" docker exec -it "$name" /bin/sh -c "$cmd"
@ -185,7 +199,7 @@ run_mysql() {
filename="${cur_path}/docker/mysql/backup/${database}_$(date "+%Y%m%d%H%M%S").sql.gz" filename="${cur_path}/docker/mysql/backup/${database}_$(date "+%Y%m%d%H%M%S").sql.gz"
run_exec mariadb "exec mysqldump --databases $database -u$username -p$password" | gzip > $filename run_exec mariadb "exec mysqldump --databases $database -u$username -p$password" | gzip > $filename
judge "备份数据库" judge "备份数据库"
[ -f "$filename" ] && echo -e "备份文件：$filename" [ -f "$filename" ] && info "备份文件：$filename"
elif [ "$1" = "recovery" ]; then elif [ "$1" = "recovery" ]; then
database=$(env_get DB_DATABASE) database=$(env_get DB_DATABASE)
username=$(env_get DB_USERNAME) username=$(env_get DB_USERNAME)
@ -194,19 +208,19 @@ run_mysql() {
mkdir -p ${cur_path}/docker/mysql/backup mkdir -p ${cur_path}/docker/mysql/backup
list=`ls -1 "${cur_path}/docker/mysql/backup" | grep ".sql.gz"` list=`ls -1 "${cur_path}/docker/mysql/backup" | grep ".sql.gz"`
if [ -z "$list" ]; then if [ -z "$list" ]; then
echo -e "${Error} ${RedBG} 没有备份文件！${Font}" error "没有备份文件！"
exit 1 exit 1
fi fi
echo "$list" echo "$list"
read -rp "请输入备份文件名称还原：" inputname read -rp "请输入备份文件名称还原：" inputname
filename="${cur_path}/docker/mysql/backup/${inputname}" filename="${cur_path}/docker/mysql/backup/${inputname}"
if [ ! -f "$filename" ]; then if [ ! -f "$filename" ]; then
echo -e "${Error} ${RedBG} 备份文件：${inputname} 不存在！ ${Font}" error "备份文件：${inputname} 不存在！"
exit 1 exit 1
fi fi
container_name=`docker_name mariadb` container_name=`docker_name mariadb`
if [ -z "$container_name" ]; then if [ -z "$container_name" ]; then
echo -e "${Error} ${RedBG} 没有找到 mariadb 容器! ${Font}" error "没有找到 mariadb 容器!"
exit 1 exit 1
fi fi
docker cp $filename $container_name:/ docker cp $filename $container_name:/
@ -278,7 +292,7 @@ env_set() {
docker run -it --rm -v ${cur_path}:/www alpine sh -c "sed -i "/^${key}=/c\\${key}=${val}" /www/.env" docker run -it --rm -v ${cur_path}:/www alpine sh -c "sed -i "/^${key}=/c\\${key}=${val}" /www/.env"
fi fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo -e "${Error} ${RedBG} 设置env参数失败！${Font}" error "设置env参数失败！"
exit 1 exit 1
fi fi
fi fi
@ -351,7 +365,7 @@ if [ $# -gt 0 ]; then
run_exec php "composer config --unset repos.packagist" run_exec php "composer config --unset repos.packagist"
fi fi
if [ ! -f "${cur_path}/vendor/autoload.php" ]; then if [ ! -f "${cur_path}/vendor/autoload.php" ]; then
echo -e "${Error} ${RedBG}composer install 失败，请重试！ ${Font}" error "composer install 失败，请重试！"
exit 1 exit 1
fi fi
[[ -z "$(env_get APP_KEY)" ]] && run_exec php "php artisan key:generate" [[ -z "$(env_get APP_KEY)" ]] && run_exec php "php artisan key:generate"
@ -361,7 +375,7 @@ if [ $# -gt 0 ]; then
while [ ! -f "${cur_path}/docker/mysql/data/$(env_get DB_DATABASE)/db.opt" ]; do while [ ! -f "${cur_path}/docker/mysql/data/$(env_get DB_DATABASE)/db.opt" ]; do
((remaining=$remaining-1)) ((remaining=$remaining-1))
if [ $remaining -lt 0 ]; then if [ $remaining -lt 0 ]; then
echo -e "${Error} ${RedBG} 数据库初始化失败! ${Font}" error "数据库初始化失败!"
exit 1 exit 1
fi fi
chmod -R 775 "${cur_path}/docker/mysql/data" chmod -R 775 "${cur_path}/docker/mysql/data"
@ -369,16 +383,16 @@ if [ $# -gt 0 ]; then
done done
run_exec php "php artisan migrate --seed" 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 if [ ! -f "${cur_path}/docker/mysql/data/$(env_get DB_DATABASE)/$(env_get DB_PREFIX)migrations.ibd" ]; then
echo -e "${Error} ${RedBG} 数据库安装失败! ${Font}" error "数据库安装失败!"
exit 1 exit 1
fi fi
# 设置初始化密码 # 设置初始化密码
res=`run_exec mariadb "sh /etc/mysql/repassword.sh"` res=`run_exec mariadb "sh /etc/mysql/repassword.sh"`
$COMPOSE up -d $COMPOSE up -d
restart_php restart_php
echo -e "${OK} ${GreenBG} 安装完成 ${Font}" success "安装完成"
echo -e "地址: http://${GreenBG}127.0.0.1:$(env_get APP_PORT)${Font}" info "地址: http://${GreenBG}127.0.0.1:$(env_get APP_PORT)${Font}"
echo -e "$res" info "$res"
elif [[ "$1" == "update" ]]; then elif [[ "$1" == "update" ]]; then
shift 1 shift 1
if [[ "$@" != "nobackup" ]]; then if [[ "$@" != "nobackup" ]]; then
@ -400,10 +414,10 @@ if [ $# -gt 0 ]; then
[[ -z ${uninstall} ]] && uninstall="Y" [[ -z ${uninstall} ]] && uninstall="Y"
case $uninstall in case $uninstall in
[yY][eE][sS] | [yY]) [yY][eE][sS] | [yY])
echo -e "${RedBG} 开始卸载... ${Font}" info "${RedBG}开始卸载...${Font}"
;; ;;
*) *)
echo -e "${GreenBG} 终止卸载。 ${Font}" info "${GreenBG}终止卸载。${Font}"
exit 2 exit 2
;; ;;
esac esac
@ -412,7 +426,7 @@ if [ $# -gt 0 ]; then
rm -rf "./docker/mysql/data" rm -rf "./docker/mysql/data"
rm -rf "./docker/log/supervisor" rm -rf "./docker/log/supervisor"
find "./storage/logs" -name "*.log" | xargs rm -rf find "./storage/logs" -name "*.log" | xargs rm -rf
echo -e "${OK} ${GreenBG} 卸载完成 ${Font}" success "卸载完成"
elif [[ "$1" == "reinstall" ]]; then elif [[ "$1" == "reinstall" ]]; then
shift 1 shift 1
./cmd uninstall $@ ./cmd uninstall $@
@ -422,20 +436,20 @@ if [ $# -gt 0 ]; then
shift 1 shift 1
env_set APP_PORT "$1" env_set APP_PORT "$1"
$COMPOSE up -d $COMPOSE up -d
echo -e "${OK} ${GreenBG} 修改成功 ${Font}" success "修改成功"
echo -e "地址: http://${GreenBG}127.0.0.1:$(env_get APP_PORT)${Font}" info "地址: http://${GreenBG}127.0.0.1:$(env_get APP_PORT)${Font}"
elif [[ "$1" == "url" ]]; then elif [[ "$1" == "url" ]]; then
shift 1 shift 1
env_set APP_URL "$1" env_set APP_URL "$1"
restart_php restart_php
echo -e "${OK} ${GreenBG} 修改成功 ${Font}" success "修改成功"
elif [[ "$1" == "env" ]]; then elif [[ "$1" == "env" ]]; then
shift 1 shift 1
if [ -n "$1" ]; then if [ -n "$1" ]; then
env_set $1 "$2" env_set $1 "$2"
fi fi
restart_php restart_php
echo -e "${OK} ${GreenBG} 修改成功 ${Font}" success "修改成功"
elif [[ "$1" == "repassword" ]]; then elif [[ "$1" == "repassword" ]]; then
shift 1 shift 1
run_exec mariadb "sh /etc/mysql/repassword.sh \"$@\"" run_exec mariadb "sh /etc/mysql/repassword.sh \"$@\""
@ -458,7 +472,7 @@ if [ $# -gt 0 ]; then
elif [[ "$1" == "debug" ]]; then elif [[ "$1" == "debug" ]]; then
shift 1 shift 1
switch_debug "$@" switch_debug "$@"
echo "success" info "success"
elif [[ "$1" == "https" ]]; then elif [[ "$1" == "https" ]]; then
shift 1 shift 1
if [[ "$1" == "agent" ]] || [[ "$1" == "true" ]]; then if [[ "$1" == "agent" ]] || [[ "$1" == "true" ]]; then

1
language/original-web.txt
View File

@ -1535,3 +1535,4 @@ License Key
服务器（(*)）版本过低 服务器（(*)）版本过低
不显示该会话 不显示该会话
昨天

13
language/translate.json
View File

@ -19886,5 +19886,16 @@
"de": "Die sitzung wird nicht angezeigt", "de": "Die sitzung wird nicht angezeigt",
"fr": "Ne pas afficher cette session", "fr": "Ne pas afficher cette session",
"id": "Sesi ini tidak ditampilkan" "id": "Sesi ini tidak ditampilkan"
},
{
"key": "昨天",
"zh": "",
"zh-CHT": "昨天",
"en": "Yesterday",
"ko": "어제",
"ja": "昨日です",
"de": "Yesterday",
"fr": "Yesterday",
"id": "Yesterday"
} }
] ]

2
public/language/web/de.js
View File

File diff suppressed because one or more lines are too long

2
public/language/web/en.js
View File

File diff suppressed because one or more lines are too long

2
public/language/web/fr.js
View File

File diff suppressed because one or more lines are too long

2
public/language/web/id.js
View File

File diff suppressed because one or more lines are too long

2
public/language/web/ja.js
View File

File diff suppressed because one or more lines are too long

2
public/language/web/key.js
View File

File diff suppressed because one or more lines are too long

2
public/language/web/ko.js
View File

File diff suppressed because one or more lines are too long

2
public/language/web/zh-CHT.js
View File

File diff suppressed because one or more lines are too long

2
public/language/web/zh.js
View File

@ -1 +1 @@
if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""] if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]