diff --git a/plugins/xui/index.py b/plugins/xui/index.py index ffa7e9b3b..5b42778a3 100755 --- a/plugins/xui/index.py +++ b/plugins/xui/index.py @@ -81,18 +81,6 @@ def __delete_port(port): except Exception as e: return "Delete failed {}".format(e) -def openPort(): - port = getXuiPort() - for i in [port]: - __release_port(i) - return True - -def delPort(): - port = getXuiPort() - for i in [port]: - __delete_port(i) - return True - def pSqliteDb(dbname='databases'): conn = mw.M(dbname).dbPos('/etc/x-ui', 'x-ui') @@ -120,6 +108,7 @@ def start(): def stop(): + closePort() return xuiOp('stop') @@ -154,6 +143,16 @@ def initdUinstall(): mw.execShell('systemctl disable x-ui') return 'ok' +def openPort(): + port_data = setting.field('id,key,value').where("key=?", ('webPort',)).find() + port = port_data['value'] + __release_port(port) + +def closePort(): + port_data = setting.field('id,key,value').where("key=?", ('webPort',)).find() + port = port_data['value'] + __delete_port(port) + def getXuiInfo(): data = {} diff --git a/plugins/xui/install.sh b/plugins/xui/install.sh index 4eea3388c..5569db5bd 100755 --- a/plugins/xui/install.sh +++ b/plugins/xui/install.sh @@ -24,15 +24,18 @@ Install_app() echo "$VERSION" > $serverPath/xui/version.pl bash ${curPath}/install_xui.sh + + cd ${rootPath} && python3 plugins/xui/index.py start echo '安装完成' } Uninstall_app() { + cd ${rootPath} && python3 plugins/xui/index.py stop + rm -rf $serverPath/xui echo 'y' | x-ui uninstall rm /usr/bin/x-ui -f - echo '卸载完成' }