From e1e7fd51cd06bba576dc032c6ef3cdb2418b953e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 8 Nov 2024 19:56:37 +0800
Subject: [PATCH] update

---
 web/admin/site/__init__.py | 31 +++++++++++++++++++++++--------
 web/core/db.py             |  7 +++++--
 web/thisdb/domain.py       |  3 ++-
 web/utils/site.py          | 12 +++++++++++-
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/web/admin/site/__init__.py b/web/admin/site/__init__.py
index 894ee36b5..ebefe1e3f 100644
--- a/web/admin/site/__init__.py
+++ b/web/admin/site/__init__.py
@@ -183,6 +183,28 @@ def set_ps():
     ps = request.form.get('ps', '')
     return MwSites.instance().setPs(site_id, ps)
 
+# 站点绑定域名
+@blueprint.route('/get_domain', endpoint='get_domain',methods=['POST'])
+@panel_login_required
+def get_domain():
+    site_id = request.form.get('pid', '')
+    return MwSites.instance().getDomain(site_id)
+
+# 获取默认为静态列表
+@blueprint.route('/get_rewrite_list', endpoint='get_rewrite_list',methods=['POST'])
+@panel_login_required
+def get_rewrite_list():
+    return MwSites.instance().getRewriteList()
+
+# 获取默认为静态列表
+@blueprint.route('/get_rewrite_conf', endpoint='get_rewrite_conf',methods=['POST'])
+@panel_login_required
+def get_rewrite_conf():
+    siteName = request.form.get('siteName', '')
+    rewrite = MwSites.instance().getRewriteConf(siteName)
+    return {'rewrite': rewrite}
+
+
 
 # 设置默认网站信息
 @blueprint.route('/get_default_site', endpoint='get_default_site',methods=['POST'])
@@ -190,14 +212,7 @@ def set_ps():
 def get_default_site():
     return MwSites.instance().getDefaultSite()
 
-# 站点删除
-@blueprint.route('/get_domain', endpoint='get_domain',methods=['POST'])
-@panel_login_required
-def get_domain():
-    site_id = request.form.get('id', '')
-    return MwSites.instance().getDomain(site_id)
-
-
+# 设置默认站
 @blueprint.route('/set_default_site', endpoint='set_default_site',methods=['POST'])
 @panel_login_required
 def set_default_site():
diff --git a/web/core/db.py b/web/core/db.py
index 6550f77c8..0d63b222b 100755
--- a/web/core/db.py
+++ b/web/core/db.py
@@ -147,8 +147,11 @@ class Sql():
         try:
             sql = "SELECT " + self.__OPT_FIELD + " FROM " + self.__DB_TABLE + \
                 self.__OPT_WHERE + self.__OPT_GROUP + self.__OPT_ORDER + self.__OPT_LIMIT
-            # print(sql)
-            # print(self.__OPT_PARAM)
+
+            if self.__debug:
+                print(sql)
+                print(self.__OPT_PARAM)
+                
             result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
             data = result.fetchall()
             if len(data) == 0:
diff --git a/web/thisdb/domain.py b/web/thisdb/domain.py
index 0bb9ef126..fb163a624 100644
--- a/web/thisdb/domain.py
+++ b/web/thisdb/domain.py
@@ -23,7 +23,8 @@ def addDomain(pid, name, port):
     return mw.M('domain').insert(insert_data)
 
 def getDomainByPid(pid):
-    return mw.M('domain').where("pid=?", (pid,)).field(__FIELD).select()
+    # .debug(True)
+    return mw.M('domain').field(__FIELD).where("pid=?", (pid,)).select()
 
 
 def deleteDomainId(domain_id):
diff --git a/web/utils/site.py b/web/utils/site.py
index c1d05a092..e27219977 100644
--- a/web/utils/site.py
+++ b/web/utils/site.py
@@ -281,8 +281,18 @@ class sites(object):
 
     # 获取域名列表
     def getDomain(self, pid):
-        return thisdb.getDomainByPid(pid)
+        data =  thisdb.getDomainByPid(pid)
+        return data
 
+    def getRewriteList(self):
+        rewriteList = {}
+        rewriteList['rewrite'] = []
+        rewriteList['rewrite'].append('0.当前')
+        rewrite_nginx_dir = mw.getPanelDir() + '/rewrite/nginx'
+        for ds in os.listdir(rewrite_nginx_dir):
+            rewriteList['rewrite'].append(ds[0:len(ds) - 5])
+        rewriteList['rewrite'] = sorted(rewriteList['rewrite'])
+        return rewriteList
 
     def getSitePhpVersion(self, siteName):
         conf = mw.readFile(self.getHostConf(siteName))