open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-05-22 22:36:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复 smtp python 参数说明

Browse Source
This commit is contained in:
whyour 2024-08-18 16:31:39 +08:00
parent af5de8372c
commit 230a8f61b8
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sample/config.sample.sh
View File

@ -175,8 +175,16 @@ export CHRONOCAT_QQ=""
export CHRONOCAT_TOKEN="" export CHRONOCAT_TOKEN=""
## 16. SMTP ## 16. SMTP
## JavaScript 参数
## 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json ## 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
export SMTP_SERVICE="" export SMTP_SERVICE=""
## Python 参数
## SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
export SMTP_SERVER=""
## SMTP 发送邮件服务器是否使用 SSL，填写 true 或 false
export SMTP_SSL=""
## smtp_email 填写 SMTP 收发件邮箱，通知将会由自己发给自己 ## smtp_email 填写 SMTP 收发件邮箱，通知将会由自己发给自己
export SMTP_EMAIL="" export SMTP_EMAIL=""
## smtp_password 填写 SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定 ## smtp_password 填写 SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定

13
shell/otask.sh
View File

@ -100,7 +100,7 @@ run_normal() {
if [[ $isJsOrPythonFile == 'false' ]]; then if [[ $isJsOrPythonFile == 'false' ]]; then
clear_non_sh_env clear_non_sh_env
fi fi
$timeoutCmd $which_program $file_param "${script_params[@]:-''}" $timeoutCmd $which_program $file_param "${script_params[@]}"
} }
handle_env_split() { handle_env_split() {
@ -143,7 +143,7 @@ run_concurrent() {
export "${env_param}=${array[$i - 1]}" export "${env_param}=${array[$i - 1]}"
clear_non_sh_env clear_non_sh_env
fi fi
eval envParam="${env_param}" numParam="${i}" $timeoutCmd $which_program $file_param "${script_params[@]:-''}" &>$single_log_path & eval envParam="${env_param}" numParam="${i}" $timeoutCmd $which_program $file_param "${script_params[@]}" &>$single_log_path &
done done
wait wait
@ -188,7 +188,7 @@ run_designated() {
file_param=${file_param/$relative_path\//} file_param=${file_param/$relative_path\//}
fi fi
envParam="${env_param}" numParam="${num_param}" $timeoutCmd $which_program $file_param "${script_params[@]:-''}" envParam="${env_param}" numParam="${num_param}" $timeoutCmd $which_program $file_param "${script_params[@]}"
} }
## 运行其他命令 ## 运行其他命令
@ -269,7 +269,14 @@ check_file "${task_shell_params[@]}"
if [[ $isJsOrPythonFile == 'false' ]]; then if [[ $isJsOrPythonFile == 'false' ]]; then
run_task_before "${task_shell_params[@]}" run_task_before "${task_shell_params[@]}"
fi fi
if set -o | grep -q 'nounset.*on'; then
set_u_on="true"
set +u
fi
main "${task_shell_params[@]}" main "${task_shell_params[@]}"
if [[ "$set_u_on" == 'true' ]]; then
set -u
fi
if [[ $isJsOrPythonFile == 'true' ]]; then if [[ $isJsOrPythonFile == 'true' ]]; then
export NODE_OPTIONS="${PREV_NODE_OPTIONS}" export NODE_OPTIONS="${PREV_NODE_OPTIONS}"
export PYTHONPATH="${PREV_PYTHONPATH}" export PYTHONPATH="${PREV_PYTHONPATH}"