mirror of
https://github.com/aaPanel/aaPanel.git
synced 2026-09-06 01:27:38 +02:00
Update to 7.7.0
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
@@ -0,0 +1,53 @@
|
||||
from .pgsql import PgsqlTool
|
||||
from .mongodb import MongodbTool
|
||||
from .mysql import MysqlTool
|
||||
from .sql_server import SQLServerTool
|
||||
|
||||
from typing import Optional
|
||||
|
||||
DB_TYPE = (
|
||||
"pgsql",
|
||||
"mongodb",
|
||||
"mysql",
|
||||
"sqlserver"
|
||||
)
|
||||
|
||||
|
||||
def add_database(db_type: str, data: dict) -> Optional[str]:
|
||||
"""
|
||||
data: 中包含的有效参数为
|
||||
database_name：数据库名称
|
||||
server_id：数据库 id
|
||||
db_user：数据库用户名
|
||||
password：数据库用户的密码
|
||||
dataAccess ：链接限制方式 如：ip
|
||||
address：可允许使用的ip， 配合上一个参数使用
|
||||
codeing： 编码
|
||||
ps：备注
|
||||
listen_ip: pgsql 有效，可设置访问地址
|
||||
"""
|
||||
if db_type not in DB_TYPE:
|
||||
return "错误的数据库类型"
|
||||
|
||||
if db_type == "pgsql":
|
||||
tool = PgsqlTool()
|
||||
elif db_type == "mongodb":
|
||||
tool = MongodbTool()
|
||||
elif db_type == "mysql":
|
||||
tool = MysqlTool()
|
||||
else:
|
||||
tool = SQLServerTool()
|
||||
|
||||
f, msg = tool.add_database(data.pop("server_id"), data.pop("database_name"), **data)
|
||||
if not f:
|
||||
return msg
|
||||
return None
|
||||
|
||||
|
||||
__all__ = [
|
||||
"PgsqlTool",
|
||||
"MongodbTool",
|
||||
"MysqlTool",
|
||||
"SQLServerTool",
|
||||
"add_database",
|
||||
]
|
||||
@@ -0,0 +1,34 @@
|
||||
import sys
|
||||
from typing import List, Dict, Optional
|
||||
from .util import DB
|
||||
|
||||
|
||||
if "/www/server/panel/class" not in sys.path:
|
||||
sys.path.insert(0, "/www/server/panel/class")
|
||||
|
||||
from db_mysql import panelMysql
|
||||
from database import database
|
||||
from databaseModel.mongodbModel import main as mongodb
|
||||
from databaseModel.pgsqlModel import main as pgsql
|
||||
from databaseModel.sqlserverModel import main as sqlserver
|
||||
|
||||
|
||||
class BaseDatabaseTool:
|
||||
_type_name = ""
|
||||
|
||||
def local_server_info(self) -> Optional[Dict]:
|
||||
raise NotImplementedError()
|
||||
|
||||
# 获取所有可以管理的服务器的信息
|
||||
def server_list(self) -> List[Dict]:
|
||||
data = DB('database_servers').where("LOWER(db_type)=LOWER('?')", (self._type_name, )).select()
|
||||
if not isinstance(data, list):
|
||||
data = []
|
||||
local_server = self.local_server_info()
|
||||
if local_server is not None:
|
||||
data.insert(0, local_server)
|
||||
return data
|
||||
|
||||
# 添加一个数据库
|
||||
def add_database(self, server_id: int, database_name: str, **kwargs) -> List[Dict]:
|
||||
raise NotImplementedError()
|
||||
@@ -0,0 +1,51 @@
|
||||
import os
|
||||
import re
|
||||
|
||||
from typing import Optional, Dict, List, Union, Tuple
|
||||
|
||||
from .base import BaseDatabaseTool, mongodb
|
||||
from .util import read_file, GET_CLASS
|
||||
|
||||
|
||||
class MongodbTool(BaseDatabaseTool):
|
||||
_type_name = "mongodb"
|
||||
|
||||
def local_server_info(self) -> Optional[Dict]:
|
||||
bin_path = "/www/server/mongodb/bin/mongod"
|
||||
if not os.path.isfile(bin_path):
|
||||
return None
|
||||
|
||||
conf_file = '/www/server/mongodb/config.conf'
|
||||
conf = read_file(conf_file)
|
||||
default_port = 27017
|
||||
if not isinstance(conf, str):
|
||||
port = default_port
|
||||
else:
|
||||
rep_port = re.compile(r"\s*port\s*:\s*(?P<port>\d+)", re.M)
|
||||
port_res = rep_port.search(conf)
|
||||
if not port_res:
|
||||
port = default_port
|
||||
else:
|
||||
port = int(port_res.group("port"))
|
||||
|
||||
return {
|
||||
'id': 0,
|
||||
'db_host': '127.0.0.1',
|
||||
'db_port': port,
|
||||
'db_user': 'root',
|
||||
'db_password': '',
|
||||
'ps': '本地服务器',
|
||||
'addtime': 0
|
||||
}
|
||||
|
||||
# 添加一个数据库
|
||||
def add_database(self, server_id: int, database_name: str, **kwargs) -> Tuple[bool, str]:
|
||||
get_obj = GET_CLASS()
|
||||
get_obj.name = database_name
|
||||
get_obj.sid = server_id
|
||||
get_obj.ps = kwargs.get("ps", "")
|
||||
res = mongodb().AddDatabase(get_obj)
|
||||
if res["status"] is True:
|
||||
return True, "添加成功"
|
||||
else:
|
||||
return False, res['msg']
|
||||
@@ -0,0 +1,98 @@
|
||||
import os
|
||||
import re
|
||||
|
||||
from typing import Optional, Dict, List, Union, Tuple
|
||||
|
||||
from .base import BaseDatabaseTool, panelMysql, database
|
||||
from .util import read_file, write_file, DB, GET_CLASS
|
||||
|
||||
|
||||
class MysqlTool(BaseDatabaseTool):
|
||||
_type_name = "mysql"
|
||||
|
||||
def local_server_info(self) -> Optional[Dict]:
|
||||
bin_path = "/www/server/mysql/bin/mysql"
|
||||
if not os.path.isfile(bin_path):
|
||||
return None
|
||||
|
||||
conf_file = '/etc/my.cnf'
|
||||
conf = read_file(conf_file)
|
||||
default_port = 3306
|
||||
if not isinstance(conf, str):
|
||||
port = default_port
|
||||
else:
|
||||
rep_port = re.compile(r"\s*port\s*=\s*(?P<port>\d+)", re.M)
|
||||
port_res = rep_port.search(conf)
|
||||
if not port_res:
|
||||
port = default_port
|
||||
else:
|
||||
port = int(port_res.group("port"))
|
||||
|
||||
return {
|
||||
'id': 0,
|
||||
'db_host': '127.0.0.1',
|
||||
'db_port': port,
|
||||
'db_user': 'root',
|
||||
'db_password': '',
|
||||
'ps': '本地服务器',
|
||||
'addtime': 0
|
||||
}
|
||||
|
||||
# 检测服务是否可以链接
|
||||
# def server_status(self, server_id: int) -> Union[Dict, str]:
|
||||
# """
|
||||
# 数据库状态检测
|
||||
# """
|
||||
# db_name = None
|
||||
# if server_id != 0:
|
||||
# conn_config = DB("database_servers").where("id=? AND LOWER(db_type)=LOWER('mysql')", (server_id,)).find()
|
||||
# if not conn_config:
|
||||
# return "远程数据库信息不存在！"
|
||||
# conn_config["db_name"] = None
|
||||
# db_user = conn_config["db_user"]
|
||||
# root_password = conn_config["db_password"]
|
||||
# db_host = conn_config["db_host"]
|
||||
# db_port = conn_config["db_port"]
|
||||
# else:
|
||||
# db_user = "root"
|
||||
# root_password = DB("config").where("id=?", (1,)).getField("mysql_root")
|
||||
# db_host = "localhost"
|
||||
# try:
|
||||
# db_port = int(panelMysql().query("show global variables like 'port'")[0][1])
|
||||
# except:
|
||||
# db_port = 3306
|
||||
# mysql_obj = panelMysql()
|
||||
# flag = mysql_obj.set_host(db_host, db_port, db_name, db_user, root_password)
|
||||
#
|
||||
# error = ''
|
||||
# db_status = True
|
||||
# if flag is False:
|
||||
# db_status = False
|
||||
# error = mysql_obj._ex
|
||||
#
|
||||
# return {
|
||||
# "status": True,
|
||||
# 'error': str(error),
|
||||
# "msg": "正常" if db_status is True else "异常",
|
||||
# "db_status": db_status
|
||||
# }
|
||||
|
||||
# 添加一个数据库
|
||||
def add_database(self, server_id: int, database_name: str, **kwargs) -> Tuple[bool, str]:
|
||||
get_obj = GET_CLASS()
|
||||
get_obj.name = database_name
|
||||
get_obj.sid = server_id
|
||||
get_obj.db_user = kwargs.get("db_user", "")
|
||||
get_obj.password = kwargs.get("password", "")
|
||||
get_obj.dataAccess = kwargs.get("dataAccess", "")
|
||||
get_obj.address = kwargs.get("address", "")
|
||||
get_obj.codeing = kwargs.get("codeing", "")
|
||||
get_obj.dtype = "MySQL"
|
||||
get_obj.ps = kwargs.get("ps", "")
|
||||
get_obj.host = kwargs.get("host", "")
|
||||
get_obj.pid = str(kwargs.get("pid", '0'))
|
||||
res = database().AddDatabase(get_obj)
|
||||
if res["status"] is True:
|
||||
return True, "添加成功"
|
||||
else:
|
||||
return False, res['msg']
|
||||
@@ -0,0 +1,54 @@
|
||||
import os
|
||||
import re
|
||||
|
||||
from typing import Optional, Dict, List, Union, Tuple
|
||||
|
||||
from .base import BaseDatabaseTool, pgsql
|
||||
from .util import read_file, GET_CLASS
|
||||
|
||||
|
||||
class PgsqlTool(BaseDatabaseTool):
|
||||
_type_name = "pgsql"
|
||||
|
||||
def local_server_info(self) -> Optional[Dict]:
|
||||
bin_path = "/www/server/pgsql/bin/postgres"
|
||||
if not os.path.isfile(bin_path):
|
||||
return None
|
||||
|
||||
conf_file = '/www/server/pgsql/data/postgresql.conf'
|
||||
conf = read_file(conf_file)
|
||||
default_port = 5432
|
||||
if not isinstance(conf, str):
|
||||
port = default_port
|
||||
else:
|
||||
rep_port = re.compile(r"\s*port\s*=\s*(?P<port>\d+)", re.M)
|
||||
port_res = rep_port.search(conf)
|
||||
if not port_res:
|
||||
port = default_port
|
||||
else:
|
||||
port = int(port_res.group("port"))
|
||||
|
||||
return {
|
||||
'id': 0,
|
||||
'db_host': '127.0.0.1',
|
||||
'db_port': port,
|
||||
'db_user': 'root',
|
||||
'db_password': '',
|
||||
'ps': '本地服务器',
|
||||
'addtime': 0
|
||||
}
|
||||
|
||||
# 添加一个数据库
|
||||
def add_database(self, server_id: int, database_name: str, **kwargs) -> Tuple[bool, str]:
|
||||
get_obj = GET_CLASS()
|
||||
get_obj.name = database_name
|
||||
get_obj.sid = server_id
|
||||
get_obj.ps = kwargs.get("ps", "")
|
||||
get_obj.db_user = kwargs.get("db_user", "")
|
||||
get_obj.password = kwargs.get("password", "")
|
||||
get_obj.listen_ip = kwargs.get("listen_ip", "")
|
||||
res = pgsql().AddDatabase(get_obj)
|
||||
if res["status"] is True:
|
||||
return True, "添加成功"
|
||||
else:
|
||||
return False, res['msg']
|
||||
@@ -0,0 +1,28 @@
|
||||
import os
|
||||
import re
|
||||
|
||||
from typing import Optional, Dict, List, Union, Tuple
|
||||
|
||||
from .base import BaseDatabaseTool, sqlserver
|
||||
from .util import read_file, GET_CLASS
|
||||
|
||||
|
||||
class SQLServerTool(BaseDatabaseTool):
|
||||
_type_name = "sqlserver"
|
||||
|
||||
def local_server_info(self) -> Optional[Dict]:
|
||||
return None
|
||||
|
||||
# 添加一个数据库
|
||||
def add_database(self, server_id: int, database_name: str, **kwargs) -> Tuple[bool, str]:
|
||||
get_obj = GET_CLASS()
|
||||
get_obj.name = database_name
|
||||
get_obj.sid = server_id
|
||||
get_obj.ps = kwargs.get("ps", "")
|
||||
get_obj.db_user = kwargs.get("db_user", "")
|
||||
get_obj.password = kwargs.get("password", "")
|
||||
res = sqlserver().AddDatabase(get_obj)
|
||||
if res["status"] is True:
|
||||
return True, "添加成功"
|
||||
else:
|
||||
return False, res['msg']
|
||||
@@ -0,0 +1,68 @@
|
||||
import os
|
||||
import sys
|
||||
from typing import Optional, Tuple, Callable
|
||||
|
||||
if "/www/server/panel/class" not in sys.path:
|
||||
sys.path.insert(0, "/www/server/panel/class")
|
||||
|
||||
|
||||
import public
|
||||
|
||||
|
||||
def write_file(filename: str, s_body: str, mode='w+') -> bool:
|
||||
"""
|
||||
写入文件内容
|
||||
@filename 文件名
|
||||
@s_body 欲写入的内容
|
||||
return bool 若文件不存在则尝试自动创建
|
||||
"""
|
||||
try:
|
||||
fp = open(filename, mode=mode)
|
||||
fp.write(s_body)
|
||||
fp.close()
|
||||
return True
|
||||
except:
|
||||
try:
|
||||
fp = open(filename, mode=mode, encoding="utf-8")
|
||||
fp.write(s_body)
|
||||
fp.close()
|
||||
return True
|
||||
except:
|
||||
return False
|
||||
|
||||
|
||||
def read_file(filename, mode='r') -> Optional[str]:
|
||||
"""
|
||||
读取文件内容
|
||||
@filename 文件名
|
||||
return string(bin) 若文件不存在，则返回None
|
||||
"""
|
||||
import os
|
||||
if not os.path.exists(filename):
|
||||
return None
|
||||
fp = None
|
||||
try:
|
||||
fp = open(filename, mode=mode)
|
||||
f_body = fp.read()
|
||||
except:
|
||||
return None
|
||||
finally:
|
||||
if fp and not fp.closed:
|
||||
fp.close()
|
||||
return f_body
|
||||
|
||||
|
||||
class _DB:
|
||||
|
||||
def __call__(self, table: str):
|
||||
import db
|
||||
with db.Sql() as t:
|
||||
t.table(table)
|
||||
return t
|
||||
|
||||
|
||||
DB = _DB()
|
||||
|
||||
GET_CLASS = public.dict_obj
|
||||
|
||||
ExecShell: Callable = public.ExecShell
|
||||
Reference in New Issue
Block a user