From fcc82360b2f4cc4b9215327d24756f75285c6c31 Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Tue, 11 Mar 2025 18:24:54 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Afix=20issue=20with=20enable=20syste?= =?UTF-8?q?m=20ssl=20failed=20(#8119)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmd/server/nginx_conf/php_extensions.json | 84 +++++++++---------- core/app/service/setting.go | 10 ++- .../php/extension-management/index.vue | 1 + 3 files changed, 51 insertions(+), 44 deletions(-) diff --git a/agent/cmd/server/nginx_conf/php_extensions.json b/agent/cmd/server/nginx_conf/php_extensions.json index 97daf2fd2..63e3030bd 100644 --- a/agent/cmd/server/nginx_conf/php_extensions.json +++ b/agent/cmd/server/nginx_conf/php_extensions.json @@ -10,7 +10,7 @@ "name": "opcache", "check": "Zend OPcache", "file": "opcache.so", - "versions": ["56", "70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56", "70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { @@ -24,28 +24,28 @@ "name": "memcached", "check": "memcached", "file": "memcached.so", - "versions": ["56", "70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56", "70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "redis", "check": "redis", "file": "redis.so", - "versions": [ "56", "70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": [ "56", "70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "mcrypt", "check": "mcrypt", "file": "mcrypt.so", - "versions": ["70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "apcu", "check": "apcu", "file": "apcu.so", - "versions": ["56", "70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56", "70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { @@ -59,28 +59,28 @@ "name": "xdebug", "check": "xdebug", "file": "xdebug.so", - "versions": ["56", "70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56", "70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "imap", "check": "imap", "file": "imap.so", - "versions": ["56", "70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56", "70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "exif", "check": "exif", "file": "exif.so", - "versions": [ "56", "70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": [ "56", "70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "intl", "check": "intl", "file": "intl.so", - "versions": ["56", "70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56", "70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { @@ -94,126 +94,126 @@ "name": "Swoole", "check": "swoole", "file": "swoole.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "zstd", "check": "zstd", "file": "zstd.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "xlswriter", "check": "xlswriter", "file": "xlswriter.so", - "versions": ["70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "oci8", "check": "oci8", "file": "oci8.so", - "versions": ["70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "pdo_oci", "check": "pdo_oci", "file": "pdo_oci.so", - "versions": ["70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "pdo_sqlsrv", "check": "pdo_sqlsrv", "file": "pdo_sqlsrv.so", - "versions": ["70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "sqlsrv", "check": "sqlsrv", "file": "sqlsrv.so", - "versions": ["70", "71", "72", "73", "74","80", "81", "82", "83"], + "versions": ["81", "82", "83","84"], "installed": false }, { "name": "yaf", "check": "yaf", "file": "yaf.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "mongodb", "check": "mongodb", "file": "mongodb.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "yac", "check": "yac", "file": "yac.so", - "versions": ["70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "pgsql", "check": "pgsql", "file": "pgsql.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "ssh2", "check": "ssh2", "file": "ssh2.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "grpc", "check": "grpc", "file": "grpc.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "xhprof", "check": "xhprof", "file": "xhprof.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "protobuf", "check": "protobuf", "file": "protobuf.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "pdo_pgsql", "check": "pdo_pgsql", "file": "pdo_pgsql.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "snmp", "check": "snmp", "file": "snmp.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "ldap", "check": "ldap", "file": "ldap.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { @@ -227,42 +227,42 @@ "name": "enchant", "check": "enchant", "file": "enchant.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "pspell", "check": "pspell", "file": "pspell.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "bz2", "check": "bz2", "file": "bz2.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "sysvshm", "check": "sysvshm", "file": "sysvshm.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "calendar", "check": "calendar", "file": "calendar.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "gmp", "check": "gmp", "file": "gmp.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { @@ -276,62 +276,62 @@ "name": "sysvmsg", "check": "sysvmsg", "file": "sysvmsg.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "igbinary", "check": "igbinary", "file": "igbinary.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "zmq", "check": "zmq", "file": "zmq.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "smbclient", "check": "smbclient", "file": "smbclient.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "event", "check": "event", "file": "event.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "mailparse", "check": "mailparse", "file": "mailparse.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "yaml", "check": "yaml", "file": "yaml.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false }, { "name": "sg11", "check": "SourceGuardian", "file": "sourceguardian.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false },{ "name": "mysqli", "check": "mysqli", "file": "mysqli.so", - "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83"], + "versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"], "installed": false } ] diff --git a/core/app/service/setting.go b/core/app/service/setting.go index e86bd1231..8bfebfba2 100644 --- a/core/app/service/setting.go +++ b/core/app/service/setting.go @@ -332,8 +332,14 @@ func (u *SettingService) UpdateSSL(c *gin.Context, req dto.SSLUpdate) error { if err := settingRepo.Update("SSL", req.SSL); err != nil { return err } - - return u.UpdateSystemSSL() + go func() { + time.Sleep(1 * time.Second) + _, err := cmd.Exec("systemctl restart 1panel-core.service") + if err != nil { + global.LOG.Errorf("restart system failed, err: %v", err) + } + }() + return nil } func (u *SettingService) LoadFromCert() (*dto.SSLInfo, error) { diff --git a/frontend/src/views/website/runtime/php/extension-management/index.vue b/frontend/src/views/website/runtime/php/extension-management/index.vue index 6c3df7a36..5b0e04890 100644 --- a/frontend/src/views/website/runtime/php/extension-management/index.vue +++ b/frontend/src/views/website/runtime/php/extension-management/index.vue @@ -134,6 +134,7 @@ const searchByName = () => { }; const acceptParams = (req: Runtime.Runtime): void => { + searchName.value = ''; open.value = true; runtime.value = req; search();