diff --git a/plugins/openresty/install.sh b/plugins/openresty/install.sh index 11896308a..1999c6cfb 100755 --- a/plugins/openresty/install.sh +++ b/plugins/openresty/install.sh @@ -7,36 +7,18 @@ rootPath=$(dirname "$curPath") rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") -install_tmp=${rootPath}/tmp/bt_install.pl - -openrestyDir=${serverPath}/source/openresty - -Install_openresty() -{ - mkdir -p ${openrestyDir} - echo '正在安装脚本文件...' > $install_tmp - - if [ ! -f ${openrestyDir}/openresty-1.13.6.2.tar.gz ];then - wget -O ${openrestyDir}/openresty-1.13.6.2.tar.gz https://openresty.org/download/openresty-1.13.6.2.tar.gz - fi - cd ${openrestyDir} && tar -zxvf openresty-1.13.6.2.tar.gz - - cd ${openrestyDir}/openresty* && ./configure --prefix=$serverPath/openresty \ - --with-openssl=$serverPath/source/lib/openssl-1.0.2q && make && make install - - echo '安装完成' > $install_tmp -} - -Uninstall_openresty() -{ - rm -rf $serverPath/openresty - echo '卸载完成' > $install_tmp -} action=$1 -host=$2 -if [ "${1}" == 'install' ];then - Install_openresty -else - Uninstall_openresty +type=$2 + +if [ "${2}" == "" ];then + echo '缺少安装脚本...' > $install_tmp + exit 0 +fi + +if [ ! -d $curPath/versions/$2 ];then + echo '缺少安装脚本2...' > $install_tmp + exit 0 fi + +sh -x $curPath/versions/$2/install.sh $1 diff --git a/plugins/openresty/versions/1.11.2/install.sh b/plugins/openresty/versions/1.11.2/install.sh new file mode 100755 index 000000000..262a7a300 --- /dev/null +++ b/plugins/openresty/versions/1.11.2/install.sh @@ -0,0 +1,42 @@ +#!/bin/bash +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +export PATH + +curPath=`pwd` +rootPath=$(dirname "$curPath") +rootPath=$(dirname "$rootPath") +serverPath=$(dirname "$rootPath") + + +install_tmp=${rootPath}/tmp/bt_install.pl +openrestyDir=${serverPath}/source/openresty + +Install_openresty() +{ + mkdir -p ${openrestyDir} + echo '正在安装脚本文件...' > $install_tmp + + if [ ! -f ${openrestyDir}/openresty-1.11.2.5.tar.gz ];then + wget -O ${openrestyDir}/openresty-1.11.2.5.tar.gz https://openresty.org/download/openresty-1.11.2.5.tar.gz + fi + + cd ${openrestyDir} && tar -zxvf openresty-1.11.2.5.tar.gz + + cd ${openrestyDir}/openresty* && ./configure --prefix=$serverPath/openresty \ + --with-openssl=$serverPath/source/lib/openssl-1.0.2q && make && make install + echo '1.11.2' > ${openrestyDir}/version.pl + echo '安装完成' > $install_tmp +} + +Uninstall_openresty() +{ + rm -rf $serverPath/openresty + echo '卸载完成' > $install_tmp +} + +action=$1 +if [ "${1}" == 'install' ];then + Install_openresty +else + Uninstall_openresty +fi \ No newline at end of file diff --git a/plugins/openresty/versions/1.13.6/install.sh b/plugins/openresty/versions/1.13.6/install.sh index a15b69333..1ad1d40fb 100755 --- a/plugins/openresty/versions/1.13.6/install.sh +++ b/plugins/openresty/versions/1.13.6/install.sh @@ -24,6 +24,7 @@ Install_openresty() cd ${openrestyDir}/openresty* && ./configure --prefix=$serverPath/openresty \ --with-openssl=$serverPath/source/lib/openssl-1.0.2q && make && make install + echo echo '安装完成' > $install_tmp } @@ -33,9 +34,7 @@ Uninstall_openresty() rm -rf $serverPath/openresty echo '卸载完成' > $install_tmp } - action=$1 -host=$2 if [ "${1}" == 'install' ];then Install_openresty else diff --git a/static/js/index.js b/static/js/index.js index 493dde1c3..aa3d56650 100755 --- a/static/js/index.js +++ b/static/js/index.js @@ -215,10 +215,10 @@ function getInfo() { $("#messageError").append('

' + lan.index.mem_warning + '

') } - if (info.isuser > 0) { - $("#messageError").show(); - $("#messageError").append('

' + lan.index.user_warning + ' [不可忽略] [立即修改]

') - } + // if (info.isuser > 0) { + // $("#messageError").show(); + // $("#messageError").append('

' + lan.index.user_warning + ' [不可忽略] [立即修改]

') + // } setImg(); },'json'); }