Browse Source

이렇게 오버라이드 해야겠다

잉여개발기 (SPDV) 1 year ago
parent
commit
5b131addc9

+ 3 - 3
app.py

@@ -22,7 +22,7 @@ if len(args) > 1:
 
 # Init-Version
 with open('version.json', encoding = 'utf8') as file_data:
-    version_list = json.loads(file_data.read())
+    version_list = json_loads(file_data.read())
 
 # Init-DB
 data_db_set = class_check_json()
@@ -270,13 +270,13 @@ async def golang_process_check():
 
             other_set = {
                 "url" : "test",
-                "data" : json.dumps(other_set_temp),
+                "data" : json_dumps(other_set_temp),
                 "session" : "{}",
                 "cookie" : "",
                 "ip" : "127.0.0.1"
             }
 
-            response = requests.post('http://localhost:' + server_set["golang_port"] + '/', data = json.dumps(other_set))
+            response = requests.post('http://localhost:' + server_set["golang_port"] + '/', data = json_dumps(other_set))
             if response.status_code == 200:
                 print('Golang turn on')
                 break

+ 1 - 1
requirements-optional.txt

@@ -1,3 +1,3 @@
 mysqlclient
 regex
-ujson
+orjson

+ 3 - 3
route/api_skin_info.py

@@ -9,7 +9,7 @@ async def api_skin_info(name = ''):
         if not flask.request.args.get('all', None):
             json_address = re.sub(r"(((?!\.|\/).)+)\.html$", "info.json", name)
             try:
-                json_data = json.loads(open(json_address, encoding='utf8').read())
+                json_data = json_loads(open(json_address, encoding='utf8').read())
             except:
                 json_data = None
 
@@ -28,7 +28,7 @@ async def api_skin_info(name = ''):
             for i in load_skin(conn, skin_check(conn, 1), 1):
                 json_address = re.sub(r"(((?!\.|\/).)+)\.html$", "info.json", './views/' + i + '/index.html')
                 try:
-                    json_data = json.loads(open(json_address, encoding='utf8').read())
+                    json_data = json_loads(open(json_address, encoding='utf8').read())
                 except:
                     json_data = None
 
@@ -51,7 +51,7 @@ async def api_skin_info(name = ''):
 
                         if get_data and get_data.getcode() == 200:
                             try:
-                                get_data = json.loads(get_data.read().decode())
+                                get_data = json_loads(get_data.read().decode())
                             except:
                                 get_data = {}
 

+ 1 - 1
route/go_api_w_render.py

@@ -39,7 +39,7 @@ async def api_w_render(name = '', tool = '', request_method = '', request_data =
                 data_type = 'api_thread'
 
             if markup in ('', 'namumark', 'namumark_beta') and data_option != '':
-                data_option = json.loads(data_option)
+                data_option = json_loads(data_option)
 
                 # remove end br
                 data_org = re.sub('^\n+', '', data_org)

+ 1 - 1
route/login_find_email_check.py

@@ -79,7 +79,7 @@ async def login_find_email_check(tool):
                         user_app_data['ua'] = user_agent
                         user_app_data['email'] = flask.session['c_email']
                         
-                        curs.execute(db_change("insert into user_set (id, name, data) values (?, ?, ?)"), [flask.session['c_id'], 'application', json.dumps(user_app_data)])
+                        curs.execute(db_change("insert into user_set (id, name, data) values (?, ?, ?)"), [flask.session['c_id'], 'application', json_dumps(user_app_data)])
         
                         for i in re_set_list:
                             flask.session.pop(i, None)

+ 1 - 1
route/login_register_submit.py

@@ -48,7 +48,7 @@ async def login_register_submit():
             for for_a in session_reset_list:
                 flask.session.pop(for_a, None)
 
-            curs.execute(db_change("insert into user_set (id, name, data) values (?, ?, ?)"), [user_app_data['id'], 'application', json.dumps(user_app_data)])
+            curs.execute(db_change("insert into user_set (id, name, data) values (?, ?, ?)"), [user_app_data['id'], 'application', json_dumps(user_app_data)])
 
             return await re_error(conn, 43)
         else:

+ 2 - 2
route/recent_app_submit.py

@@ -33,7 +33,7 @@ async def recent_app_submit():
                 '''
 
                 for application in db_data:
-                    application = json.loads(application[0])
+                    application = json_loads(application[0])
 
                     if 'question' in application:
                         question = html.escape(application['question'])
@@ -101,7 +101,7 @@ async def recent_app_submit():
                 if not application:
                     return await re_error(conn, 26)
                 else:
-                    application = json.loads(application[0][0])
+                    application = json_loads(application[0][0])
 
                 add_user(conn, application['id'], application['pw'], application['email'], application['encode'])
 

+ 13 - 12
route/tool/func.py

@@ -13,9 +13,11 @@ import email.mime.text
 import email.utils
 import email.header
 
+from .func_tool import *
+
 # Init-Version
 with open('version.json', encoding = 'utf8') as file_data:
-    version_list = json.loads(file_data.read())
+    version_list = json_loads(file_data.read())
 
 print('Version : ' + version_list['r_ver'])
 print('DB set version : ' + version_list['c_ver'])
@@ -68,7 +70,6 @@ else:
     print('PIP check pass')
 
 # Init-Load
-from .func_tool import *
 from .func_render import class_do_render
 
 from diff_match_patch import diff_match_patch
@@ -142,11 +143,11 @@ def global_some_set_do(set_name, data = None):
 async def python_to_golang(func_name, other_set = {}):    
     other_set = {
         "url" : func_name,
-        "data" : json.dumps(other_set)
+        "data" : json_dumps(other_set)
     }
 
     if flask.has_request_context():
-        other_set["session"] = json.dumps(dict(flask.session))
+        other_set["session"] = json_dumps(dict(flask.session))
 
         if "Cookie" in flask.request.headers:
             other_set["cookie"] = flask.request.headers["Cookie"]
@@ -163,7 +164,7 @@ async def python_to_golang(func_name, other_set = {}):
 
     async with aiohttp.ClientSession() as session:
         while 1:
-            async with session.post('http://localhost:' + port_data + '/', data = json.dumps(other_set)) as res:
+            async with session.post('http://localhost:' + port_data + '/', data = json_dumps(other_set)) as res:
                 data = await res.json()
 
                 if "response" in data and data["response"] == "error":
@@ -291,7 +292,7 @@ class class_check_json:
             if os.path.exists(os.path.join('data', 'set.json')):
                 db_set_list = ['db', 'db_type']
                 with open(os.path.join('data', 'set.json'), encoding = 'utf8') as file_data:
-                    set_data = json.loads(file_data.read())
+                    set_data = json_loads(file_data.read())
 
                 for i in db_set_list:
                     if not i in set_data:
@@ -325,7 +326,7 @@ class class_check_json:
                     set_data['db'] = data_get
 
                 with open(os.path.join('data', 'set.json'), 'w', encoding = 'utf8') as f:
-                    f.write(json.dumps(set_data))
+                    f.write(json_dumps(set_data))
 
         print('DB name : ' + set_data['db'])
         print('DB type : ' + set_data['db_type'])
@@ -340,7 +341,7 @@ class class_check_json:
         if os.path.exists(os.path.join('data', 'mysql.json')):
             db_set_list = ['user', 'password', 'host', 'port']
             with open(os.path.join('data', 'mysql.json'), encoding = 'utf8') as file_data:
-                set_data = json.loads(file_data.read())
+                set_data = json_loads(file_data.read())
 
             for i in db_set_list:
                 if not i in set_data:
@@ -370,7 +371,7 @@ class class_check_json:
                 set_data_mysql['port'] = '3306'
 
             with open(os.path.join('data', 'mysql.json'), 'w', encoding = 'utf8') as f:
-                f.write(json.dumps(set_data_mysql))
+                f.write(json_dumps(set_data_mysql))
 
         data_db_set['mysql_user'] = set_data_mysql['user']
         data_db_set['mysql_pw'] = set_data_mysql['password']
@@ -477,7 +478,7 @@ async def update(conn, ver_num, set_data):
                 curs.execute(db_change("update other set data = '' where name = 'sec_re'"))
     
     if ver_num < 3172800 and set_data['type'] == 'mysql':
-        get_data_mysql = json.loads(open('data/mysql.json', encoding = 'utf8').read())
+        get_data_mysql = json_loads(open('data/mysql.json', encoding = 'utf8').read())
         
         with open('data/mysql.json', 'w') as f:
             f.write('{ "user" : "' + get_data_mysql['user'] + '", "password" : "' + get_data_mysql['password'] + '", "host" : "localhost" }')
@@ -564,7 +565,7 @@ async def update(conn, ver_num, set_data):
             sql_data['ua'] = i[7]
             sql_data['email'] = i[8]
             
-            curs.execute(db_change("insert into user_set (name, id, data) values (?, ?, ?)"), ['application', i[0], json.dumps(sql_data)])
+            curs.execute(db_change("insert into user_set (name, id, data) values (?, ?, ?)"), ['application', i[0], json_dumps(sql_data)])
     
     if ver_num < 3500105:
         curs.execute(db_change('delete from acl where title like "file:%" and data = "admin" and type like "decu%"'))
@@ -1183,7 +1184,7 @@ def get_lang(conn, data, safe = 0):
     else:
         lang_list = os.listdir('lang')
         if (lang_name + '.json') in lang_list:
-            lang = json.loads(open(os.path.join('lang', lang_name + '.json'), encoding = 'utf8').read())
+            lang = json_loads(open(os.path.join('lang', lang_name + '.json'), encoding = 'utf8').read())
             
             for title in lang:
                 global_lang_data[lang_name + '_' + title] = lang[title] 

+ 11 - 2
route/tool/func_tool.py

@@ -13,9 +13,18 @@ import time
 import threading
 
 try:
-    import ujson as json
-except:
+    import orjson
+
+    def json_dumps(obj):
+        return orjson.dumps(obj).decode("utf-8")
+
+    def json_loads(s):
+        return orjson.loads(s if isinstance(s, bytes) else s.encode("utf-8"))
+except ImportError:
     import json
+
+    json_dumps = json.dumps
+    json_loads = json.loads
   
 try:
     import regex as re

+ 1 - 1
version.json

@@ -1,5 +1,5 @@
 {
-    "r_ver" : "v3.6.0-v17",
+    "r_ver" : "v3.6.0-v18",
     "c_ver" : "20250326",
     "s_ver" : "20240426",
     "bin_link" : "https://github.com/openNAMU/GopenNAMU/releases/download/v2025-04-24-v1/"