Explorar o código

사이트맵 도메인 설정 기능

Surplus_Up (2DU) %!s(int64=6) %!d(string=hai) anos
pai
achega
e0a74e3f1d
Modificáronse 5 ficheiros con 19 adicións e 7 borrados
  1. 1 0
      language/en-US.json
  2. 2 1
      language/ko-KR.json
  3. 7 3
      route/api_sitemap.py
  4. 8 2
      route/setting.py
  5. 1 1
      version.json

+ 1 - 0
language/en-US.json

@@ -100,6 +100,7 @@
         "unset" : "Unset",
         "extension" : "Extension",
         "empty" : "Empty",
+        "domain" : "Domain",
         "_comment_1.1_" : "Time",
             "second" : "Second(s)",
             "hour" : "Hour(s)",

+ 2 - 1
language/ko-KR.json

@@ -371,5 +371,6 @@
     "email_send_error" : "이메일 전송이 실패했습니다.",
     "get_sitemap" : "sitemap.xml 만들거나 갱신하기",
     "same_ip_exist" : "동일한 아이피가 존재합니다.",
-    "restart_fail_error" : "재시작이 실패했습니다. 수동 재시작을 이용해주세요."
+    "restart_fail_error" : "재시작이 실패했습니다. 수동 재시작을 이용해주세요.",
+    "domain" : "도메인"
 }

+ 7 - 3
route/api_sitemap.py

@@ -12,12 +12,16 @@ def api_sitemap_2(conn):
         curs.execute(db_change("select title from data"))
         all_data = curs.fetchall()
 
+        curs.execute(db_change("select data from other where name = 'domain'"))
+        domain = curs.fetchall()
+        domain = domain[0][0] if domain and domain[0][0] != '' else flask.request.host_url
+
         len_all_data = len(all_data)
         count = int(len_all_data / 30000)
         other_count = len_all_data % 30000
 
         for i in range(count + 1):
-            data += '<sitemap><loc>' + flask.request.host_url + 'sitemap_' + str(i) + '.xml</loc></sitemap>\n'
+            data += '<sitemap><loc>' + domain + 'sitemap_' + str(i) + '.xml</loc></sitemap>\n'
 
         data += '' + \
             '</sitemapindex>' + \
@@ -36,10 +40,10 @@ def api_sitemap_2(conn):
 
             if count == i:
                 for x in all_data[30000 * i:]:
-                    data += '<url><loc>' + flask.request.host_url + 'w/' + url_pas(x[0]) + '</loc></url>\n'
+                    data += '<url><loc>' + domain + 'w/' + url_pas(x[0]) + '</loc></url>\n'
             else:
                 for x in all_data[30000 * i:30000 * (i + 1)]:
-                    data += '<url><loc>' + flask.request.host_url + 'w/' + url_pas(x[0]) + '</loc></url>\n'
+                    data += '<url><loc>' + domain + 'w/' + url_pas(x[0]) + '</loc></url>\n'
 
             data += '' + \
                 '</urlset>' + \

+ 8 - 2
route/setting.py

@@ -51,7 +51,8 @@ def setting_2(conn, num, db_set):
             16 : 'host',
             19 : 'slow_edit',
             20 : 'requires_approval',
-            21 : 'backup_where'
+            21 : 'backup_where',
+            22 : 'domain'
         }
         n_list = {
             0 : 'Wiki',
@@ -71,7 +72,8 @@ def setting_2(conn, num, db_set):
             16 : '0.0.0.0',
             19 : '0',
             20 : '',
-            21 : ''
+            21 : '',
+            22 : flask.request.host_url
         }
 
         if flask.request.method == 'POST':
@@ -204,6 +206,10 @@ def setting_2(conn, num, db_set):
                         <hr class="main_hr">
                         <input name="''' + i_list[19] + '''" value="''' + html.escape(d_list[19]) + '''">
                         <hr class="main_hr">
+                        <span>''' + load_lang('domain') + '''</span> (EX : http://2du.pythonanywhere.com/)
+                        <hr class="main_hr">
+                        <input name="''' + i_list[22] + '''" value="''' + html.escape(d_list[22]) + '''">
+                        <hr class="main_hr">
                         <button id="save" type="submit">''' + load_lang('save') + '''</button>
                     </form>
                 ''',

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.9-master-30",
+        "r_ver" : "v3.1.9-master-31",
         "c_ver" : "3192800",
         "s_ver" : "9"
     }, "stable" : {