From ebadd6d80d1dc5b2a6967ee2c7cf975b855b3b52 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Fri, 5 May 2023 22:16:53 +0800
Subject: [PATCH 01/20] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=B7=B3=E8=BD=AC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 class/core/config_api.py            | 2 +-
 route/static/app/config.js          | 6 +++++-
 route/templates/default/config.html | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/class/core/config_api.py b/class/core/config_api.py
index d8c7f17fec..b8175c622b 100755
--- a/class/core/config_api.py
+++ b/class/core/config_api.py
@@ -27,7 +27,7 @@
 
 class config_api:
 
-    __version = '0.14.3'
+    __version = '0.14.3.1'
     __api_addr = 'data/api.json'
 
     def __init__(self):
diff --git a/route/static/app/config.js b/route/static/app/config.js
index 031fe210a5..02d3c9dcd1 100755
--- a/route/static/app/config.js
+++ b/route/static/app/config.js
@@ -36,10 +36,14 @@ $('input[name="host_ip"]').change(function(){
 
 $('input[name="port"]').change(function(){
 	var port = $(this).val();
+	var old_port = $(this).data('port');
 	$('.btn_port').removeAttr('disabled');
 	$('.btn_port').unbind().click(function(){
 		$.post('/config/set_port','port='+port, function(rdata){
-			showMsg(rdata.msg,function(){window.location.reload();},{icon:rdata.status?1:2},2000);
+			showMsg(rdata.msg,function(){
+				window.location.href = window.location.href.replace(old_port,port);
+				// window.location.reload();
+			},{icon:rdata.status?1:2},2000);
 		},'json');
 	});
 });
diff --git a/route/templates/default/config.html b/route/templates/default/config.html
index 82a6001a19..b01374e69a 100755
--- a/route/templates/default/config.html
+++ b/route/templates/default/config.html
@@ -54,7 +54,7 @@
 
 					<p class="mtb15">
 						<span class="set-tit text-right">面板端口</span>
-						<input id="banport" name="port" class="inputtxt bt-input-text" type="numner" value="{{data['port']}}" maxlength="5">
+						<input data-port="{{data['port']}}" id="banport" name="port" class="inputtxt bt-input-text" type="numner" value="{{data['port']}}" maxlength="5">
 						<button type="button" class="btn btn-success btn-sm ml5 btn_port" disabled>保存</button>
 						<span class="set-info c7">建议端口范围7200 - 65535</span>
 					</p>

From 3c8f9bcf9635f847fba1c80999185f83451618c7 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Fri, 5 May 2023 22:19:26 +0800
Subject: [PATCH 02/20] Update config.js

---
 route/static/app/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/route/static/app/config.js b/route/static/app/config.js
index 02d3c9dcd1..36a965456e 100755
--- a/route/static/app/config.js
+++ b/route/static/app/config.js
@@ -43,7 +43,7 @@ $('input[name="port"]').change(function(){
 			showMsg(rdata.msg,function(){
 				window.location.href = window.location.href.replace(old_port,port);
 				// window.location.reload();
-			},{icon:rdata.status?1:2},2000);
+			},{icon:rdata.status?1:2},5000);
 		},'json');
 	});
 });

From fcdf2e18b290c0f714e61e0b110411bc8ff65e21 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Fri, 5 May 2023 22:19:33 +0800
Subject: [PATCH 03/20] Update config_api.py

---
 class/core/config_api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/class/core/config_api.py b/class/core/config_api.py
index b8175c622b..bac7eb9693 100755
--- a/class/core/config_api.py
+++ b/class/core/config_api.py
@@ -27,7 +27,7 @@
 
 class config_api:
 
-    __version = '0.14.3.1'
+    __version = '0.14.3.2'
     __api_addr = 'data/api.json'
 
     def __init__(self):

From dfe46332dbbdda27d1f6419baa75a4bc0baa3139 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Fri, 5 May 2023 22:49:39 +0800
Subject: [PATCH 04/20] up

---
 scripts/install.sh        | 2 +-
 scripts/install/centos.sh | 4 +++-
 scripts/install/fedora.sh | 2 +-
 scripts/install_dev.sh    | 2 +-
 scripts/update.sh         | 8 ++++----
 scripts/update_dev.sh     | 6 +++---
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 756826016e..9d470bca59 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -32,7 +32,7 @@ elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
 	OSNAME='rhel'
 	yum install -y wget curl zip unzip tar crontabs
 elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
-	OSNAME='fedora'
+	OSNAME='rhel'
 	yum install -y wget curl zip unzip tar crontabs
 elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
 	OSNAME='rhel'
diff --git a/scripts/install/centos.sh b/scripts/install/centos.sh
index b6d9590470..57fe012645 100755
--- a/scripts/install/centos.sh
+++ b/scripts/install/centos.sh
@@ -18,7 +18,9 @@ yum install -y python3-devel
 yum install -y python3-pip
 yum install -y python-devel
 yum install -y vixie-cron
-yum install -y curl-devel libmcrypt libmcrypt-devel
+yum install -y curl-devel  
+yum install -y libmcrypt
+yum install -y libmcrypt-devel
 yum install -y mysql-devel
 yum install -y expect
 
diff --git a/scripts/install/fedora.sh b/scripts/install/fedora.sh
index 2349e2987d..97ac1520d6 100644
--- a/scripts/install/fedora.sh
+++ b/scripts/install/fedora.sh
@@ -68,7 +68,7 @@ yum install -y epel-release
 
 yum install -y libevent libevent-devel 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 install -y libmcrypt libmcrypt-devel python3-devel
 
 yum install -y wget python-devel python-imaging libicu-devel unzip bzip2-devel gcc libxml2 libxml2-devel libjpeg-devel libpng-devel libwebp libwebp-devel pcre pcre-devel crontabs
 yum install -y net-tools
diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh
index 99cbf2de8c..8455b0c485 100755
--- a/scripts/install_dev.sh
+++ b/scripts/install_dev.sh
@@ -36,7 +36,7 @@ elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
 	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
-	OSNAME='fedora'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
 	OSNAME='rhel'
diff --git a/scripts/update.sh b/scripts/update.sh
index 7a0799b4e1..be2c37cab4 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -28,16 +28,16 @@ elif grep -Eqi "openSUSE" /etc/*-release; then
 elif grep -Eqi "FreeBSD" /etc/*-release; then
 	OSNAME='freebsd'
 elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
-	OSNAME='centos'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
-	OSNAME='fedora'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
-	OSNAME='rocky'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
-	OSNAME='alma'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
 	OSNAME='amazon'
diff --git a/scripts/update_dev.sh b/scripts/update_dev.sh
index 8c38e0aca1..024b9ecc23 100755
--- a/scripts/update_dev.sh
+++ b/scripts/update_dev.sh
@@ -31,13 +31,13 @@ elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
 	OSNAME='centos'
 	yum install -y wget zip unzip
 elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
-	OSNAME='fedora'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
-	OSNAME='rocky'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
-	OSNAME='alma'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
 	OSNAME='amazon'

From 908b6e67c6cbd71d6246a96fbc52f9e1929ba62e Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Fri, 5 May 2023 23:21:57 +0800
Subject: [PATCH 05/20] Update rhel.sh

---
 scripts/install/rhel.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh
index 88c1e6f9e1..6009b30a46 100644
--- a/scripts/install/rhel.sh
+++ b/scripts/install/rhel.sh
@@ -2,6 +2,7 @@
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 export LANG=en_US.UTF-8
+SYS_ARCH=`arch`
 
 if [ ! -f /usr/bin/applydeltarpm ];then
     yum -y provides '*/applydeltarpm'
@@ -28,6 +29,12 @@ if [ $VERSION_ID -ge 8 ];then
     PKGMGR='dnf'
 fi
 
+# install remi source 
+if [ $VERSION_ID -ge 8 ];then
+    rpm -ivh http://rpms.famillecollet.com/enterprise/remi-release-9.rpm
+    rpm --import http://rpms.famillecollet.com/RPM-GPG-KEY-remi
+fi
+
 #https need
 if [ ! -d /root/.acme.sh ];then
     curl https://get.acme.sh | sh
@@ -120,9 +127,9 @@ $PKGMGR groupinstall -y "Development Tools"
 if [ $VERSION_ID -ge 8 ];then
     # EL8 及以上
     if [ $VERSION_ID -ge 9 ];then
-        REPOS='--enablerepo=appstream,baseos,epel,extras,crb'
+        REPOS='--enablerepo=remi,appstream,baseos,epel,extras,crb'
     else
-        REPOS='--enablerepo=appstream,baseos,epel,extras,powertools'
+        REPOS='--enablerepo=remi,appstream,baseos,epel,extras,powertools'
     fi
 
     for rpms in gcc gcc-c++ lsof autoconf bzip2 bzip2-devel c-ares-devel \

From edc0be11a10d0c6d2940a4dbc2262eee563c9838 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Fri, 5 May 2023 23:22:22 +0800
Subject: [PATCH 06/20] Update rhel.sh

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

diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh
index 6009b30a46..b283defa76 100644
--- a/scripts/install/rhel.sh
+++ b/scripts/install/rhel.sh
@@ -139,7 +139,7 @@ if [ $VERSION_ID -ge 8 ];then
         libicu-devel libidn libidn-devel libmcrypt libmcrypt-devel libmemcached libmemcached-devel \
         libpng libpng-devel libstdc++.so.6 libtirpc libtirpc-devel libtool libtool-libs libwebp libwebp-devel \
         libxml2 libxml2-devel libxslt libxslt-devel libarchive make mysql-devel ncurses ncurses-devel net-tools \
-        oniguruma oniguruma-devel patch pcre pcre-devel perl perl-Data-Dumper perl-devel procps psmisc python3-devel \
+        oniguruma oniguruma-devel oniguruma5php-devel patch pcre pcre-devel perl perl-Data-Dumper perl-devel procps psmisc python3-devel \
         readline-devel rpcgen sqlite-devel tar unzip vim-minimal wget zip zlib zlib-devel ;
     do
         dnf $REPOS install -y $rpms;

From 63a0f0fbdc8a71632abd95d72995d20a03c42ec8 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Fri, 5 May 2023 23:32:07 +0800
Subject: [PATCH 07/20] Update rhel.sh

---
 scripts/install/rhel.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh
index b283defa76..f30a997c0a 100644
--- a/scripts/install/rhel.sh
+++ b/scripts/install/rhel.sh
@@ -30,9 +30,11 @@ if [ $VERSION_ID -ge 8 ];then
 fi
 
 # install remi source 
-if [ $VERSION_ID -ge 8 ];then
-    rpm -ivh http://rpms.famillecollet.com/enterprise/remi-release-9.rpm
-    rpm --import http://rpms.famillecollet.com/RPM-GPG-KEY-remi
+if [ $VERSION_ID -eq 9 ];then
+    if [ ! -d /etc/yum.repos.d/remi.repo ];then
+        rpm -ivh http://rpms.famillecollet.com/enterprise/remi-release-9.rpm
+        rpm --import http://rpms.famillecollet.com/RPM-GPG-KEY-remi
+    fi
 fi
 
 #https need

From 005e0f1513a3f6cfcc4b8c544151f980123b6c7a Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 12:27:54 +0800
Subject: [PATCH 08/20] Update rhel.sh

---
 scripts/install/rhel.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh
index f30a997c0a..feaefd2d35 100644
--- a/scripts/install/rhel.sh
+++ b/scripts/install/rhel.sh
@@ -30,7 +30,7 @@ if [ $VERSION_ID -ge 8 ];then
 fi
 
 # install remi source 
-if [ $VERSION_ID -eq 9 ];then
+if [ "$VERSION_ID" == "9" ];then
     if [ ! -d /etc/yum.repos.d/remi.repo ];then
         rpm -ivh http://rpms.famillecollet.com/enterprise/remi-release-9.rpm
         rpm --import http://rpms.famillecollet.com/RPM-GPG-KEY-remi
@@ -144,6 +144,7 @@ if [ $VERSION_ID -ge 8 ];then
         oniguruma oniguruma-devel oniguruma5php-devel patch pcre pcre-devel perl perl-Data-Dumper perl-devel procps psmisc python3-devel \
         readline-devel rpcgen sqlite-devel tar unzip vim-minimal wget zip zlib zlib-devel ;
     do
+        # dnf --enablerepo=remi install -y oniguruma5php-devel
         dnf $REPOS install -y $rpms;
         if [ "$?" != "0" ];then
             dnf install -y $rpms;

From 5981f94376f3adbace1b4bb72ea8abaa595544bb Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 12:30:51 +0800
Subject: [PATCH 09/20] Update rhel.sh

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

diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh
index feaefd2d35..84d368bdeb 100644
--- a/scripts/install/rhel.sh
+++ b/scripts/install/rhel.sh
@@ -31,7 +31,7 @@ fi
 
 # install remi source 
 if [ "$VERSION_ID" == "9" ];then
-    if [ ! -d /etc/yum.repos.d/remi.repo ];then
+    if [ ! -f /etc/yum.repos.d/remi.repo ];then
         rpm -ivh http://rpms.famillecollet.com/enterprise/remi-release-9.rpm
         rpm --import http://rpms.famillecollet.com/RPM-GPG-KEY-remi
     fi

From 13a20145583bc24e2d9810a20702e54882976b6d Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 12:49:25 +0800
Subject: [PATCH 10/20] Update rhel.sh

---
 scripts/install/rhel.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh
index 84d368bdeb..1347be2319 100644
--- a/scripts/install/rhel.sh
+++ b/scripts/install/rhel.sh
@@ -32,8 +32,10 @@ fi
 # install remi source 
 if [ "$VERSION_ID" == "9" ];then
     if [ ! -f /etc/yum.repos.d/remi.repo ];then
+        echo "install remi start"
         rpm -ivh http://rpms.famillecollet.com/enterprise/remi-release-9.rpm
         rpm --import http://rpms.famillecollet.com/RPM-GPG-KEY-remi
+        echo "install remi end"
     fi
 fi
 

From f7c0cd82a0876b89fc8df6e1c048bd796a052f17 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 13:22:49 +0800
Subject: [PATCH 11/20] Update rhel.sh

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

diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh
index 1347be2319..b266e2d962 100644
--- a/scripts/install/rhel.sh
+++ b/scripts/install/rhel.sh
@@ -31,12 +31,12 @@ fi
 
 # install remi source 
 if [ "$VERSION_ID" == "9" ];then
+    echo "install remi start"
     if [ ! -f /etc/yum.repos.d/remi.repo ];then
-        echo "install remi start"
         rpm -ivh http://rpms.famillecollet.com/enterprise/remi-release-9.rpm
         rpm --import http://rpms.famillecollet.com/RPM-GPG-KEY-remi
-        echo "install remi end"
     fi
+    echo "install remi end"
 fi
 
 #https need

From fe62bbee060afbbdc5e88b2548ef4bdf27a78e5c Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 13:24:47 +0800
Subject: [PATCH 12/20] Update rhel.sh

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

diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh
index b266e2d962..672fb990cf 100644
--- a/scripts/install/rhel.sh
+++ b/scripts/install/rhel.sh
@@ -29,7 +29,7 @@ if [ $VERSION_ID -ge 8 ];then
     PKGMGR='dnf'
 fi
 
-# install remi source 
+echo "install remi source"
 if [ "$VERSION_ID" == "9" ];then
     echo "install remi start"
     if [ ! -f /etc/yum.repos.d/remi.repo ];then

From 3dc7c2f5c185973b11516ab41d2a588671175dfe Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 13:52:55 +0800
Subject: [PATCH 13/20] Update rhel.sh

---
 scripts/install/rhel.sh | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh
index 672fb990cf..f588c141fc 100644
--- a/scripts/install/rhel.sh
+++ b/scripts/install/rhel.sh
@@ -130,11 +130,24 @@ $PKGMGR groupinstall -y "Development Tools"
 
 if [ $VERSION_ID -ge 8 ];then
     # EL8 及以上
-    if [ $VERSION_ID -ge 9 ];then
-        REPOS='--enablerepo=remi,appstream,baseos,epel,extras,crb'
-    else
-        REPOS='--enablerepo=remi,appstream,baseos,epel,extras,powertools'
-    fi
+
+    # find repo
+
+    REPO_LIST=(remi appstream baseos epel extras crb powertools)
+    REPOS='--enablerepo='
+    for REPO_VAR in ${REPO_LIST[@]}
+    do
+        if [ -f /etc/yum.repos.d/${REPO_VAR}.repo ];then
+            REPOS="${REPOS}${REPO_VAR},"
+        fi
+    done
+    echo "REPOS:${REPOS}"
+
+    # if [ $VERSION_ID -ge 9 ];then
+    #     REPOS='--enablerepo=remi,appstream,baseos,epel,extras,crb'
+    # else
+    #     REPOS='--enablerepo=remi,appstream,baseos,epel,extras,powertools'
+    # fi
 
     for rpms in gcc gcc-c++ lsof autoconf bzip2 bzip2-devel c-ares-devel \
         ca-certificates cairo-devel cmake crontabs curl curl-devel diffutils e2fsprogs e2fsprogs-devel \
@@ -146,7 +159,7 @@ if [ $VERSION_ID -ge 8 ];then
         oniguruma oniguruma-devel oniguruma5php-devel patch pcre pcre-devel perl perl-Data-Dumper perl-devel procps psmisc python3-devel \
         readline-devel rpcgen sqlite-devel tar unzip vim-minimal wget zip zlib zlib-devel ;
     do
-        # dnf --enablerepo=remi install -y oniguruma5php-devel
+        # dnf --enablerepo=remi,appstream,baseos,epel,extras,powertools install -y oniguruma5php-devel
         dnf $REPOS install -y $rpms;
         if [ "$?" != "0" ];then
             dnf install -y $rpms;

From 62a7320bafd52b3d4d16b78685646ed41d34ac04 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 13:59:02 +0800
Subject: [PATCH 14/20] Update rhel.sh

---
 scripts/install/rhel.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh
index f588c141fc..734dbea26b 100644
--- a/scripts/install/rhel.sh
+++ b/scripts/install/rhel.sh
@@ -138,9 +138,10 @@ if [ $VERSION_ID -ge 8 ];then
     for REPO_VAR in ${REPO_LIST[@]}
     do
         if [ -f /etc/yum.repos.d/${REPO_VAR}.repo ];then
-            REPOS="${REPOS}${REPO_VAR},"
+            REPOS="${REPOS},${REPO_VAR}"
         fi
     done
+    REPOS=${REPOS//=,/=}
     echo "REPOS:${REPOS}"
 
     # if [ $VERSION_ID -ge 9 ];then

From 4d733c8886b3a32f349be5520adc9d211c01223a Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 14:16:50 +0800
Subject: [PATCH 15/20] Update index.py

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

diff --git a/plugins/php-yum/index.py b/plugins/php-yum/index.py
index 3934446dbc..97c8b759cf 100755
--- a/plugins/php-yum/index.py
+++ b/plugins/php-yum/index.py
@@ -816,7 +816,7 @@ def installPreInspection(version):
         sysName = sys[0].strip().lower()
         sysId = sys_id[0].strip()
 
-        if not sysName in ('centos'):
+        if not sysName in ('centos', 'oracle'):
             return '暂时仅支持centos'
         return 'ok'
     except Exception as e:

From 2e140a3ae1bdd69da3971018dad093265147834e Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 14:18:46 +0800
Subject: [PATCH 16/20] Update index.py

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

diff --git a/plugins/php-yum/index.py b/plugins/php-yum/index.py
index 97c8b759cf..3934446dbc 100755
--- a/plugins/php-yum/index.py
+++ b/plugins/php-yum/index.py
@@ -816,7 +816,7 @@ def installPreInspection(version):
         sysName = sys[0].strip().lower()
         sysId = sys_id[0].strip()
 
-        if not sysName in ('centos', 'oracle'):
+        if not sysName in ('centos'):
             return '暂时仅支持centos'
         return 'ok'
     except Exception as e:

From b3e9283a584c572305a2bc97cdbcf828e36db299 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 14:37:25 +0800
Subject: [PATCH 17/20] Update rhel.sh

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

diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh
index 734dbea26b..4cf98d9ed0 100644
--- a/scripts/install/rhel.sh
+++ b/scripts/install/rhel.sh
@@ -157,7 +157,7 @@ if [ $VERSION_ID -ge 8 ];then
         libicu-devel libidn libidn-devel libmcrypt libmcrypt-devel libmemcached libmemcached-devel \
         libpng libpng-devel libstdc++.so.6 libtirpc libtirpc-devel libtool libtool-libs libwebp libwebp-devel \
         libxml2 libxml2-devel libxslt libxslt-devel libarchive make mysql-devel ncurses ncurses-devel net-tools \
-        oniguruma oniguruma-devel oniguruma5php-devel patch pcre pcre-devel perl perl-Data-Dumper perl-devel procps psmisc python3-devel \
+        oniguruma oniguruma-devel patch pcre pcre-devel perl perl-Data-Dumper perl-devel procps psmisc python3-devel \
         readline-devel rpcgen sqlite-devel tar unzip vim-minimal wget zip zlib zlib-devel ;
     do
         # dnf --enablerepo=remi,appstream,baseos,epel,extras,powertools install -y oniguruma5php-devel

From 80f296ea19f97f1e02ec1a8740dc55ba01b5630c Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 14:42:54 +0800
Subject: [PATCH 18/20] =?UTF-8?q?redat=20=E7=B3=BB=E5=88=97=20php74?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E9=83=BD=E9=9C=80=E8=A6=81=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?oniguruma?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

debian系统，不需要
---
 plugins/php/versions/74/install.sh | 7 ++++++-
 plugins/php/versions/80/install.sh | 6 ++++++
 plugins/php/versions/81/install.sh | 5 +++++
 plugins/php/versions/82/install.sh | 5 +++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/plugins/php/versions/74/install.sh b/plugins/php/versions/74/install.sh
index a611b17aa8..560e4348e2 100755
--- a/plugins/php/versions/74/install.sh
+++ b/plugins/php/versions/74/install.sh
@@ -10,7 +10,6 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
-
 function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
 function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
@@ -29,6 +28,12 @@ cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
 
+# redat ge 8
+which yum
+if [ "$?" == "0" ];then
+	cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh
+fi
+
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 
 	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then
diff --git a/plugins/php/versions/80/install.sh b/plugins/php/versions/80/install.sh
index 697b119729..76bf93047e 100755
--- a/plugins/php/versions/80/install.sh
+++ b/plugins/php/versions/80/install.sh
@@ -28,6 +28,12 @@ mkdir -p $serverPath/php
 cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 
+# redat ge 8
+which yum
+if [ "$?" == "0" ];then
+	cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh
+fi
+
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 
 	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then
diff --git a/plugins/php/versions/81/install.sh b/plugins/php/versions/81/install.sh
index f4234f0d05..faceee2551 100755
--- a/plugins/php/versions/81/install.sh
+++ b/plugins/php/versions/81/install.sh
@@ -28,6 +28,11 @@ mkdir -p $serverPath/php
 cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 
+# redat ge 8
+which yum
+if [ "$?" == "0" ];then
+	cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh
+fi
 
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 
diff --git a/plugins/php/versions/82/install.sh b/plugins/php/versions/82/install.sh
index d8ec676895..d8bf1f5779 100755
--- a/plugins/php/versions/82/install.sh
+++ b/plugins/php/versions/82/install.sh
@@ -28,6 +28,11 @@ mkdir -p $serverPath/php
 cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 
+# redat ge 8
+which yum
+if [ "$?" == "0" ];then
+	cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh
+fi
 
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 

From f18c05a097c4be4361e866fad177d694c6b559b7 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 14:53:16 +0800
Subject: [PATCH 19/20] 0.14.4

---
 README.md                | 6 +++---
 class/core/config_api.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 114d2848d7..b596321e31 100644
--- a/README.md
+++ b/README.md
@@ -99,10 +99,10 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.14.3
+### 版本更新 0.14.4
 
-* 安装优化，针对oracle中的curl库优化。
-* PHP的Composer安装优化。
+* 安装优化，redat系列优化。
+* PHP74-82在redat的安装修复(oniguruma)。
 
 ### JSDelivr安装地址
 
diff --git a/class/core/config_api.py b/class/core/config_api.py
index bac7eb9693..f94d75b30c 100755
--- a/class/core/config_api.py
+++ b/class/core/config_api.py
@@ -27,7 +27,7 @@
 
 class config_api:
 
-    __version = '0.14.3.2'
+    __version = '0.14.4'
     __api_addr = 'data/api.json'
 
     def __init__(self):

From 39c6f19592feec125b5d3314f9e1a4b7491f1b34 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sat, 6 May 2023 14:54:34 +0800
Subject: [PATCH 20/20] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b596321e31..e182f61563 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,7 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 
 * 安装优化，redat系列优化。
 * PHP74-82在redat的安装修复(oniguruma)。
+* 面板端口修改优化。
 
 ### JSDelivr安装地址