From 2a935845bf6795cf37e0e3c2003e7a3a6ab88186 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Tue, 17 Dec 2024 23:54:44 +0800 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b169f8225d..888aba03db 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Talk is cheap, show me the code. -- linus ### 特别赞助 -- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan1.cc) +- [虚位以待](https://bbs.midoks.icu) ### 主要插件介绍 From 80844562e97a5d6695aff349cc618de1843302f7 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 18 Dec 2024 00:07:06 +0800 Subject: [PATCH 2/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 888aba03db..13f974eb0f 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Talk is cheap, show me the code. -- linus * PHP[53-84] - PHP是世界上最好的编程语言。 * MySQL - 一种关系数据库管理系统。 * MariaDB - 是MySQL的一个重要分支。 -* MySQL[APT/YUM] - 一种关系数据库管理系统。 +* MySQL[community] - 一种关系数据库管理系统。 * MongoDB - 一种非关系NOSQL数据库管理系统。 * phpMyAdmin - 著名Web端MySQL管理工具。 * Memcached - 一个高性能的分布式内存对象缓存系统。 From 037e7e907b9066d1849860b4e734c3aecea65fbf Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 18 Dec 2024 00:09:08 +0800 Subject: [PATCH 3/5] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 13f974eb0f..dddcb70bb2 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ Talk is cheap, show me the code. -- linus * MariaDB - 是MySQL的一个重要分支。 * MySQL[community] - 一种关系数据库管理系统。 * MongoDB - 一种非关系NOSQL数据库管理系统。 +* PostgreSQL - 功能强大的开源数据库。 * phpMyAdmin - 著名Web端MySQL管理工具。 * Memcached - 一个高性能的分布式内存对象缓存系统。 * Redis - 一个高性能的KV数据库。 From eb373af6ed7b44753bbd53bb398bc3f9117f7f5e Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 18 Dec 2024 00:18:18 +0800 Subject: [PATCH 4/5] update --- scripts/install/alma.sh | 2 ++ scripts/install/amazon.sh | 2 ++ scripts/install/centos.sh | 1 + scripts/install/euler.sh | 1 + scripts/install/fedora.sh | 1 + scripts/install/freebsd.sh | 1 + scripts/install/opensuse.sh | 1 + scripts/install/rhel.sh | 4 ++-- scripts/install/rocky.sh | 1 + 9 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/install/alma.sh b/scripts/install/alma.sh index 06f71a7cf3..a1eb862b83 100755 --- a/scripts/install/alma.sh +++ b/scripts/install/alma.sh @@ -17,6 +17,8 @@ dnf install -y mysql-devel dnf install -y pv yum install -y bzip2 yum install -y bzip2-devel +yum install -y ncurses-compat-libs +yum install -y numactl SSH_PORT=`netstat -ntpl|grep sshd|grep -v grep | sed -n "1,1p" | awk '{print $4}' | awk -F : '{print $2}'` if [ "$SSH_PORT" == "" ];then diff --git a/scripts/install/amazon.sh b/scripts/install/amazon.sh index 378580fbf6..ef5e80bb9b 100755 --- a/scripts/install/amazon.sh +++ b/scripts/install/amazon.sh @@ -25,6 +25,8 @@ yum install -y pv yum install -y bc yum install -y bzip2 yum install -y bzip2-devel +yum install -y ncurses-compat-libs +yum install -y numactl SSH_PORT=`netstat -ntpl|grep sshd|grep -v grep | sed -n "1,1p" | awk '{print $4}' | awk -F : '{print $2}'` if [ "$SSH_PORT" == "" ];then diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh index e60145a49d..3bccb24c96 100755 --- a/scripts/install/centos.sh +++ b/scripts/install/centos.sh @@ -36,6 +36,7 @@ yum install -y bc yum install -y bzip2 yum install -y bzip2-devel yum install -y ncurses-compat-libs +yum install -y numactl # if [ -f /usr/sbin/iptables ];then diff --git a/scripts/install/euler.sh b/scripts/install/euler.sh index 674f9dc5b7..b097979b87 100755 --- a/scripts/install/euler.sh +++ b/scripts/install/euler.sh @@ -36,6 +36,7 @@ yum install -y bc yum install -y bzip2 yum install -y bzip2-devel yum install -y ncurses-compat-libs +yum install -y numactl # if [ -f /usr/sbin/iptables ];then diff --git a/scripts/install/fedora.sh b/scripts/install/fedora.sh index 2e1af655b6..89bda46356 100644 --- a/scripts/install/fedora.sh +++ b/scripts/install/fedora.sh @@ -16,6 +16,7 @@ sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config yum install -y wget curl lsof unzip yum install -y expect yum install -y ncurses-compat-libs +yum install -y numactl dnf install crontabs -y SSH_PORT=`netstat -ntpl|grep sshd|grep -v grep | sed -n "1,1p" | awk '{print $4}' | awk -F : '{print $2}'` diff --git a/scripts/install/freebsd.sh b/scripts/install/freebsd.sh index fbbd863ef9..22abafa438 100644 --- a/scripts/install/freebsd.sh +++ b/scripts/install/freebsd.sh @@ -64,6 +64,7 @@ pkg install -y pv pkg install -y bc pkg install -y bzip2 pkg install -y bzip2-devel +pkg install -y numactl # curl https://sh.rustup.rs -sSf | sh pkg install -y rust diff --git a/scripts/install/opensuse.sh b/scripts/install/opensuse.sh index 2017bcdcff..f48e8450e3 100644 --- a/scripts/install/opensuse.sh +++ b/scripts/install/opensuse.sh @@ -57,6 +57,7 @@ zypper install -y freetype2-devel zypper install -y libargon2-devel zypper install -y net-tools-deprecated +zypper install -y numactl # zypper install -y php-config diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh index 6149c2d1ac..6b40677ab4 100644 --- a/scripts/install/rhel.sh +++ b/scripts/install/rhel.sh @@ -198,7 +198,7 @@ if [ "$VERSION_ID" -ge "8" ];then openssl openssl-devel patchelf libargon2-devel \ ImageMagick ImageMagick-devel libyaml-devel \ pv bc \ - ncurses-compat-libs \ + ncurses-compat-libs numactl \ readline-devel rpcgen sqlite-devel rar unrar tar unzip vim-minimal wget zip zlib zlib-devel; do # dnf --enablerepo=remi,appstream,baseos,epel,extras,powertools install -y oniguruma5php-devel @@ -219,7 +219,7 @@ else make mysql-devel ncurses ncurses-devel net-tools oniguruma oniguruma-devel openldap openldap-devel \ openssl openssl-devel patch pcre pcre-devel perl perl-Data-Dumper perl-devel psmisc python-devel \ pv bc\ - ncurses-compat-libs \ + ncurses-compat-libs numactl \ python3-devel python3-pip re2c readline-devel rpcgen sqlite-devel tar unzip rar unrar vim-minimal vixie-cron \ wget zip zlib zlib-devel ImageMagick ImageMagick-devel libyaml-devel patchelf libargon2-devel; do diff --git a/scripts/install/rocky.sh b/scripts/install/rocky.sh index c74c18e11b..685a3608dc 100644 --- a/scripts/install/rocky.sh +++ b/scripts/install/rocky.sh @@ -26,6 +26,7 @@ yum install -y bzip2-devel yum install -y libzip-devel yum install -y re2c yum install -y ncurses-compat-libs +yum install -y numactl if [ -f /usr/sbin/iptables ];then From f6786b367b1325f1318a41d5f84648e944da4595 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 18 Dec 2024 00:20:40 +0800 Subject: [PATCH 5/5] Update sql_mysql.py --- plugins/data_query/sql_mysql.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py index 66bd7febc5..46ae1f4f5e 100755 --- a/plugins/data_query/sql_mysql.py +++ b/plugins/data_query/sql_mysql.py @@ -135,7 +135,7 @@ def getServerList(self): local_mysql_yum = "{}/mysql-community/etc/my.cnf".format(mw.getServerDir()) if os.path.exists(local_mysql_yum): - data.append({'name':'本地服务器[community]', 'val':'mysql-community'}) + data.append({'name':'本地服务器[Tar]', 'val':'mysql-community'}) return mw.returnData(True, 'ok', data) @singleton