Merge pull request #2383 from openNAMU/beta

임시 버그 수정

route/login_find_email_check.py

@@ -79,7 +79,7 @@ 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', orjson.dumps(user_app_data).decode('utf-8')])
+                        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)

route/login_register_submit.py

@@ -48,7 +48,7 @@ def login_register_submit_2():
             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', orjson.dumps(user_app_data).decode('utf-8')])
+            curs.execute(db_change("insert into user_set (id, name, data) values (?, ?, ?)"), [user_app_data['id'], 'application', json.dumps(user_app_data)])
 
             return re_error(conn, 43)
         else:

route/tool/func.py

@@ -116,7 +116,7 @@ def python_to_golang_sync(func_name, other_set = {}):
     if other_set == {}:
         other_set = '{}'
     else:
-        other_set = orjson.dumps(other_set)
+        other_set = json.dumps(other_set)
 
     if platform.system() == 'Linux':
         if platform.machine() in ["AMD64", "x86_64"]:
@@ -158,7 +158,7 @@ async def python_to_golang(func_name, other_set = {}):
     if other_set == {}:
         other_set = '{}'
     else:
-        other_set = orjson.dumps(other_set)
+        other_set = json.dumps(other_set)
 
     if platform.system() == 'Linux':
         if platform.machine() in ["AMD64", "x86_64"]:
@@ -334,7 +334,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(orjson.dumps(set_data).decode('utf-8'))
+                    f.write(json.dumps(set_data))
 
         print('DB name : ' + set_data['db'])
         print('DB type : ' + set_data['db_type'])
@@ -383,7 +383,7 @@ class class_check_json:
                 'w', 
                 encoding = 'utf8'
             ) as f:
-                f.write(orjson.dumps(set_data_mysql).decode('utf-8'))
+                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']
@@ -577,7 +577,7 @@ 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], orjson.dumps(sql_data).decode('utf-8')])
+            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%"'))

route/tool/func_render_namumark.py

@@ -1,4 +1,5 @@
 from .func_tool import *
+
 from typing import Any
 
 class class_do_render_namumark:
@@ -1380,7 +1381,7 @@ class class_do_render_namumark:
                         '''
                         data_name = self.get_tool_data_storage('' + \
                             include_link + \
-                            '<div id="' + include_sub_name + '" style="display: none;">' + urllib.parse.quote(orjson.dumps(include_change_list).decode('utf-8')) + '</div>' + \
+                            '<div id="' + include_sub_name + '" style="display: none;">' + urllib.parse.quote(json.dumps(include_change_list)) + '</div>' + \
                         '', '', match_org)
                     else:
                         self.data_backlink[include_name]['no'] = ''

route/tool/func_tool.py

@@ -8,6 +8,7 @@ import re
 
 import os
 import html
+import json
 import sqlite3
 import time
 import threading

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-v184",
+        "r_ver" : "v3.5.0-v185",
         "c_ver" : "20240801",
         "s_ver" : "20240426"
     }