From 21637f170fa6cfbb22d9e3a91efdd4717e2750d8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 14 Feb 2025 23:23:58 +0800
Subject: [PATCH 01/12] up

---
 plugins/tgbot/startup/extend/push_ad.py         | 1 -
 plugins/tgbot/startup/extend/push_notice_msg.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/plugins/tgbot/startup/extend/push_ad.py b/plugins/tgbot/startup/extend/push_ad.py
index 3ca95b32c..9de6c0315 100644
--- a/plugins/tgbot/startup/extend/push_ad.py
+++ b/plugins/tgbot/startup/extend/push_ad.py
@@ -46,7 +46,6 @@ def send_msg(bot, tag='ad', trigger_time=300):
     # 信号只在一个周期内执行一次|end
 
     # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | next,6/10 | @hu ge
-    # TTKCDN 无视移动墙/GFW/SNI阻断 TG第一性价比 | 10/m | @ssdpflood
     # SJ资源网播放计费| 14/m | next,4/14 |@sjllzyw 
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
     # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x
diff --git a/plugins/tgbot/startup/extend/push_notice_msg.py b/plugins/tgbot/startup/extend/push_notice_msg.py
index 74cf0d3ea..c4d9a962b 100644
--- a/plugins/tgbot/startup/extend/push_notice_msg.py
+++ b/plugins/tgbot/startup/extend/push_notice_msg.py
@@ -55,7 +55,6 @@ def send_msg(bot, tag='ad', trigger_time=300):
     # 信号只在一个周期内执行一次|end
 
     # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | next,6/10 | @hu ge
-    # TTKCDN | 10/m | @ssdpflood | 5
     # SJ资源网播放计费| 14/m | next,4/14 |@sjllzyw
     # https://t.me/gjgzs2022 ｜ 22/m | @GJ_gzs
     # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x

From 08558b1581251e21eadb0077840a88dd1c1e15f8 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 15 Feb 2025 21:14:41 +0800
Subject: [PATCH 02/12] Update imagemagick.sh

---
 plugins/php/versions/common/imagemagick.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/php/versions/common/imagemagick.sh b/plugins/php/versions/common/imagemagick.sh
index 34ad72961..775c4cd86 100755
--- a/plugins/php/versions/common/imagemagick.sh
+++ b/plugins/php/versions/common/imagemagick.sh
@@ -21,6 +21,8 @@ version=$2
 if [ "$version" == "53" ];then
 	echo 'not need'
 	exit 0
+elif [ "$version" == "80" ];then
+	LIBV=3.6.0
 elif [ "$version" -lt "70" ];then
 	LIBV=3.6.0
 else

From d8d8c630a56574b1b27e611fe94bb54ec6a461cb Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 15 Feb 2025 22:13:39 +0800
Subject: [PATCH 03/12] update

---
 plugins/php/versions/83/install.sh | 4 ++--
 plugins/php/versions/84/install.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/php/versions/83/install.sh b/plugins/php/versions/83/install.sh
index 372c0ed2e..c4acfd4a1 100755
--- a/plugins/php/versions/83/install.sh
+++ b/plugins/php/versions/83/install.sh
@@ -9,7 +9,7 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-version=8.3.15
+version=8.3.17
 PHP_VER=83
 Install_php()
 {
@@ -50,7 +50,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	fi
 
 	#检测文件是否损坏.
-	md5_file_ok=3df5d45637283f759eef8fc3ce03de829ded3e200c3da278936a684955d2f94f
+	md5_file_ok=6158ee678e698395da13d72c7679a406d2b7554323432f14d37b60ed87d8ccfb
 	if [ -f $sourcePath/php/php-${version}.tar.xz ];then
 		md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
 		if [ "${md5_file}" != "${md5_file_ok}" ]; then
diff --git a/plugins/php/versions/84/install.sh b/plugins/php/versions/84/install.sh
index 85f82b1d1..2aecb822c 100755
--- a/plugins/php/versions/84/install.sh
+++ b/plugins/php/versions/84/install.sh
@@ -9,7 +9,7 @@ serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source
 sysName=`uname`
 
-version=8.4.2
+version=8.4.4
 PHP_VER=84
 Install_php()
 {
@@ -35,7 +35,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	fi
 
 	#检测文件是否损坏.
-	# md5_file_ok=92636453210f7f2174d6ee6df17a5811368f556a6c2c2cbcf019321e36456e01
+	# md5_file_ok=05a6c9a2cc894dd8be719ecab221b311886d5e0c02cb6fac648dd9b3459681ac
 	# if [ -f $sourcePath/php/php-${version}.tar.xz ];then
 	# 	md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
 	# 	if [ "${md5_file}" != "${md5_file_ok}" ]; then

From ce65fb92347b67a9f0b0fdab4b62529a4b8c9fbe Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 15 Feb 2025 22:21:34 +0800
Subject: [PATCH 04/12] Update imagemagick.sh

---
 plugins/php/versions/common/imagemagick.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/php/versions/common/imagemagick.sh b/plugins/php/versions/common/imagemagick.sh
index 775c4cd86..34ad72961 100755
--- a/plugins/php/versions/common/imagemagick.sh
+++ b/plugins/php/versions/common/imagemagick.sh
@@ -21,8 +21,6 @@ version=$2
 if [ "$version" == "53" ];then
 	echo 'not need'
 	exit 0
-elif [ "$version" == "80" ];then
-	LIBV=3.6.0
 elif [ "$version" -lt "70" ];then
 	LIBV=3.6.0
 else

From 5fd4c84a184a5aa662868c90d4f3a094cce3bfe5 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 15 Feb 2025 22:26:08 +0800
Subject: [PATCH 05/12] Update ubuntu.sh

---
 scripts/install/ubuntu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh
index 44bdc2a41..984f130a4 100644
--- a/scripts/install/ubuntu.sh
+++ b/scripts/install/ubuntu.sh
@@ -152,7 +152,7 @@ apt install -y libargon2-dev
 
 apt install -y libmemcached-dev
 apt install -y libsasl2-dev
-apt install -y imagemagick 
+apt install -y imagemagick
 apt install -y libmagickwand-dev
 
 apt install -y libxml2 libxml2-dev libbz2-dev libmcrypt-dev libpspell-dev librecode-dev

From e04fc75be016080ca5562721b906f6ddb275a175 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sat, 15 Feb 2025 22:41:49 +0800
Subject: [PATCH 06/12] Update index.py

---
 plugins/php/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/index.py b/plugins/php/index.py
index be3b7f287..9b9008569 100755
--- a/plugins/php/index.py
+++ b/plugins/php/index.py
@@ -344,7 +344,7 @@ def phpOp(version, method):
 
 
 def start(version):
-    cmd = 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/www/server/lib/icu/lib:/opt/homebrew/lib'
+    cmd = 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/www/server/lib/icu/lib:/usr/lib/x86_64-linux-gnu/:/opt/homebrew/lib'
     mw.execShell(cmd)
     return phpOp(version, 'start')
 

From 232db27a15404318ecdf32689c849998e7748d79 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 16 Feb 2025 09:15:45 +0800
Subject: [PATCH 07/12] update

---
 scripts/install/debian.sh | 3 ++-
 scripts/install/ubuntu.sh | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/install/debian.sh b/scripts/install/debian.sh
index 29728475e..04798b8ae 100644
--- a/scripts/install/debian.sh
+++ b/scripts/install/debian.sh
@@ -214,7 +214,8 @@ apt install -y libargon2-dev
 
 apt install -y libmemcached-dev
 apt install -y libsasl2-dev
-apt install -y imagemagick 
+apt install -y imagemagick
+apt install -y libmagickcore-dev
 apt install -y libmagickwand-dev
 
 apt install -y libxml2 libxml2-dev libbz2-dev libmcrypt-dev libpspell-dev librecode-dev
diff --git a/scripts/install/ubuntu.sh b/scripts/install/ubuntu.sh
index 984f130a4..c875e9192 100644
--- a/scripts/install/ubuntu.sh
+++ b/scripts/install/ubuntu.sh
@@ -153,6 +153,7 @@ apt install -y libargon2-dev
 apt install -y libmemcached-dev
 apt install -y libsasl2-dev
 apt install -y imagemagick
+apt install -y libmagickcore-dev
 apt install -y libmagickwand-dev
 
 apt install -y libxml2 libxml2-dev libbz2-dev libmcrypt-dev libpspell-dev librecode-dev

From af6403d75249d756dde69317af044b0e12478277 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 16 Feb 2025 09:42:16 +0800
Subject: [PATCH 08/12] Update imagemagick.sh

---
 plugins/php/versions/common/imagemagick.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/php/versions/common/imagemagick.sh b/plugins/php/versions/common/imagemagick.sh
index 34ad72961..dccd27a01 100755
--- a/plugins/php/versions/common/imagemagick.sh
+++ b/plugins/php/versions/common/imagemagick.sh
@@ -68,6 +68,10 @@ Install_lib()
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
 
+		if [ "$version" -gt "74" ];then
+			OPTIONS="$OPTIONS --disable-openmp"
+		if
+
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
 		make clean && make && make install && make clean

From b1e36d8a71a30e3f9e0c989f6b164401498a9ab9 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 16 Feb 2025 09:43:42 +0800
Subject: [PATCH 09/12] Update imagemagick.sh

---
 plugins/php/versions/common/imagemagick.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/php/versions/common/imagemagick.sh b/plugins/php/versions/common/imagemagick.sh
index dccd27a01..0db95b85b 100755
--- a/plugins/php/versions/common/imagemagick.sh
+++ b/plugins/php/versions/common/imagemagick.sh
@@ -70,7 +70,7 @@ Install_lib()
 
 		if [ "$version" -gt "74" ];then
 			OPTIONS="$OPTIONS --disable-openmp"
-		if
+		fi
 
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS

From cbba4adb19096f0a1ea3de923e88ab660d1de322 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 16 Feb 2025 09:48:07 +0800
Subject: [PATCH 10/12] Update imagemagick.sh

---
 plugins/php/versions/common/imagemagick.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/php/versions/common/imagemagick.sh b/plugins/php/versions/common/imagemagick.sh
index 0db95b85b..bbe1411dc 100755
--- a/plugins/php/versions/common/imagemagick.sh
+++ b/plugins/php/versions/common/imagemagick.sh
@@ -68,9 +68,9 @@ Install_lib()
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
 
-		if [ "$version" -gt "74" ];then
-			OPTIONS="$OPTIONS --disable-openmp"
-		fi
+		# if [ "$version" -gt "74" ];then
+		# 	OPTIONS="$OPTIONS --disable-openmp"
+		# fi
 
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS

From 2c8de3e7bea09cb2b8c6e4bb6f0a04517b84cbd3 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Sun, 16 Feb 2025 10:03:47 +0800
Subject: [PATCH 11/12] Create imagemagick.sh

---
 plugins/php/lib/imagemagick.sh | 39 ++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 plugins/php/lib/imagemagick.sh

diff --git a/plugins/php/lib/imagemagick.sh b/plugins/php/lib/imagemagick.sh
new file mode 100644
index 000000000..8e1d074e0
--- /dev/null
+++ b/plugins/php/lib/imagemagick.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+
+igmVersion="7.1.1-15"
+# echo $rootPath
+
+SERVER_ROOT=$rootPath/lib
+SOURCE_ROOT=$rootPath/source/lib
+
+if [ ! -d ${SERVER_ROOT}/ImageMagick ];then
+    cd ${SOURCE_ROOT}
+    if [ ! -f ${SOURCE_ROOT}/ImageMagick-${igmVersion}.tar.gz ];then
+        wget --no-check-certificate -O ImageMagick-${igmVersion}.tar.gz  https://imagemagick.org/archive/ImageMagick-${igmVersion}.tar.gz -T 20
+    fi
+
+    tar -zxf ImageMagick-${igmVersion}.tar.gz
+    cd ImageMagick-${igmVersion}
+    ./configure --prefix=${SERVER_ROOT}/ImageMagick --disable-openmp
+    make && make install
+
+    if [ -d /etc/ld.so.conf.d ];then
+        echo "/www/server/lib/ImageMagick/lib" > /etc/ld.so.conf.d/ImageMagick.conf
+    elif [ -f /etc/ld.so.conf ]; then
+        echo "/www/server/lib/ImageMagick/lib" >> /etc/ld.so.conf
+    fi
+
+    ldconfig
+
+    cd $SOURCE_ROOT && rm -rf $SOURCE_ROOT/ImageMagick-${igmVersion}
+fi
+
+

From 5507cfdb7b5abf0ad75d21987e8aa8e4f0a9a91f Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Tue, 18 Feb 2025 16:12:50 +0800
Subject: [PATCH 12/12] Update install.sh

---
 plugins/phpmyadmin/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/phpmyadmin/install.sh b/plugins/phpmyadmin/install.sh
index f2408c89f..7846f042b 100755
--- a/plugins/phpmyadmin/install.sh
+++ b/plugins/phpmyadmin/install.sh
@@ -45,7 +45,6 @@ Install_phpmyadmin()
 	fi
 
 	mkdir -p ${serverPath}/source/phpmyadmin
-	echo "${1}" > ${serverPath}/phpmyadmin/version.pl
 	
 	VER=$1
 	
@@ -66,7 +65,8 @@ Install_phpmyadmin()
 	cp -r $serverPath/source/phpmyadmin/$FDIR $serverPath/phpmyadmin/
 	cd $serverPath/phpmyadmin/ && mv $FDIR phpmyadmin
 	rm -rf $serverPath/source/phpmyadmin/$FDIR
-	
+
+	echo "${1}" > ${serverPath}/phpmyadmin/version.pl
 	cd ${rootPath} && python3 ${rootPath}/plugins/phpmyadmin/index.py start
 	
 	echo '安装完成'