Skip to content

Commit 17ca98a

Browse files
tangweixintangweixin
committed
## v1.17.0版本新特性 🚗优化中文提示
1 parent db2e52e commit 17ca98a

2 files changed

Lines changed: 20 additions & 19 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ curl -s https://get.httpsok.com | bash -s 'your******token'
5454
没错，已经结束，SSL证书自动续签就这么简单。快登录 **[控制台](https://httpsok.com/?p=4c9n)** 查看自己的证书吧。
5555

5656

57-
![httsok控制台-证书管理](https://cdn.httpsok.com/doc/assets/guide/image-20240528012201352.png)
57+
![httsok控制台-证书管理](https://cdn.httpsok.com/doc/assets/guide/image-20241029115047877.png)
5858

5959

6060
## 问题反馈

‎httpsok.sh‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ _init_params() {
186186
fi
187187
fi
188188

189-
NGINX_VERSION=$($NGINX_BIN -v 2>&1 | awk -F ': ' '{print $2}' | head -c 20)
189+
NGINX_VERSION=$($NGINX_BIN -v 2>&1 | awk -F ': ' '{print $2}' | head -n 1 | head -c 20)
190190

191191
# user can setting
192192
if [ -z "$NGINX_CONFIG" ]; then
@@ -390,27 +390,27 @@ _check() {
390390
# if local_cert_file not here. need to create the file
391391
_create_file "$code" "$cert_file" && _create_file "$code" "$cert_key_file"
392392
mv "$tmp_cert_file" "$cert_file" && mv "$tmp_cert_key_file" "$cert_key_file"
393-
_suc "$code $cert_file New cert updated"
394-
_remote_log "cert-updated-success" "$code" "New cert updated"
393+
_suc "$code $cert_file New cert updated(证书更新成功)"
394+
_remote_log "cert-updated-success" "$code" "New cert updated(证书更新成功)"
395395
echo "latest_code $code"
396396
else
397397
_err "$code $cert_file New cert update failed (md5 not match)"
398398
_remote_log "cert-updated-failed" "$code" "New cert update failed (md5 not match): cert_file_md5=$cert_file_md5,tmp_cert_md5=$tmp_cert_md5,cert_key_file_md5=$cert_key_file_md5,tmp_cert_key_md5=$tmp_cert_key_md5"
399399
fi
400400
;;
401401
"2")
402-
_info "$code $cert_file Processing, please just wait..."
402+
_info "$code $cert_file Processing, please just wait(正在处理中，请稍等)..."
403403
sleep 10
404404
_check $((depth - 1)) "$code" "$cert_file" "$cert_key_file"
405405
;;
406406
"3")
407-
_info "$code $cert_file Cert valid"
407+
_info "$code $cert_file Cert valid(证书有效)"
408408
;;
409409
"12")
410-
_err "$code $cert_file DNS CNAME invalid"
410+
_err "$code $cert_file DNS CNAME invalid(DNS检测不通过)"
411411
;;
412412
"13")
413-
_err "$code $cert_file code invalid"
413+
_err "$code $cert_file code invalid(非法请求)"
414414
;;
415415
*)
416416
_err "$code $cert_file $resp"
@@ -449,6 +449,7 @@ _check_token() {
449449
_err "httpsok's token can not empty"
450450
exit 4
451451
fi
452+
_init_params
452453
status=$(_get "/status")
453454
# _info "status >> $status"
454455
if [ "$status" != "ok" ]; then
@@ -655,7 +656,7 @@ _check_dns() {
655656
status=$(echo "$resp" | head -n 1)
656657
case $status in
657658
"3")
658-
_suc "DNS check pass"
659+
_suc "DNS check pass(DNS检查通过)"
659660
;;
660661
"13")
661662
_err "code invalid"
@@ -670,7 +671,7 @@ _reload_nginx() {
670671

671672
if [ "$latest_code" = "" ]; then
672673
echo
673-
_info "Nginx reload needless."
674+
_info "Nginx reload needless(无需重载)."
674675
return 0
675676
fi
676677

@@ -682,26 +683,26 @@ _reload_nginx() {
682683
if [ $? != 0 ]; then
683684
_remote_log "nginx-test-failed" "$latest_code" "$msg"
684685
echo
685-
_err "Nginx test failed. \n\n$msg"
686+
_err "Nginx test failed(测试失败). \n\n$msg"
686687
else
687688
msg=$($NGINX_BIN -s reload 2>&1)
688689
if [ $? -eq 0 ]; then
689-
_remote_log "nginx-reload-success" "$latest_code" "Nginx reload success."
690+
_remote_log "nginx-reload-success" "$latest_code" "Nginx reload success(重载成功)."
690691
echo
691-
_suc "Nginx reload success."
692+
_suc "Nginx reload success(重载成功)."
692693
else
693694

694695
# Check if nginx is running
695696
show_msg=$msg
696697
pid=$(ps -e | grep nginx | grep -v 'grep' | head -n 1 | awk '{print $1}')
697698
if [ -z "$pid" ]; then
698-
msg="Nginx is not started. \n\n$msg"
699-
show_msg="\033[33mNginx is not started. You can run \"service nginx start\" to start the Nginx. \033[31m\n\n$show_msg"
699+
msg="Nginx is not started(服务未启动). \n\n$msg"
700+
show_msg="\033[33mNginx is not started. You can run \"service nginx start\" to start the Nginx(请重启服务). \033[31m\n\n$show_msg"
700701
fi
701702

702703
_remote_log "nginx-reload-failed" "$latest_code" "$msg"
703704
echo
704-
_err "Nginx reload failed. \n\n$show_msg"
705+
_err "Nginx reload failed(重载失败). \n\n$show_msg"
705706
fi
706707
fi
707708
)
@@ -911,12 +912,12 @@ _run() {
911912
_load_token
912913
_check_token
913914
if ! _preparse ; then
914-
_err "No SSL certificate was detected.\n "
915-
_info "Please refer to resolve the issue. https://httpsok.com/doc/reference/nginx-config.html "
915+
_err "No SSL certificate was detected(未检测到SSL证书).\n "
916+
_info "Please refer to resolve the issue(查看文档，解决此问题). https://httpsok.com/doc/faq/nossl.html "
916917
echo ""
917918
return 4
918919
fi
919-
_info "Checking SSL certificate, please wait a moment."
920+
_info "Checking SSL certificate, please wait a moment(证书检测中请稍等...)."
920921
echo
921922
_upload_certs
922923
_check_dns

0 commit comments

Comments
 (0)