WEBDIENSTE/aaPanel
1
0
Fork 0
mirror of https://github.com/aaPanel/aaPanel.git synced 2026-08-25 17:12:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 7.7.0

Browse Source 
Since version 7.7.0, we recommend yours update python to 3.12.

[+] Using nginx technology to load static files improves access speed
[+] Refactor homepage, website, FTP, and database using vue3
[+] Table loading changed to skeleton screen
[+] Add Website statistics-v2 professional plug-in
[+] Add Home page - top 5 resource occupancy
[+] Add protection for Files management (requires Tamper-proof for Enterprise 3.7)
[+] Website, FTP, Databases page add program status
[+] Add FTP log analysis (only supports Centos)
[+] Add password-free login to phpMyAdmin
[+] Add Proxy Project in Website (Supported when web service uses Nginx)
[+] Add WP Toolkit (Pro version only)
[+] Redesigned Docker module
[+] Add WP Toolkit Protection
[+] Add WP Toolkit Backup and Restore
[+] Add WP Toolkit Migrated
[+] Add WP Toolkit Clone site (supports new domain and subdomain)
[+] Add WP Toolkit Create site from backup of other panel
[+] Add WP Toolkit support for Cron automatic backup (only save Local disk)
[+] Add WP Toolkit operation log
[+] Add Integrity check for WP Toolkit
[+] Add WP Toolkit plug-in management and themes management

[*] Optimize phpMyAdmin formula access method
[*] Optimize Home page PHP display problem
[*] Optimize jump to the login interface after the login expires
[*] Optimize automatic renewal of SSL at some times
[*] Optimize Let's Encrypt to increase application success rate

[-] Fix Logs Audit cannot be opened
[-] Fix apache URL rewrite issue
[-] Fix phpmyadmin installation problem
[-] Fix the problem that some servers cannot install software
[-] Fix upload file error
[-] Fix left menu hiding problem
[-] Fix aaPanel Mobile QR code display problem
[-] Fix problem that third-party plug-ins are not displayed in the App Store
[-] Fix issue where the menu bar is blank when opening new tabs
[-] Fixed panel not being accessible in some cases
[-] Fix the issue where Curl warning caused the inability to apply for SSL
[-] Fix Quota issues for Website, FTP, Databases
[-] Fix file interface display problem on mobile terminal
This commit is contained in:
Jack
2024-07-19 11:25:10 +08:00
parent ed34994f45
commit ed55fa708d
1949 changed files with 329210 additions and 26644 deletions
Download Patch File Download Diff File Expand all files Collapse all files
class/databaseModel/base.py
+1 -1
View File
@@ -178,7 +178,7 @@ class databaseBase:
if data_name in checks or len(data_name) < 1:
return public.returnMsg(False,'Database name is invalid!');
reg = "^\w+$"
reg = r"^\w+$"
if not re.match(reg, data_name):
return public.returnMsg(False,'DATABASE_NAME_ERR_T')
class/databaseModel/mongodbModel.py
+8 -8
View File
@@ -1,10 +1,10 @@
#coding: utf-8
#-------------------------------------------------------------------
# 宝塔Linux面板
# aaPanel
#-------------------------------------------------------------------
# Copyright (c) 2015-2099 宝塔软件(http://bt.cn) All rights reserved.
# Copyright (c) 2015-2099 aaPanel(www.aapanel.com) All rights reserved.
#-------------------------------------------------------------------
# Author: hwliang <hwl@bt.cn>
# Author: hwliang <hwl@aapanel.com>
#-------------------------------------------------------------------
#角色说明：
#read：允许用户读取指定数据库
@@ -105,7 +105,7 @@ class panelMongoDB():
conf = self.get_config(None)
for opt in options:
tmp = re.findall(opt + ":\s+(.+)",conf)
tmp = re.findall(opt + r":\s+(.+)",conf)
if not tmp: continue;
data[opt] = tmp[0]
@@ -177,9 +177,9 @@ class main(databaseBase):
conf = public.readFile(self.__conf_path)
if status:
conf = re.sub('authorization\s*\:\s*disabled','authorization: enabled',conf)
conf = re.sub(r'authorization\s*\:\s*disabled','authorization: enabled',conf)
else:
conf = re.sub('authorization\s*\:\s*enabled','authorization: disabled',conf)
conf = re.sub(r'authorization\s*\:\s*enabled','authorization: disabled',conf)
public.writeFile(self.__conf_path,conf)
self.restart_services()
@@ -201,7 +201,7 @@ class main(databaseBase):
if status:
if hasattr(get,'password'):
password = get['password'].strip()
if not password or not re.search("^[\w@\.]+$", password):
if not password or not re.search(r"^[\w@\.]+$", password):
return public.return_msg_gettext(False, 'Database password cannot be empty or have special characters!')
# if re.search('[\u4e00-\u9fa5]',password):
@@ -670,7 +670,7 @@ class main(databaseBase):
try:
if not newpassword:
return public.returnMsg(False, 'Modify the failure，The database[' + username + ']password cannot be empty.');
if len(re.search("^[\w@\.]+$", newpassword).groups()) > 0:
if len(re.search(r"^[\w@\.]+$", newpassword).groups()) > 0:
return public.returnMsg(False, 'The database password cannot be empty or contain special characters')
if re.search('[\u4e00-\u9fa5]',newpassword):
class/databaseModel/pgsqlModel.py
+12 -11
View File
@@ -1,10 +1,10 @@
#coding: utf-8
#-------------------------------------------------------------------
# 宝塔Linux面板
# aaPanel
#-------------------------------------------------------------------
# Copyright (c) 2015-2099 宝塔软件(http://bt.cn) All rights reserved.
# Copyright (c) 2015-2099 aaPanel(www.aapanel.com) All rights reserved.
#-------------------------------------------------------------------
# Author: hezhihong <bt_ahong@qq.com>
# Author: hezhihong <bt_ahong@aapanel.com>
#-------------------------------------------------------------------
#------------------------------
@@ -154,7 +154,7 @@ class main(databaseBase,panelPgsql):
if not self.__soft_path:self.__soft_path='{}/pgsql'.format(public.get_setup_path())
conf = public.readFile('{}/data/postgresql.conf'.format(self.__soft_path))
for opt in options:
tmp = re.findall("\s+" +opt + "\s*=\s*(.+)#",conf)
tmp = re.findall(r"\s+" +opt + r"\s*=\s*(.+)#",conf)
if not tmp: continue;
data[opt] = tmp[0].strip()
if opt == 'listen_addresses':
@@ -223,7 +223,8 @@ class main(databaseBase,panelPgsql):
@return list
'''
check_result = os.system('/www/server/pgsql/bin/psql --version')
if check_result !=0 and not public.M('database_servers').where('db_type=?','pgsql').count():return []
if check_result !=0 and not public.M('database_servers').where('db_type=?','pgsql').count():
return []
return self.GetBaseCloudServer(args)
@@ -302,7 +303,7 @@ class main(databaseBase,panelPgsql):
id = get['id']
find = public.M('databases').where("id=?",(id,)).field('id,pid,name,username,password,accept,ps,addtime,db_type,conn_config,sid,type').find();
if not find: return public.returnMsg(False,'The specified database does not exist.')
name = get['name']
username = find['username']
@@ -323,15 +324,15 @@ class main(databaseBase,panelPgsql):
find = public.M('databases').where("id=?",(id,)).find()
if not find: return public.returnMsg(False,'Database does not exist!')
if not find['password'].strip():
return public.returnMsg(False,'The database password is empty. Set the password first.')
sql_dump = '{}/bin/pg_dump'.format(self.__soft_path)
# return sql_dump
if not os.path.isfile(sql_dump):
return public.returnMsg(False,'Lack of backup tools, please first through the software store PGSQL manager!')
back_path = session['config']['backup_path'] + '/database/pgsql/'
# return back_path
if not os.path.exists(back_path): os.makedirs(back_path)
@@ -358,7 +359,7 @@ class main(databaseBase,panelPgsql):
if os.path.getsize(backupName) < 2048:
return public.returnMsg(True, 'The backup file size is smaller than 2Kb. Check the backup integrity.')
else:
else:
return public.returnMsg(True, 'BACKUP_SUCCESS')
def DelBackup(self,args):
@@ -397,7 +398,7 @@ class main(databaseBase,panelPgsql):
ext = tmp[len(tmp) -1]
if ext not in exts:
return public.returnMsg(False, 'DATABASE_INPUT_ERR_FORMAT')
sql_dump = '{}/bin/psql'.format(self.__soft_path)
if not os.path.exists(sql_dump):
return public.returnMsg(False,'Lack of recovery tool, please use software management to install PGSQL!')
class/databaseModel/redisModel.py
+8 -5
View File
@@ -1,10 +1,10 @@
#coding: utf-8
#-------------------------------------------------------------------
# 宝塔Linux面板
# aaPanel
#-------------------------------------------------------------------
# Copyright (c) 2015-2099 宝塔软件(http://bt.cn) All rights reserved.
# Copyright (c) 2015-2099 aaPanel(www.aapanel.com) All rights reserved.
#-------------------------------------------------------------------
# Author: hwliang <hwl@bt.cn>
# Author: hwliang <hwl@aapanel.com>
#-------------------------------------------------------------------
# sqlite模型
@@ -76,7 +76,7 @@ class panelRedisDB():
keys = ["bind","port","timeout","maxclients","databases","requirepass","maxmemory"]
for k in keys:
v = ""
rep = "\n%s\s+(.+)" % k
rep = "\n%s\\s+(.+)" % k
group = re.search(rep,redis_conf)
if not group:
if k == "maxmemory":
@@ -102,6 +102,7 @@ class main(databaseBase):
pass
def GetCloudServer(self,args):
'''
@name 获取远程服务器列表
@@ -109,6 +110,7 @@ class main(databaseBase):
@return list
'''
return self.GetBaseCloudServer(args)
# return public.return_message(0, 0, self.GetBaseCloudServer(args))
def AddCloudServer(self,args):
@@ -373,7 +375,8 @@ class main(databaseBase):
nlist = []
cloud_list = {}
for x in self.GetCloudServer({'type':'redis'}): cloud_list['id-' + str(x['id'])] = x
for x in self.GetCloudServer({'type':'redis'}):
cloud_list['id-' + str(x['id'])] = x
path = session['config']['backup_path'] + '/database/redis/'
if not os.path.exists(path): os.makedirs(path)
class/databaseModel/sqliteModel.py
+3 -3
View File
@@ -1,10 +1,10 @@
#coding: utf-8
#-------------------------------------------------------------------
# 宝塔Linux面板
# aaPanel
#-------------------------------------------------------------------
# Copyright (c) 2015-2099 宝塔软件(http://bt.cn) All rights reserved.
# Copyright (c) 2015-2099 aaPanel(www.aapanel.com) All rights reserved.
#-------------------------------------------------------------------
# Author: hwliang <hwl@bt.cn>
# Author: hwliang <hwl@aapanel.com>
#-------------------------------------------------------------------
#------------------------------
class/databaseModel/sqlserverModel.py
+11 -8
View File
@@ -1,10 +1,10 @@
#coding: utf-8
#-------------------------------------------------------------------
# 宝塔Linux面板
# aaPanel
#-------------------------------------------------------------------
# Copyright (c) 2015-2099 宝塔软件(http://bt.cn) All rights reserved.
# Copyright (c) 2015-2099 aaPanel(www.aapanel.com) All rights reserved.
#-------------------------------------------------------------------
# Author: hwliang <hwl@bt.cn>
# Author: hwliang <hwl@aapanel.com>
#-------------------------------------------------------------------
#------------------------------
@@ -87,6 +87,8 @@ class main(databaseBase):
'''
@添加远程数据库
'''
return self.AddBaseCloudServer(args)
def RemoveCloudServer(self,args):
@@ -107,17 +109,18 @@ class main(databaseBase):
"""
res = self.add_base_database(args)
if not res['status']: return res
if not res['status']:
return res
data_name = res['data_name']
username = res['username']
password = res['data_pwd']
if re.match("^\d+",data_name):
if re.match(r"^\d+",data_name):
return public.returnMsg(False,'SQLServer databases cannot start with numbers!')
reg_count = 0
regs = ['[a-z]','[A-Z]','\W','[0-9]']
regs = ['[a-z]','[A-Z]',r'\W','[0-9]']
for x in regs:
if re.search(x,password): reg_count += 1
@@ -361,7 +364,7 @@ class main(databaseBase):
try:
if not newpassword:
return public.returnMsg(False, 'The password of database [' + username + '] cannot be empty.');
if len(re.search("^[\w@\.]+$", newpassword).groups()) > 0:
if len(re.search(r"^[\w@\.]+$", newpassword).groups()) > 0:
return public.returnMsg(False, 'The database password cannot be empty or contain special characters')
except :
return public.returnMsg(False, 'The database password cannot be empty or contain special characters')
@@ -402,7 +405,7 @@ class main(databaseBase):
try:
if not password:
return public.returnMsg(False, 'The password of database [' + username + '] cannot be empty.')
if len(re.search("^[\w@\.]+$", password).groups()) > 0:
if len(re.search(r"^[\w@\.]+$", password).groups()) > 0:
return public.returnMsg(False, 'saThe password cannot be empty or have special symbols')
except :
return public.returnMsg(False, 'saThe password cannot be empty or have special symbols')