+# - Add the above to any other configuration file (for example ~/.my.ini)
+# and copy my_print_defaults to /usr/bin
+# - Add the path to the mysql-installation-directory to the basedir variable
+# below.
+#
+# If you want to affect other MySQL variables, you should make your changes
+# in the /etc/my.cnf, ~/.my.cnf or other MySQL configuration files.
+
+# If you change base dir, you must also change datadir. These may get
+# overwritten by settings in the MySQL configuration files.
+
+basedir=
+datadir=
+
+# Default value, in seconds, afterwhich the script should timeout waiting
+# for server start.
+# Value here is overriden by value in my.cnf.
+# 0 means don't wait at all
+# Negative numbers mean to wait indefinitely
+service_startup_timeout=900
+
+# Lock directory for RedHat / SuSE.
+lockdir='/var/lock/subsys'
+lock_file_path="$lockdir/mysql"
+
+# The following variables are only set for letting mysql.server find things.
+
+# Set some defaults
+mysqld_pid_file_path=
+if test -z "$basedir"
+then
+ basedir={$SERVER_APP_PATH}
+ bindir={$SERVER_APP_PATH}/bin
+ if test -z "$datadir"
+ then
+ datadir={$SERVER_APP_PATH}/data
+ fi
+ sbindir={$SERVER_APP_PATH}/bin
+ libexecdir={$SERVER_APP_PATH}/bin
+else
+ bindir="$basedir/bin"
+ if test -z "$datadir"
+ then
+ datadir="$basedir/data"
+ fi
+ sbindir="$basedir/sbin"
+ libexecdir="$basedir/libexec"
+fi
+
+# datadir_set is used to determine if datadir was set (and so should be
+# *not* set inside of the --basedir= handler.)
+datadir_set=
+
+#
+# Use LSB init script functions for printing messages, if possible
+#
+lsb_functions="/lib/lsb/init-functions"
+if test -f $lsb_functions ; then
+ . $lsb_functions
+else
+ log_success_msg()
+ {
+ echo " SUCCESS! $@"
+ }
+ log_failure_msg()
+ {
+ echo " ERROR! $@"
+ }
+fi
+
+PATH="/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin"
+export PATH
+
+mode=$1 # start or stop
+
+[ $# -ge 1 ] && shift
+
+
+other_args="$*" # uncommon, but needed when called from an RPM upgrade action
+ # Expected: "--skip-networking --skip-grant-tables"
+ # They are not checked here, intentionally, as it is the resposibility
+ # of the "spec" file author to give correct arguments only.
+
+case `echo "testing\c"`,`echo -n testing` in
+ *c*,-n*) echo_n= echo_c= ;;
+ *c*,*) echo_n=-n echo_c= ;;
+ *) echo_n= echo_c='\c' ;;
+esac
+
+parse_server_arguments() {
+ for arg do
+ case "$arg" in
+ --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'`
+ bindir="$basedir/bin"
+ if test -z "$datadir_set"; then
+ datadir="$basedir/data"
+ fi
+ sbindir="$basedir/sbin"
+ libexecdir="$basedir/libexec"
+ ;;
+ --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'`
+ datadir_set=1
+ ;;
+ --pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+ --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+ esac
+ done
+}
+
+wait_for_pid () {
+ verb="$1" # created | removed
+ pid="$2" # process ID of the program operating on the pid-file
+ pid_file_path="$3" # path to the PID file.
+
+ i=0
+ avoid_race_condition="by checking again"
+
+ while test $i -ne $service_startup_timeout ; do
+
+ case "$verb" in
+ 'created')
+ # wait for a PID-file to pop into existence.
+ test -s "$pid_file_path" && i='' && break
+ ;;
+ 'removed')
+ # wait for this PID-file to disappear
+ test ! -s "$pid_file_path" && i='' && break
+ ;;
+ *)
+ echo "wait_for_pid () usage: wait_for_pid created|removed pid pid_file_path"
+ exit 1
+ ;;
+ esac
+
+ # if server isn't running, then pid-file will never be updated
+ if test -n "$pid"; then
+ if kill -0 "$pid" 2>/dev/null; then
+ : # the server still runs
+ else
+ # The server may have exited between the last pid-file check and now.
+ if test -n "$avoid_race_condition"; then
+ avoid_race_condition=""
+ continue # Check again.
+ fi
+
+ # there's nothing that will affect the file.
+ log_failure_msg "The server quit without updating PID file ($pid_file_path)."
+ return 1 # not waiting any more.
+ fi
+ fi
+
+ echo $echo_n ".$echo_c"
+ i=`expr $i + 1`
+ sleep 1
+
+ done
+
+ if test -z "$i" ; then
+ log_success_msg
+ return 0
+ else
+ log_failure_msg
+ return 1
+ fi
+}
+
+# Get arguments from the my.cnf file,
+# the only group, which is read from now on is [mysqld]
+if test -x "$bindir/my_print_defaults"; then
+ print_defaults="$bindir/my_print_defaults"
+else
+ # Try to find basedir in /etc/my.cnf
+ conf=/etc/my.cnf
+ print_defaults=
+ if test -r $conf
+ then
+ subpat='^[^=]*basedir[^=]*=\(.*\)$'
+ dirs=`sed -e "/$subpat/!d" -e 's//\1/' $conf`
+ for d in $dirs
+ do
+ d=`echo $d | sed -e 's/[ ]//g'`
+ if test -x "$d/bin/my_print_defaults"
+ then
+ print_defaults="$d/bin/my_print_defaults"
+ break
+ fi
+ done
+ fi
+
+ # Hope it's in the PATH ... but I doubt it
+ test -z "$print_defaults" && print_defaults="my_print_defaults"
+fi
+
+#
+# Read defaults file from 'basedir'. If there is no defaults file there
+# check if it's in the old (depricated) place (datadir) and read it from there
+#
+
+extra_args=""
+if test -r "$basedir/my.cnf"
+then
+ extra_args="-e $basedir/my.cnf"
+fi
+
+parse_server_arguments `$print_defaults $extra_args mysqld server mysql_server mysql.server`
+
+#
+# Set pid file if not given
+#
+if test -z "$mysqld_pid_file_path"
+then
+ mysqld_pid_file_path=$datadir/`hostname`.pid
+else
+ case "$mysqld_pid_file_path" in
+ /* ) ;;
+ * ) mysqld_pid_file_path="$datadir/$mysqld_pid_file_path" ;;
+ esac
+fi
+
+case "$mode" in
+ 'start')
+ # Start daemon
+
+ # Safeguard (relative paths, core dumps..)
+ cd $basedir
+
+ echo $echo_n "Starting MySQL"
+ if test -x $bindir/mysqld_safe
+ then
+ # Give extra arguments to mysqld with the my.cnf file. This script
+ # may be overwritten at next upgrade.
+ $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" $other_args >/dev/null &
+ wait_for_pid created "$!" "$mysqld_pid_file_path"; return_value=$?
+
+ # Make lock for RedHat / SuSE
+ if test -w "$lockdir"
+ then
+ touch "$lock_file_path"
+ fi
+
+ exit $return_value
+ else
+ log_failure_msg "Couldn't find MySQL server ($bindir/mysqld_safe)"
+ fi
+ ;;
+
+ 'stop')
+ # Stop daemon. We use a signal here to avoid having to know the
+ # root password.
+
+ if test -s "$mysqld_pid_file_path"
+ then
+ # signal mysqld_safe that it needs to stop
+ touch "$mysqld_pid_file_path.shutdown"
+
+ mysqld_pid=`cat "$mysqld_pid_file_path"`
+
+ if (kill -0 $mysqld_pid 2>/dev/null)
+ then
+ echo $echo_n "Shutting down MySQL"
+ kill $mysqld_pid
+ # mysqld should remove the pid file when it exits, so wait for it.
+ wait_for_pid removed "$mysqld_pid" "$mysqld_pid_file_path"; return_value=$?
+ else
+ log_failure_msg "MySQL server process #$mysqld_pid is not running!"
+ rm "$mysqld_pid_file_path"
+ fi
+
+ # Delete lock for RedHat / SuSE
+ if test -f "$lock_file_path"
+ then
+ rm -f "$lock_file_path"
+ fi
+ exit $return_value
+ else
+ log_failure_msg "MySQL server PID file could not be found!"
+ fi
+ ;;
+
+ 'restart')
+ # Stop the service and regardless of whether it was
+ # running or not, start it again.
+ if $0 stop $other_args; then
+ $0 start $other_args
+ else
+ log_failure_msg "Failed to stop running server, so refusing to try to start."
+ exit 1
+ fi
+ ;;
+
+ 'reload'|'force-reload')
+ if test -s "$mysqld_pid_file_path" ; then
+ read mysqld_pid < "$mysqld_pid_file_path"
+ kill -HUP $mysqld_pid && log_success_msg "Reloading service MySQL"
+ touch "$mysqld_pid_file_path"
+ else
+ log_failure_msg "MySQL PID file could not be found!"
+ exit 1
+ fi
+ ;;
+ 'status')
+ # First, check to see if pid file exists
+ if test -s "$mysqld_pid_file_path" ; then
+ read mysqld_pid < "$mysqld_pid_file_path"
+ if kill -0 $mysqld_pid 2>/dev/null ; then
+ log_success_msg "MySQL running ($mysqld_pid)"
+ exit 0
+ else
+ log_failure_msg "MySQL is not running, but PID file exists"
+ exit 1
+ fi
+ else
+ # Try to find appropriate mysqld process
+ mysqld_pid=`pgrep -d' ' -f $libexecdir/mysqld`
+
+ # test if multiple pids exist
+ pid_count=`echo $mysqld_pid | wc -w`
+ if test $pid_count -gt 1 ; then
+ log_failure_msg "Multiple MySQL running but PID file could not be found ($mysqld_pid)"
+ exit 5
+ elif test -z $mysqld_pid ; then
+ if test -f "$lock_file_path" ; then
+ log_failure_msg "MySQL is not running, but lock file ($lock_file_path) exists"
+ exit 2
+ fi
+ log_failure_msg "MySQL is not running"
+ exit 3
+ else
+ log_failure_msg "MySQL is running but PID file could not be found"
+ exit 4
+ fi
+ fi
+ ;;
+ *)
+ # usage
+ basename=`basename "$0"`
+ echo "Usage: $basename {start|stop|restart|reload|force-reload|status} [ MySQL server options ]"
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/plugins/mariadb/install.sh b/plugins/mariadb/install.sh
new file mode 100755
index 000000000..def4d2865
--- /dev/null
+++ b/plugins/mariadb/install.sh
@@ -0,0 +1,44 @@
+#!/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/mw_install.pl
+
+
+action=$1
+type=$2
+
+if [ "${2}" == "" ];then
+ echo '缺少安装脚本...' > $install_tmp
+ exit 0
+fi
+
+if [ ! -d $curPath/versions/$2 ];then
+ echo '缺少安装脚本2...' > $install_tmp
+ exit 0
+fi
+
+if [ "${action}" == "uninstall" ];then
+
+ if [ -f /usr/lib/systemd/system/mariadb.service ] || [ -f /lib/systemd/system/mariadb.service ];then
+ systemctl stop mariadb
+ systemctl disable mariadb
+ rm -rf /usr/lib/systemd/system/mariadb.service
+ rm -rf /lib/systemd/system/mariadb.service
+ systemctl daemon-reload
+ fi
+fi
+
+sh -x $curPath/versions/$2/install.sh $1
+
+if [ "${action}" == "install" ] && [ -d $serverPath/mariadb ];then
+ #初始化
+ cd ${rootPath} && python3 ${rootPath}/plugins/mariadb/index.py start ${type}
+ cd ${rootPath} && python3 ${rootPath}/plugins/mariadb/index.py initd_install ${type}
+fi
diff --git a/plugins/mariadb/js/mariadb.js b/plugins/mariadb/js/mariadb.js
new file mode 100755
index 000000000..6873ffe08
--- /dev/null
+++ b/plugins/mariadb/js/mariadb.js
@@ -0,0 +1,1221 @@
+function str2Obj(str){
+ var data = {};
+ kv = str.split('&');
+ for(i in kv){
+ v = kv[i].split('=');
+ data[v[0]] = v[1];
+ }
+ return data;
+}
+
+function myPost(method,args,callback, title){
+
+ var _args = null;
+ if (typeof(args) == 'string'){
+ _args = JSON.stringify(str2Obj(args));
+ } else {
+ _args = JSON.stringify(args);
+ }
+
+ var _title = '正在获取...';
+ if (typeof(title) != 'undefined'){
+ _title = title;
+ }
+
+ var loadT = layer.msg(_title, { icon: 16, time: 0, shade: 0.3 });
+ $.post('/plugins/run', {name:'mariadb', func:method, args:_args}, function(data) {
+ layer.close(loadT);
+ if (!data.status){
+ layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+ return;
+ }
+
+ if(typeof(callback) == 'function'){
+ callback(data);
+ }
+ },'json');
+}
+
+function myPostN(method,args,callback, title){
+
+ var _args = null;
+ if (typeof(args) == 'string'){
+ _args = JSON.stringify(str2Obj(args));
+ } else {
+ _args = JSON.stringify(args);
+ }
+
+ var _title = '正在获取...';
+ if (typeof(title) != 'undefined'){
+ _title = title;
+ }
+ $.post('/plugins/run', {name:'mariadb', func:method, args:_args}, function(data) {
+ if(typeof(callback) == 'function'){
+ callback(data);
+ }
+ },'json');
+}
+
+function myAsyncPost(method,args){
+ var _args = null;
+ if (typeof(args) == 'string'){
+ _args = JSON.stringify(str2Obj(args));
+ } else {
+ _args = JSON.stringify(args);
+ }
+
+ var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+ return syncPost('/plugins/run', {name:'mariadb', func:method, args:_args});
+}
+
+function runInfo(){
+ myPost('run_info','',function(data){
+
+ var rdata = $.parseJSON(data.data);
+ if (typeof(rdata['status']) != 'undefined'){
+ layer.msg(rdata['msg'],{icon:0,time:2000,shade: [0.3, '#000']});
+ return;
+ }
+
+ var cache_size = ((parseInt(rdata.Qcache_hits) / (parseInt(rdata.Qcache_hits) + parseInt(rdata.Qcache_inserts))) * 100).toFixed(2) + '%';
+ if (cache_size == 'NaN%') cache_size = 'OFF';
+ var Con = '\
+ \
+ | 启动时间 | ' + getLocalTime(rdata.Run) + ' | 每秒查询 | ' + parseInt(rdata.Questions / rdata.Uptime) + ' |
|---|
\
+ | 总连接次数 | ' + rdata.Connections + ' | 每秒事务 | ' + parseInt((parseInt(rdata.Com_commit) + parseInt(rdata.Com_rollback)) / rdata.Uptime) + ' |
|---|
\
+ | 发送 | ' + toSize(rdata.Bytes_sent) + ' | File | ' + rdata.File + ' |
|---|
\
+ | 接收 | ' + toSize(rdata.Bytes_received) + ' | Position | ' + rdata.Position + ' |
|---|
\
+ \
+
\
+
\
+ | | | | \
+ \
+ | 活动/峰值连接数 | ' + rdata.Threads_running + '/' + rdata.Max_used_connections + ' | 若值过大,增加max_connections |
|---|
\
+ | 线程缓存命中率 | ' + ((1 - rdata.Threads_created / rdata.Connections) * 100).toFixed(2) + '% | 若过低,增加thread_cache_size |
|---|
\
+ | 索引命中率 | ' + ((1 - rdata.Key_reads / rdata.Key_read_requests) * 100).toFixed(2) + '% | 若过低,增加key_buffer_size |
|---|
\
+ | Innodb索引命中率 | ' + ((1 - rdata.Innodb_buffer_pool_reads / rdata.Innodb_buffer_pool_read_requests) * 100).toFixed(2) + '% | 若过低,增加innodb_buffer_pool_size |
|---|
\
+ | 查询缓存命中率 | ' + cache_size + ' | ' + lan.soft.mysql_status_ps5 + ' |
|---|
\
+ | 创建临时表到磁盘 | ' + ((rdata.Created_tmp_disk_tables / rdata.Created_tmp_tables) * 100).toFixed(2) + '% | 若过大,尝试增加tmp_table_size |
|---|
\
+ | 已打开的表 | ' + rdata.Open_tables + ' | 若过大,增加table_cache_size |
|---|
\
+ | 没有使用索引的量 | ' + rdata.Select_full_join + ' | 若不为0,请检查数据表的索引是否合理 |
|---|
\
+ | 没有索引的JOIN量 | ' + rdata.Select_range_check + ' | 若不为0,请检查数据表的索引是否合理 |
|---|
\
+ | 排序后的合并次数 | ' + rdata.Sort_merge_passes + ' | 若值过大,增加sort_buffer_size |
|---|
\
+ | 锁表次数 | ' + rdata.Table_locks_waited + ' | 若值过大,请考虑增加您的数据库性能 |
|---|
\
+ \
+
\
+ \
+ \
+
';
+ $(".soft-man-con").html(LimitCon);
+ });
+}
+
+
+
+
+//数据库配置状态
+function myPerfOpt() {
+ //获取MySQL配置
+ myPost('db_status','',function(data){
+ var rdata = $.parseJSON(data.data);
+ // console.log(rdata);
+ var key_buffer_size = toSizeM(rdata.mem.key_buffer_size);
+ var query_cache_size = toSizeM(rdata.mem.query_cache_size);
+ var tmp_table_size = toSizeM(rdata.mem.tmp_table_size);
+ var innodb_buffer_pool_size = toSizeM(rdata.mem.innodb_buffer_pool_size);
+ var innodb_additional_mem_pool_size = toSizeM(rdata.mem.innodb_additional_mem_pool_size);
+ var innodb_log_buffer_size = toSizeM(rdata.mem.innodb_log_buffer_size);
+
+ var sort_buffer_size = toSizeM(rdata.mem.sort_buffer_size);
+ var read_buffer_size = toSizeM(rdata.mem.read_buffer_size);
+ var read_rnd_buffer_size = toSizeM(rdata.mem.read_rnd_buffer_size);
+ var join_buffer_size = toSizeM(rdata.mem.join_buffer_size);
+ var thread_stack = toSizeM(rdata.mem.thread_stack);
+ var binlog_cache_size = toSizeM(rdata.mem.binlog_cache_size);
+
+ var a = key_buffer_size + query_cache_size + tmp_table_size + innodb_buffer_pool_size + innodb_additional_mem_pool_size + innodb_log_buffer_size;
+ var b = sort_buffer_size + read_buffer_size + read_rnd_buffer_size + join_buffer_size + thread_stack + binlog_cache_size;
+ var memSize = a + rdata.mem.max_connections * b;
+
+
+ var memCon = '\
+
最大使用内存: \
+ \
+ ' + lan.soft.mysql_set_maxmem + ': MB\
+
\
+
key_buffer_sizeMB, ' + lan.soft.mysql_set_key_buffer_size + '
\
+
query_cache_sizeMB, ' + lan.soft.mysql_set_query_cache_size + '
\
+
tmp_table_sizeMB, ' + lan.soft.mysql_set_tmp_table_size + '
\
+
innodb_buffer_pool_sizeMB, ' + lan.soft.mysql_set_innodb_buffer_pool_size + '
\
+
innodb_log_buffer_sizeMB, ' + lan.soft.mysql_set_innodb_log_buffer_size + '
\
+
innodb_additional_mem_pool_sizeMB
\
+
sort_buffer_sizeKB * ' + lan.soft.mysql_set_conn + ', ' + lan.soft.mysql_set_sort_buffer_size + '
\
+
read_buffer_sizeKB * ' + lan.soft.mysql_set_conn + ', ' + lan.soft.mysql_set_read_buffer_size + '
\
+
read_rnd_buffer_sizeKB * ' + lan.soft.mysql_set_conn + ', ' + lan.soft.mysql_set_read_rnd_buffer_size + '
\
+
join_buffer_sizeKB * ' + lan.soft.mysql_set_conn + ', ' + lan.soft.mysql_set_join_buffer_size + '
\
+
thread_stackKB * ' + lan.soft.mysql_set_conn + ', ' + lan.soft.mysql_set_thread_stack + '
\
+
binlog_cache_sizeKB * ' + lan.soft.mysql_set_conn + ', ' + lan.soft.mysql_set_binlog_cache_size + '
\
+
thread_cache_size ' + lan.soft.mysql_set_thread_cache_size + '
\
+
table_open_cache ' + lan.soft.mysql_set_table_open_cache + '
\
+
max_connections ' + lan.soft.mysql_set_max_connections + '
\
+
\
+
物理内存: {1}MB
最大使用内存: {2}MB
可能造成的后果: 导致数据库不稳定,甚至无法启动MySQLd服务!";
+ var msg = errMsg.replace('{1}',memSize).replace('{2}',setSize);
+ layer.msg(msg,{icon:2,time:5000});
+ return;
+ }
+
+ var query_cache_size = parseInt($("input[name='query_cache_size']").val());
+ var query_cache_type = 0;
+ if (query_cache_size > 0) {
+ query_cache_type = 1;
+ }
+ var data = {
+ key_buffer_size: parseInt($("input[name='key_buffer_size']").val()),
+ query_cache_size: query_cache_size,
+ query_cache_type: query_cache_type,
+ tmp_table_size: parseInt($("input[name='tmp_table_size']").val()),
+ max_heap_table_size: parseInt($("input[name='tmp_table_size']").val()),
+ innodb_buffer_pool_size: parseInt($("input[name='innodb_buffer_pool_size']").val()),
+ innodb_log_buffer_size: parseInt($("input[name='innodb_log_buffer_size']").val()),
+ sort_buffer_size: parseInt($("input[name='sort_buffer_size']").val()),
+ read_buffer_size: parseInt($("input[name='read_buffer_size']").val()),
+ read_rnd_buffer_size: parseInt($("input[name='read_rnd_buffer_size']").val()),
+ join_buffer_size: parseInt($("input[name='join_buffer_size']").val()),
+ thread_stack: parseInt($("input[name='thread_stack']").val()),
+ binlog_cache_size: parseInt($("input[name='binlog_cache_size']").val()),
+ thread_cache_size: parseInt($("input[name='thread_cache_size']").val()),
+ table_open_cache: parseInt($("input[name='table_open_cache']").val()),
+ max_connections: parseInt($("input[name='max_connections']").val())
+ };
+
+ myPost('set_db_status', data, function(data){
+ var rdata = $.parseJSON(data.data);
+ showMsg(rdata.msg,function(){
+ reBootMySqld();
+ },{ icon: rdata.status ? 1 : 2 });
+ });
+ },'json');
+}
+
+
+//MySQL内存优化方案
+function mySQLMemOpt(opt) {
+ var query_size = parseInt($("input[name='query_cache_size']").val());
+ switch (opt) {
+ case '0':
+ $("input[name='key_buffer_size']").val(8);
+ if (query_size) $("input[name='query_cache_size']").val(4);
+ $("input[name='tmp_table_size']").val(8);
+ $("input[name='innodb_buffer_pool_size']").val(16);
+ $("input[name='sort_buffer_size']").val(256);
+ $("input[name='read_buffer_size']").val(256);
+ $("input[name='read_rnd_buffer_size']").val(128);
+ $("input[name='join_buffer_size']").val(128);
+ $("input[name='thread_stack']").val(256);
+ $("input[name='binlog_cache_size']").val(32);
+ $("input[name='thread_cache_size']").val(4);
+ $("input[name='table_open_cache']").val(32);
+ $("input[name='max_connections']").val(500);
+ break;
+ case '1':
+ $("input[name='key_buffer_size']").val(128);
+ if (query_size) $("input[name='query_cache_size']").val(64);
+ $("input[name='tmp_table_size']").val(64);
+ $("input[name='innodb_buffer_pool_size']").val(256);
+ $("input[name='sort_buffer_size']").val(768);
+ $("input[name='read_buffer_size']").val(768);
+ $("input[name='read_rnd_buffer_size']").val(512);
+ $("input[name='join_buffer_size']").val(1024);
+ $("input[name='thread_stack']").val(256);
+ $("input[name='binlog_cache_size']").val(64);
+ $("input[name='thread_cache_size']").val(64);
+ $("input[name='table_open_cache']").val(128);
+ $("input[name='max_connections']").val(100);
+ break;
+ case '2':
+ $("input[name='key_buffer_size']").val(256);
+ if (query_size) $("input[name='query_cache_size']").val(128);
+ $("input[name='tmp_table_size']").val(384);
+ $("input[name='innodb_buffer_pool_size']").val(384);
+ $("input[name='sort_buffer_size']").val(768);
+ $("input[name='read_buffer_size']").val(768);
+ $("input[name='read_rnd_buffer_size']").val(512);
+ $("input[name='join_buffer_size']").val(2048);
+ $("input[name='thread_stack']").val(256);
+ $("input[name='binlog_cache_size']").val(64);
+ $("input[name='thread_cache_size']").val(96);
+ $("input[name='table_open_cache']").val(192);
+ $("input[name='max_connections']").val(200);
+ break;
+ case '3':
+ $("input[name='key_buffer_size']").val(384);
+ if (query_size) $("input[name='query_cache_size']").val(192);
+ $("input[name='tmp_table_size']").val(512);
+ $("input[name='innodb_buffer_pool_size']").val(512);
+ $("input[name='sort_buffer_size']").val(1024);
+ $("input[name='read_buffer_size']").val(1024);
+ $("input[name='read_rnd_buffer_size']").val(768);
+ $("input[name='join_buffer_size']").val(2048);
+ $("input[name='thread_stack']").val(256);
+ $("input[name='binlog_cache_size']").val(128);
+ $("input[name='thread_cache_size']").val(128);
+ $("input[name='table_open_cache']").val(384);
+ $("input[name='max_connections']").val(300);
+ break;
+ case '4':
+ $("input[name='key_buffer_size']").val(512);
+ if (query_size) $("input[name='query_cache_size']").val(256);
+ $("input[name='tmp_table_size']").val(1024);
+ $("input[name='innodb_buffer_pool_size']").val(1024);
+ $("input[name='sort_buffer_size']").val(2048);
+ $("input[name='read_buffer_size']").val(2048);
+ $("input[name='read_rnd_buffer_size']").val(1024);
+ $("input[name='join_buffer_size']").val(4096);
+ $("input[name='thread_stack']").val(384);
+ $("input[name='binlog_cache_size']").val(192);
+ $("input[name='thread_cache_size']").val(192);
+ $("input[name='table_open_cache']").val(1024);
+ $("input[name='max_connections']").val(400);
+ break;
+ case '5':
+ $("input[name='key_buffer_size']").val(1024);
+ if (query_size) $("input[name='query_cache_size']").val(384);
+ $("input[name='tmp_table_size']").val(2048);
+ $("input[name='innodb_buffer_pool_size']").val(4096);
+ $("input[name='sort_buffer_size']").val(4096);
+ $("input[name='read_buffer_size']").val(4096);
+ $("input[name='read_rnd_buffer_size']").val(2048);
+ $("input[name='join_buffer_size']").val(8192);
+ $("input[name='thread_stack']").val(512);
+ $("input[name='binlog_cache_size']").val(256);
+ $("input[name='thread_cache_size']").val(256);
+ $("input[name='table_open_cache']").val(2048);
+ $("input[name='max_connections']").val(500);
+ break;
+ }
+}
+
+//计算MySQL内存开销
+function comMySqlMem() {
+ var key_buffer_size = parseInt($("input[name='key_buffer_size']").val());
+ var query_cache_size = parseInt($("input[name='query_cache_size']").val());
+ var tmp_table_size = parseInt($("input[name='tmp_table_size']").val());
+ var innodb_buffer_pool_size = parseInt($("input[name='innodb_buffer_pool_size']").val());
+ var innodb_additional_mem_pool_size = parseInt($("input[name='innodb_additional_mem_pool_size']").val());
+ var innodb_log_buffer_size = parseInt($("input[name='innodb_log_buffer_size']").val());
+
+ var sort_buffer_size = $("input[name='sort_buffer_size']").val() / 1024;
+ var read_buffer_size = $("input[name='read_buffer_size']").val() / 1024;
+ var read_rnd_buffer_size = $("input[name='read_rnd_buffer_size']").val() / 1024;
+ var join_buffer_size = $("input[name='join_buffer_size']").val() / 1024;
+ var thread_stack = $("input[name='thread_stack']").val() / 1024;
+ var binlog_cache_size = $("input[name='binlog_cache_size']").val() / 1024;
+ var max_connections = $("input[name='max_connections']").val();
+
+ var a = key_buffer_size + query_cache_size + tmp_table_size + innodb_buffer_pool_size + innodb_additional_mem_pool_size + innodb_log_buffer_size
+ var b = sort_buffer_size + read_buffer_size + read_rnd_buffer_size + join_buffer_size + thread_stack + binlog_cache_size
+ var memSize = a + max_connections * b
+ $("input[name='memSize']").val(memSize.toFixed(2));
+}
+
+function syncGetDatabase(){
+ myPost('sync_get_databases', null, function(data){
+ var rdata = $.parseJSON(data.data);
+ showMsg(rdata.msg,function(){
+ dbList();
+ },{ icon: rdata.status ? 1 : 2 });
+ });
+}
+
+function syncToDatabase(type){
+ var data = [];
+ $('input[type="checkbox"].check:checked').each(function () {
+ if (!isNaN($(this).val())) data.push($(this).val());
+ });
+ var postData = 'type='+type+'&ids='+JSON.stringify(data);
+ myPost('sync_to_databases', postData, function(data){
+ var rdata = $.parseJSON(data.data);
+ // console.log(rdata);
+ showMsg(rdata.msg,function(){
+ dbList();
+ },{ icon: rdata.status ? 1 : 2 });
+ });
+}
+
+function setRootPwd(type, pwd){
+ if (type==1){
+ var data = $("#mod_pwd").serialize();
+ myPost('set_root_pwd', data, function(data){
+ var rdata = $.parseJSON(data.data);
+ // console.log(rdata);
+ showMsg(rdata.msg,function(){
+ dbList();
+ $('.layui-layer-close1').click();
+ },{icon: rdata.status ? 1 : 2});
+ });
+ return;
+ }
+
+ var index = layer.open({
+ type: 1,
+ skin: 'demo-class',
+ area: '500px',
+ title: '修改数据库密码',
+ closeBtn: 1,
+ shift: 5,
+ shadeClose: true,
+ content: "
",
+ });
+
+ $('#my_mod_close').click(function(){
+ $('.layui-layer-close1').click();
+ });
+}
+
+function showHidePass(obj){
+ var a = "glyphicon-eye-open";
+ var b = "glyphicon-eye-close";
+
+ if($(obj).hasClass(a)){
+ $(obj).removeClass(a).addClass(b);
+ $(obj).prev().text($(obj).prev().attr('data-pw'))
+ }
+ else{
+ $(obj).removeClass(b).addClass(a);
+ $(obj).prev().text('***');
+ }
+}
+
+function copyPass(password){
+ var clipboard = new ClipboardJS('#bt_copys');
+ clipboard.on('success', function (e) {
+ layer.msg('复制成功',{icon:1,time:2000});
+ });
+
+ clipboard.on('error', function (e) {
+ layer.msg('复制失败，浏览器不兼容!',{icon:2,time:2000});
+ });
+ $("#bt_copys").attr('data-clipboard-text',password);
+ $("#bt_copys").click();
+}
+
+function checkSelect(){
+ setTimeout(function () {
+ var num = $('input[type="checkbox"].check:checked').length;
+ // console.log(num);
+ if (num == 1) {
+ $('button[batch="true"]').hide();
+ $('button[batch="false"]').show();
+ }else if (num>1){
+ $('button[batch="true"]').show();
+ $('button[batch="false"]').show();
+ }else{
+ $('button[batch="true"]').hide();
+ $('button[batch="false"]').hide();
+ }
+ },5)
+}
+
+function setDbAccess(username){
+ myPost('get_db_access','username='+username, function(data){
+ var rdata = $.parseJSON(data.data);
+ if (!rdata.status){
+ layer.msg(rdata.msg,{icon:2,shade: [0.3, '#000']});
+ return;
+ }
+
+ var index = layer.open({
+ type: 1,
+ area: '500px',
+ title: '设置数据库权限',
+ closeBtn: 1,
+ shift: 5,
+ shadeClose: true,
+ content: "",
+ });
+
+ layer.ready(function(){
+ if (rdata.msg == '127.0.0.1'){
+ $('select[name="dataAccess"]').find("option[value='127.0.0.1']").attr("selected",true);
+ } else if (rdata.msg == '%'){
+ $('select[name="dataAccess"]').find('option[value="%"]').attr("selected",true);
+ } else if ( rdata.msg == 'ip' ){
+ $('select[name="dataAccess"]').find('option[value="ip"]').attr("selected",true);
+ $('select[name="dataAccess"]').after("");
+ } else {
+ $('select[name="dataAccess"]').find('option[value="ip"]').attr("selected",true);
+ $('select[name="dataAccess"]').after("");
+ }
+ });
+
+ $('#my_mod_close').click(function(){
+ $('.layui-layer-close1').click();
+ });
+
+
+ $('select[name="dataAccess"]').change(function(){
+ var v = $(this).val();
+ if (v == 'ip'){
+ $(this).after("");
+ } else {
+ $('#dataAccess_subid').remove();
+ }
+ });
+
+ $('#my_mod_save').click(function(){
+ var data = $("#set_db_access").serialize();
+ data = decodeURIComponent(data);
+ var dataObj = str2Obj(data);
+ if(!dataObj['access']){
+ dataObj['access'] = dataObj['dataAccess'];
+ if ( dataObj['dataAccess'] == 'ip'){
+ if (dataObj['address']==''){
+ layer.msg('IP地址不能空!',{icon:2,shade: [0.3, '#000']});
+ return;
+ }
+ dataObj['access'] = dataObj['address'];
+ }
+ }
+ dataObj['username'] = username;
+ // console.log(data,dataObj);
+ myPost('set_db_access', dataObj, function(data){
+ var rdata = $.parseJSON(data.data);
+ showMsg(rdata.msg,function(){
+ dbList();
+ $('.layui-layer-close1').click();
+ },{icon: rdata.status ? 1 : 2});
+ });
+ });
+ });
+}
+
+function setDbPass(id, username, password){
+
+ var index = layer.open({
+ type: 1,
+ skin: 'demo-class',
+ area: '500px',
+ title: '修改数据库密码',
+ closeBtn: 1,
+ shift: 5,
+ shadeClose: true,
+ content: "",
+ });
+
+ $('#my_mod_close').click(function(){
+ $('.layui-layer-close1').click();
+ });
+
+ $('#my_mod_save').click(function(){
+ var data = $("#mod_pwd").serialize();
+ myPost('set_user_pwd', data, function(data){
+ var rdata = $.parseJSON(data.data);
+ showMsg(rdata.msg,function(){
+ dbList();
+ $('.layui-layer-close1').click();
+ },{icon: rdata.status ? 1 : 2});
+ });
+ });
+}
+
+function addDatabase(type){
+ if (type==1){
+ var data = $("#add_db").serialize();
+ data = decodeURIComponent(data);
+ var dataObj = str2Obj(data);
+ if(!dataObj['address']){
+ dataObj['address'] = dataObj['dataAccess'];
+ }
+ myPost('add_db', dataObj, function(data){
+ var rdata = $.parseJSON(data.data);
+ showMsg(rdata.msg,function(){
+ if (rdata.status){
+ dbList();
+ }
+ $('.layui-layer-close1').click();
+ },{icon: rdata.status ? 1 : 2},600);
+ });
+ return;
+ }
+ var index = layer.open({
+ type: 1,
+ skin: 'demo-class',
+ area: '500px',
+ title: '添加数据库',
+ closeBtn: 1,
+ shift: 5,
+ shadeClose: true,
+ content: "",
+ });
+
+ $("input[name='name']").keyup(function(){
+ var v = $(this).val();
+ $("input[name='db_user']").val(v);
+ $("input[name='ps']").val(v);
+ });
+
+ $('#my_mod_close').click(function(){
+ $('.layui-layer-close1').click();
+ });
+ $('select[name="dataAccess"]').change(function(){
+ var v = $(this).val();
+ if (v == 'ip'){
+ $(this).after("");
+ } else {
+ $('#dataAccess_subid').remove();
+ }
+ });
+}
+
+function delDb(id, name){
+ safeMessage('删除['+name+']','您真的要删除['+name+']吗？',function(){
+ var data='id='+id+'&name='+name
+ myPost('del_db', data, function(data){
+ var rdata = $.parseJSON(data.data);
+ showMsg(rdata.msg,function(){
+ dbList();
+ $('.layui-layer-close1').click();
+ },{icon: rdata.status ? 1 : 2}, 600);
+ });
+ });
+}
+
+function delDbBatch(){
+ var arr = [];
+ $('input[type="checkbox"].check:checked').each(function () {
+ var _val = $(this).val();
+ var _name = $(this).parent().next().text();
+ if (!isNaN(_val)) {
+ arr.push({'id':_val,'name':_name});
+ }
+ });
+
+ safeMessage('批量删除数据库','您共选择了[2]个数据库,删除后将无法恢复,真的要删除吗?',function(){
+ var i = 0;
+ $(arr).each(function(){
+ var data = myAsyncPost('del_db', this);
+ var rdata = $.parseJSON(data.data);
+ if (!rdata.status){
+ layer.msg(rdata.msg,{icon:2,time:2000,shade: [0.3, '#000']});
+ }
+ i++;
+ });
+
+ var msg = '成功删除['+i+']个数据库!';
+ showMsg(msg,function(){
+ dbList();
+ },{icon: 1}, 600);
+ });
+}
+
+
+function setDbPs(id, name, obj) {
+ var _span = $(obj);
+ var _input = $("");
+ _span.hide().after(_input);
+ _input.focus();
+ _input.blur(function(){
+ $(this).remove();
+ var ps = _input.val();
+ _span.text(ps).show();
+ var data = {name:name,id:id,ps:ps};
+ myPost('set_db_ps', data, function(data){
+ var rdata = $.parseJSON(data.data);
+ layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+ });
+ });
+ _input.keyup(function(){
+ if(event.keyCode == 13){
+ _input.trigger('blur');
+ }
+ });
+}
+
+function openPhpmyadmin(name,username,password){
+
+ data = syncPost('/plugins/check',{'name':'phpmyadmin'});
+
+
+ if (!data.status){
+ layer.msg(data.msg,{icon:2,shade: [0.3, '#000']});
+ return;
+ }
+
+ data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'status'});
+ if (data.data != 'start'){
+ layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']});
+ return;
+ }
+ // console.log(data);
+ data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_home_page'});
+ var rdata = $.parseJSON(data.data);
+ if (!rdata.status){
+ layer.msg(rdata.msg,{icon:2,shade: [0.3, '#000']});
+ return;
+ }
+ $("#toPHPMyAdmin").attr('action',rdata.data);
+
+ if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){
+ layer.msg('请先安装phpMyAdmin',{icon:2,shade: [0.3, '#000']});
+ setTimeout(function(){ window.location.href = '/soft'; },3000);
+ return;
+ }
+
+ //检查版本
+ data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'version'});
+ bigVer = data.data.split('.')[0]
+ if (bigVer>=5){
+
+ setTimeout(function(){
+ $("#toPHPMyAdmin").submit();
+ },3000);
+ layer.msg('phpMyAdmin['+data.data+']需要手动登录😭',{icon:16,shade: [0.3, '#000'],time:4000});
+
+ } else{
+ var murl = $("#toPHPMyAdmin").attr('action');
+ $("#pma_username").val(username);
+ $("#pma_password").val(password);
+ $("#db").val(name);
+
+ layer.msg('正在打开phpMyAdmin',{icon:16,shade: [0.3, '#000'],time:2000});
+
+ setTimeout(function(){
+ $("#toPHPMyAdmin").submit();
+ },3000);
+ }
+}
+
+function delBackup(filename,name){
+ myPost('delete_db_backup',{filename:filename},function(){
+ layer.msg('执行成功!');
+ setTimeout(function(){
+ $('.layui-layer-close2').click();
+ setBackup(name);
+ },2000);
+ });
+}
+
+function downloadBackup(file){
+ window.open('/files/download?filename='+encodeURIComponent(file));
+}
+
+function importBackup(file,name){
+ myPost('import_db_backup',{file:file,name:name}, function(data){
+ // console.log(data);
+ layer.msg('执行成功!');
+ });
+}
+
+function setBackup(db_name,obj){
+ myPost('get_db_backup_list', {name:db_name}, function(data){
+
+ var rdata = $.parseJSON(data.data);
+ var tbody = '';
+ for (var i = 0; i < rdata.data.length; i++) {
+ tbody += '\
+ | ' + rdata.data[i]['name'] + ' | \
+ ' + rdata.data[i]['size'] + ' | \
+ ' + rdata.data[i]['time'] + ' | \
+ \
+ 导入 | \
+ 下载 | \
+ 删除\
+ | \
+
';
+ }
+
+ var s = layer.open({
+ type: 1,
+ title: "数据库备份详情",
+ area: ['600px', '280px'],
+ closeBtn: 2,
+ shadeClose: false,
+ content: '\
+
\
+ \
+
\
+
\
+
\
+
\
+ \
+ \
+ | 文件名称 | \
+ 文件大小 | \
+ 备份时间 | \
+ 操作 | \
+
\
+ \
+ ' + tbody + '\
+
\
+
\
+
\
+
';
+ list +=' | ';
+ list += '' + rdata.data[i]['name'] +' | ';
+ list += '' + rdata.data[i]['username'] +' | ';
+ list += '' +
+ '***' +
+ ''+
+ ''+
+ ' | ';
+
+
+ list += ''+rdata.data[i]['ps']+' | ';
+ list += '';
+
+ list += ''+(rdata.data[i]['is_backup']?'备份':'未备份') +' | ';
+
+ list += '管理 | ' +
+ '工具 | ' +
+ '权限 | ' +
+ '改密 | ' +
+ '删除' +
+ ' | ';
+ list += '
';
+ }
+
+ //
+ var con = '\
+
\
+
\
+
\
+
\
+
\
+ \
+ \
+
\
+
\
+
\
+
\
+ 同步选中\
+ 同步所有\
+ 从服务器获取\
+
\
+
\
+
\
+ 二进制日志 ' + toSize(rdata.msg) + '\
+ \
+
错误日志
\
+ \
+ '
+ $(".soft-man-con").html(limitCon);
+
+ //设置二进制日志
+ $(".btn-bin").click(function () {
+ myPost('bin_log', 'close=change', function(data){
+ var rdata = $.parseJSON(data.data);
+ layer.msg(rdata.msg, { icon: rdata.status ? 1 : 5 });
+
+ setTimeout(function(){
+ myLogs();
+ }, 2000);
+ });
+ });
+
+ //清空日志
+ $(".btn-clear").click(function () {
+ myPost('error_log', 'close=1', function(data){
+ var rdata = $.parseJSON(data.data);
+ layer.msg(rdata.msg, { icon: rdata.status ? 1 : 5 });
+
+ setTimeout(function(){
+ myLogs();
+ }, 2000);
+ });
+ })
+
+ myPost('error_log', 'p=1', function(data){
+ var rdata = $.parseJSON(data.data);
+ var error_body = '';
+ if (rdata.status){
+ error_body = rdata.data;
+ } else {
+ error_body = rdata.msg;
+ }
+ $("#error_log").text(error_body);
+ var ob = document.getElementById('error_log');
+ ob.scrollTop = ob.scrollHeight;
+ });
+ });
+}
+
+
+function repCheckeds(tables) {
+ var dbs = []
+ if (tables) {
+ dbs.push(tables)
+ } else {
+ var db_tools = $("input[value^='dbtools_']");
+ for (var i = 0; i < db_tools.length; i++) {
+ if (db_tools[i].checked) dbs.push(db_tools[i].value.replace('dbtools_', ''));
+ }
+ }
+
+ if (dbs.length < 1) {
+ layer.msg('请至少选择一张表!', { icon: 2 });
+ return false;
+ }
+ return dbs;
+}
+
+function repDatabase(db_name, tables) {
+ dbs = repCheckeds(tables);
+
+ myPost('repair_table', { db_name: db_name, tables: JSON.stringify(dbs) }, function(data){
+ var rdata = $.parseJSON(data.data);
+ layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+ repTools(db_name, true);
+ },'已送修复指令,请稍候...');
+}
+
+
+function optDatabase(db_name, tables) {
+ dbs = repCheckeds(tables);
+
+ myPost('opt_table', { db_name: db_name, tables: JSON.stringify(dbs) }, function(data){
+ var rdata = $.parseJSON(data.data);
+ layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+ repTools(db_name, true);
+ },'已送优化指令,请稍候...');
+}
+
+function toDatabaseType(db_name, tables, type){
+ dbs = repCheckeds(tables);
+ myPost('alter_table', { db_name: db_name, tables: JSON.stringify(dbs),table_type: type }, function(data){
+ var rdata = $.parseJSON(data.data);
+ layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+ repTools(db_name, true);
+ }, '已送引擎转换指令,请稍候...');
+}
+
+
+function selectedTools(my_obj, db_name) {
+ var is_checked = false
+
+ if (my_obj) is_checked = my_obj.checked;
+ var db_tools = $("input[value^='dbtools_']");
+ var n = 0;
+ for (var i = 0; i < db_tools.length; i++) {
+ if (my_obj) db_tools[i].checked = is_checked;
+ if (db_tools[i].checked) n++;
+ }
+ if (n > 0) {
+ var my_btns = '\
+ \
+ \
+ '
+ $("#db_tools").html(my_btns);
+ } else {
+ $("#db_tools").html('');
+ }
+}
+
+function repTools(db_name, res){
+ myPost('get_db_info', {name:db_name}, function(data){
+ var rdata = $.parseJSON(data.data);
+ var types = { InnoDB: "MyISAM", MyISAM: "InnoDB" };
+ var tbody = '';
+ for (var i = 0; i < rdata.tables.length; i++) {
+ if (!types[rdata.tables[i].type]) continue;
+ tbody += '\
+ | \
+ ' + rdata.tables[i].table_name + ' | \
+ ' + rdata.tables[i].type + ' | \
+ ' + rdata.tables[i].collation + ' | \
+ ' + rdata.tables[i].rows_count + ' | \
+ ' + rdata.tables[i].data_size + ' | \
+ \
+ 修复 |\
+ 优化 |\
+ 转为' + types[rdata.tables[i].type] + '\
+ | \
+
'
+ }
+
+ if (res) {
+ $(".gztr").html(tbody);
+ $("#db_tools").html('');
+ $("input[type='checkbox']").attr("checked", false);
+ $(".tools_size").html('大小：' + rdata.data_size);
+ return;
+ }
+
+ layer.open({
+ type: 1,
+ title: "MySQL工具箱【" + db_name + "】",
+ area: ['780px', '580px'],
+ closeBtn: 2,
+ shadeClose: false,
+ content: '\
+
\
+
\
+
\
+ - 【修复】尝试使用REPAIR命令修复损坏的表，仅能做简单修复，若修复不成功请考虑使用myisamchk工具
\
+ - 【优化】执行OPTIMIZE命令，可回收未释放的磁盘空间，建议每月执行一次
\
+ - 【转为InnoDB/MyISAM】转换数据表引擎，建议将所有表转为InnoDB
\
+
\
- - 粘贴您的*.key以及*.pem内容，然后保存即可[帮助]。
\
+ - 粘贴您的*.key以及*.pem内容，然后保存即可。
\
- 如果浏览器提示证书链不完整,请检查是否正确拼接PEM证书
- PEM格式证书 = 域名证书.crt + 根证书(root_bundle).crt
\
\
'
diff --git a/route/static/app/public.js b/route/static/app/public.js
index 5681b16f7..643a9edd5 100755
--- a/route/static/app/public.js
+++ b/route/static/app/public.js
@@ -1107,6 +1107,31 @@ function execLog(){
});
}
+/**
+ * 获取时分秒
+ * @param {Number} seconds 总秒数
+ * @param {String} dateFormat 返回的日期格式，默认为'H:i:s'
+ */
+function getSFM(seconds, dateFormat = 'H:i:s') {
+ var obj = {};
+ obj.H = Number.parseInt(seconds / 3600);
+ obj.i = Number.parseInt((seconds - obj.H * 3600) / 60);
+ obj.s = Number.parseInt(seconds - obj.H * 3600 - obj.i * 60);
+ if (obj.H < 10) {
+ obj.H = '0' + obj.H;
+ }
+ if (obj.i < 10) {
+ obj.i = '0' + obj.i;
+ }
+ if (obj.s < 10) {
+ obj.s = '0' + obj.s;
+ }
+
+ // 3.解析
+ var rs = dateFormat.replace('H', obj.H).replace('i', obj.i).replace('s', obj.s);
+ return rs;
+}
+
function remind(a){
a = a == undefined ? 1 : a;
$.post("/task/list", "table=tasks&result=2,4,6,8&limit=10&p=" + a, function(g) {
@@ -1117,9 +1142,9 @@ function remind(a){
for(var d = 0; d < g.data.length; d++) {
if(g.data[d].status != '1'){
task_count++;
- e += ' | '+g.data[d].name+'【'+lan.bt.task_the+'】'+ lan.bt.time + (g.data[d].end - g.data[d].start) + lan.bt.s+' | '+g.data[d].addtime+' |
'
+ e += ' | '+g.data[d].name+'【'+lan.bt.task_the+'】耗时['+ getSFM(g.data[d].end - g.data[d].start) +'] | '+g.data[d].addtime+' |
'
} else{
- e += ' | '+g.data[d].name+'【'+lan.bt.task_ok+'】'+ lan.bt.time + (g.data[d].end - g.data[d].start) + lan.bt.s+' | '+g.data[d].addtime+' |
';
+ e += ' | '+g.data[d].name+'【'+lan.bt.task_ok+'】耗时['+ getSFM(g.data[d].end - g.data[d].start) +'] | '+g.data[d].addtime+' |
';
}
}
var con = '\
diff --git a/route/static/language/Simplified_Chinese/lan.js b/route/static/language/Simplified_Chinese/lan.js
index aabb15abb..bcc28814c 100755
--- a/route/static/language/Simplified_Chinese/lan.js
+++ b/route/static/language/Simplified_Chinese/lan.js
@@ -108,17 +108,17 @@ var lan = {
},
"config":{
- "close_panel_msg":"关闭面板会导致您无法访问面板 ,您真的要关闭宝塔Linux面板吗？",
+ "close_panel_msg":"关闭面板会导致您无法访问面板 ,您真的要关闭Linux面板吗？",
"close_panel_title":"关闭面板",
"config_save":"正在保存配置...",
"config_sync":"正在同步时间...",
- "config_user_binding":"绑定宝塔帐号",
- "config_user_edit":"修改绑定宝塔账号",
+ "config_user_binding":"绑定帐号",
+ "config_user_edit":"修改绑定账号",
"binding":"绑定",
"token_get":"正在获取密钥...",
- "user_bt":"宝塔官网账户",
- "pass_bt":"宝塔官网密码",
- "binding_un_msg":"您确定要解除绑定宝塔帐号码？",
+ "user_bt":"官网账户",
+ "pass_bt":"官网密码",
+ "binding_un_msg":"您确定要解除绑定帐号码？",
"binding_un_title":"解除绑定",
"binding_un":"解绑",
"ssl_close_msg":"关闭SSL后,必需使用http协议访问面板,继续吗?",
@@ -333,7 +333,7 @@ var lan = {
"install_ok":"已将安装请求添加到安装器",
"task_add":"已添加到队列",
"panel_open":"正在打开面板...",
- "panel_add":"关联宝塔面板",
+ "panel_add":"关联面板",
"panel_edit":"修改关联",
"panel_err_format":"面板地址格式不正确，示例：",
"panel_err_empty":"面板资料不能为空",
@@ -890,7 +890,7 @@ var lan = {
"enable_301":"启用301",
"to301_help_1":"选择[整站]时请不要将目标URL设为同一站点下的域名.",
"to301_help_2":"取消301重定向后，需清空浏览器缓存才能看到生效结果.",
- "bt_ssl":"宝塔SSL",
+ "bt_ssl":"SSL",
"lets_ssl":"Let\'s Encrypt免费证书",
"other":"其它",
"other_ssl":"其他证书",
@@ -901,23 +901,23 @@ var lan = {
"ssl_key":"密钥(KEY)",
"ssl_crt":"证书(PEM格式)",
"ssl_close":"关闭SSL",
- "bt_bind_no":"未绑定宝塔账号，请注册绑定，绑定宝塔账号(非论坛账号)可实现一键部署SSL",
- "bt_user":"宝塔账号",
+ "bt_bind_no":"未绑定账号，请注册绑定，绑定账号(非论坛账号)可实现一键部署SSL",
+ "bt_user":"账号",
"login":"登录",
- "bt_reg":"注册宝塔账号",
- "bt_ssl_help_1":"宝塔SSL证书为亚洲诚信证书，需要实名认证才能申请使用",
- "bt_ssl_help_2":"已有宝塔账号请登录绑定",
- "bt_ssl_help_3":"宝塔SSL申请的是TrustAsia DV SSL CA - G5 原价：1900元/1年，宝塔用户免费！",
+ "bt_reg":"注册账号",
+ "bt_ssl_help_1":"SSL证书为亚洲诚信证书，需要实名认证才能申请使用",
+ "bt_ssl_help_2":"已有账号请登录绑定",
+ "bt_ssl_help_3":"SSL申请的是TrustAsia DV SSL CA - G5 原价：1900元/1年，用户免费！",
"bt_ssl_help_4":"一年满期后免费颁发。",
"btapply":"申请",
"endtime":"到期时间",
"status":"状态",
"bt_ssl_help_5":"申请之前，请确保域名已解析，如未解析会导致审核失败",
- "bt_ssl_help_6":"宝塔SSL申请的是免费版TrustAsia DV SSL CA - G5证书，仅支持单个域名申请",
+ "bt_ssl_help_6":"SSL申请的是免费版TrustAsia DV SSL CA - G5证书，仅支持单个域名申请",
"bt_ssl_help_7":"有效期1年，不支持续签，到期后需要重新申请",
"bt_ssl_help_8":"Let\'s Encrypt免费证书，有效期3个月，支持多域名。默认会自动续签",
"bt_ssl_help_9":"若您的站点使用了CDN或301重定向会导致续签失败",
- "bt_ssl_help_10":"粘贴您的*.key以及*.pem内容，然后保存即可[帮助]。",
+ "bt_ssl_help_10":"粘贴您的*.key以及*.pem内容，然后保存即可。",
"phone_input":"请输入手机号码",
"ssl_apply_1":"正在提交订单，请稍后..",
"ssl_apply_2":"正在校验域名，请稍后..",
diff --git a/scripts/getos.sh b/scripts/getos.sh
index e98e89fba..13f8af9d5 100755
--- a/scripts/getos.sh
+++ b/scripts/getos.sh
@@ -14,6 +14,8 @@ elif grep -Eqi "Arch" /etc/issue || grep -Eq "Arch" /etc/*-release; then
OSNAME='arch'
elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
OSNAME='centos'
+elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eq "AlmaLinux" /etc/*-release; then
+ OSNAME='alma'
elif grep -Eqi "Rocky" /etc/issue || grep -Eq "Rocky" /etc/*-release; then
OSNAME='rocky'
elif grep -Eqi "Red Hat Enterprise Linux Server" /etc/issue || grep -Eq "Red Hat Enterprise Linux Server" /etc/*-release; then
diff --git a/scripts/install/alma.sh b/scripts/install/alma.sh
index 1e70f2e15..85f078dc9 100755
--- a/scripts/install/alma.sh
+++ b/scripts/install/alma.sh
@@ -81,6 +81,10 @@ for yumPack in make cmake gcc gcc-c++ gcc-g77 flex bison file libtool libtool-li
do yum -y install $yumPack;done
+# findLD=`cat /etc/ld.so.conf | grep '/usr/local/lib64'`
+# echo "/usr/local/lib64" >> /etc/ld.so.conf
+
+
cd /www/server/mdserver-web/scripts && bash lib.sh
chmod 755 /www/server/mdserver-web/data
@@ -99,11 +103,9 @@ do
fi
done
+
cd /www/server/mdserver-web && /etc/init.d/mw stop
cd /www/server/mdserver-web && /etc/init.d/mw start
cd /www/server/mdserver-web && /etc/init.d/mw default
-
-
-
diff --git a/scripts/install/fedora.sh b/scripts/install/fedora.sh
index fbba069c6..86eef8531 100644
--- a/scripts/install/fedora.sh
+++ b/scripts/install/fedora.sh
@@ -70,8 +70,9 @@ yum -y install epel-release
yum install -y libevent libevent-devel libxslt* libjpeg* libpng* gd* zip libmcrypt libmcrypt-devel
yum install -y gcc libffi-devel python-devel openssl-devel
+yum install -y curl-devel libmcrypt libmcrypt-devel python3-devel
-yum -y install wget python-devel python-imaging libicu-devel unzip bzip2-devel gcc libxml2 libxml2-dev libjpeg-devel libpng-devel libwebp libwebp-devel lsof pcre pcre-devel vixie-cron crontabs
+yum -y install wget python-devel python-imaging libicu-devel unzip bzip2-devel gcc libxml2 libxml2-devel libjpeg-devel libpng-devel libwebp libwebp-devel lsof pcre pcre-devel crontabs
yum -y install net-tools
yum -y install ncurses-devel mysql-devel cmake
yum -y install python-devel
@@ -81,6 +82,8 @@ yum -y install python3-devel
for yumPack in make cmake gcc gcc-c++ gcc-g77 flex bison file libtool libtool-libs autoconf kernel-devel patch wget libjpeg libjpeg-devel libpng libpng-devel libpng10 libpng10-devel gd gd-devel libxml2 libxml2-devel zlib zlib-devel glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel krb5 krb5-devel libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel pspell-devel libcap diffutils ca-certificates net-tools libc-client-devel psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel bison-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper lsof vixie-cron crontabs expat-devel readline-devel;
do yum -y install $yumPack;done
+dnf install libxml2 libxml2-devel -y
+
cd /www/server/mdserver-web/scripts && bash lib.sh
chmod 755 /www/server/mdserver-web/data
diff --git a/scripts/install/rocky.sh b/scripts/install/rocky.sh
index c4cbcf1b5..f0cba70db 100644
--- a/scripts/install/rocky.sh
+++ b/scripts/install/rocky.sh
@@ -13,11 +13,11 @@ fi
setenforce 0
sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config
-yum install -y wget lsof crontabs
+yum install -y wget lsof
yum install -y python3-devel
yum install -y python-devel
-yum install -y vixie-cron
-
+yum install -y crontabs
+yum install -y curl curl-devel libcurl libcurl-devel
#https need
if [ ! -d /root/.acme.sh ];then
@@ -76,8 +76,17 @@ yum install -y lsof net-tools
yum install -y ncurses-devel mysql-devel cmake
yum install -y MySQL-python
-for yumPack in make cmake gcc gcc-c++ gcc-g77 flex bison file libtool libtool-libs autoconf kernel-devel patch wget libjpeg libjpeg-devel libpng libpng-devel libpng10 libpng10-devel gd gd-devel libxml2 libxml2-devel zlib zlib-devel glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel krb5 krb5-devel libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel pspell-devel libcap diffutils ca-certificates net-tools libc-client-devel psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel bison-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper lsof vixie-cron crontabs expat-devel readline-devel;
-do yum -y install $yumPack;done
+for yumPack in make cmake gcc gcc-c++ flex bison file libtool libtool-libs autoconf kernel-devel patch wget libjpeg libjpeg-devel libpng libpng-devel gd gd-devel libxml2 libxml2-devel zlib zlib-devel glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel libcap diffutils ca-certificates net-tools libc-client-devel psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel bison-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper lsof crontabs expat-devel readline-devel;
+do dnf --enablerepo=powertools install -y $yumPack;done
+
+yum install -y libtirpc libtirpc-devel
+
+dnf install boost-locale
+
+dnf --enablerepo=powertools install -y libmemcached libmemcached-devel
+dnf --enablerepo=powertools install -y rpcgen
+dnf --enablerepo=powertools install -y oniguruma oniguruma-devel
+dnf --enablerepo=powertools install -y re2c bison
cd /www/server/mdserver-web/scripts && bash lib.sh
chmod 755 /www/server/mdserver-web/data
diff --git a/scripts/lib.sh b/scripts/lib.sh
index 8c16c5330..2ddedb25d 100755
--- a/scripts/lib.sh
+++ b/scripts/lib.sh
@@ -109,11 +109,6 @@ else
yum install -y mysql-devel
yum install -y oniguruma oniguruma-devel
yum install -y ImageMagick ImageMagick-devel
-
- if [ "$OSNAME" == "fedora" ]; then
- dnf install libxml2 libxml2-devel -y
-
- fi
fi
@@ -128,13 +123,10 @@ pip3 install --upgrade setuptools
cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt
pip3 install gevent-websocket==0.10.1
-pip3 install requests==2.20.0
pip3 install flask-caching==1.10.1
pip3 install flask-session==0.3.2
-pip3 install pymongo
-pip3 install psutil
pip3 install flask-socketio==5.2.0
-pip3 install mysqlclient
+# pip3 install mysqlclient
if [ ! -f /www/server/mdserver-web/bin/activate ];then
@@ -149,11 +141,8 @@ pip3 install --upgrade setuptools
pip3 install -r /www/server/mdserver-web/requirements.txt
pip3 install gevent-websocket==0.10.1
-pip3 install requests==2.20.0
pip3 install flask-caching==1.10.1
pip3 install flask-session==0.3.2
-pip3 install pymongo
-pip3 install psutil
pip3 install flask-socketio==5.2.0
-pip3 install mysqlclient
+# pip3 install mysqlclient
diff --git a/scripts/update/fedora.sh b/scripts/update/fedora.sh
index 231c2d532..353291eaa 100644
--- a/scripts/update/fedora.sh
+++ b/scripts/update/fedora.sh
@@ -11,8 +11,6 @@ fi
sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config
-yum install -y curl-devel libmcrypt libmcrypt-devel python36-devel
-
cd /www/server/mdserver-web/scripts && bash lib.sh
chmod 755 /www/server/mdserver-web/data
diff --git a/task.py b/task.py
index 4989153d5..98e3cbe6b 100755
--- a/task.py
+++ b/task.py
@@ -392,7 +392,7 @@ def startPHPVersion(version):
try:
# system
- phpService = '/lib/systemd/system/php' + version + '.service'
+ phpService = mw.systemdCfgDir() + '/php' + version + '.service'
if os.path.exists(phpService):
mw.execShell("systemctl restart php" + version)
if checkPHPVersion(version):
@@ -439,17 +439,40 @@ def startPHPVersion(version):
return True
-# 检查指定PHP版本
-def checkPHPVersion(version):
+def getFpmConfFile(version):
+ return mw.getServerDir() + '/php/' + version + '/etc/php-fpm.d/www.conf'
+
+
+def getFpmAddress(version):
+ fpm_address = '/tmp/php-cgi-{}.sock'.format(version)
+ php_fpm_file = getFpmConfFile(version)
try:
- url = 'http://127.0.0.1/phpfpm_status_' + version
- result = mw.httpGet(url, 1)
- if result.find('timed out'):
- raise
+ content = readFile(php_fpm_file)
+ tmp = re.findall(r"listen\s*=\s*(.+)", content)
+ if not tmp:
+ return fpm_address
+ if tmp[0].find('sock') != -1:
+ return fpm_address
+ if tmp[0].find(':') != -1:
+ listen_tmp = tmp[0].split(':')
+ if bind:
+ fpm_address = (listen_tmp[0], int(listen_tmp[1]))
+ else:
+ fpm_address = ('127.0.0.1', int(listen_tmp[1]))
+ else:
+ fpm_address = ('127.0.0.1', int(tmp[0]))
+ return fpm_address
+ except:
+ return fpm_address
+
+
+def checkPHPVersion(version):
+ # 检查指定PHP版本
+ try:
+ sock = getFpmAddress(version)
+ data = mw.requestFcgiPHP(sock, '/phpfpm_status_' + version + '?json')
+ result = str(data, encoding='utf-8')
except Exception as e:
- url = 'http://' + mw.getLocalIp() + '/phpfpm_status_' + version
- result = mw.httpGet(url, 1)
- else:
result = 'Bad Gateway'
# print(version,result)
@@ -468,7 +491,7 @@ def checkPHPVersion(version):
return True
# systemd
- systemd = '/lib/systemd/system/openresty.service'
+ systemd = mw.systemdCfgDir() + '/openresty.service'
if os.path.exists(systemd):
execShell('systemctl reload openresty')
return True