Merge branch 'master' into dev

This commit is contained in:
aixiao 2024-07-18 17:58:26 +08:00
commit ab10389228

View File

@ -17,7 +17,7 @@ Debian
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
apt -y install libclamav-dev libip4tc-dev libcurl4-openssl-dev #(或者libcurl4-gnutls-dev) apt -y install libclamav-dev libip4tc-dev libcurl4-openssl-dev #(或者libcurl4-gnutls-dev)
apt -y install libsystemd-dev libjson-c-dev libpcre2-dev clamav-freshclam apt -y install libsystemd-dev libjson-c-dev libpcre2-dev clamav-freshclam
apt -y install libltdl-dev libmspack-dev apt -y install libltdl-dev libmspack-dev cmake
freshclam # 更新病毒库(必要) freshclam # 更新病毒库(必要)
@ -36,7 +36,7 @@ Centos 7
yum install iptables-devel libcurl-devel yum install iptables-devel libcurl-devel
yum install systemd-devel libtool-ltdl-devel libmspack-devel yum install systemd-devel libtool-ltdl-devel libmspack-devel
yum install cmake3 yum install cmake3
yum -y install centos-release-scl yum -y install centos-release-scl
yum -y install devtoolset-11-gcc yum -y install devtoolset-11-gcc
source /opt/rh/devtoolset-11/enable #临时 source /opt/rh/devtoolset-11/enable #临时