버그 수정 및 Golang language도 파이썬처럼 로드하도록

lang/help_tool.py

@@ -1,4 +1,5 @@
 import re
+import json
 import orjson
 
 o_json = orjson.loads(open('en-US.json', encoding = 'utf8').read())
@@ -23,7 +24,7 @@ for i in list(o_json):
 
             n_json = {**n_json, **{i : n_text}}
 
-n_data = orjson.dumps(n_json, indent = 4, ensure_ascii = False)
+n_data = json.dumps(n_json, indent = 4, ensure_ascii = False)
 
 f = open(n_name + '.json', "w", encoding='utf8')
 f.write(n_data)

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)])
+                        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')])
         
                         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)])
+            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')])
 
             return re_error(conn, '/error/43')
         else:

route/tool/func.py

@@ -117,7 +117,7 @@ def python_to_golang_sync(func_name, other_set = {}):
     if other_set == {}:
         other_set = '{}'
     else:
-        other_set = orjson.dumps(other_set)
+        other_set = orjson.dumps(other_set).decode('utf-8')
 
     if platform.system() == 'Linux':
         if platform.machine() in ["AMD64", "x86_64"]:
@@ -156,7 +156,7 @@ async def python_to_golang(func_name, other_set = {}):
     if other_set == {}:
         other_set = '{}'
     else:
-        other_set = orjson.dumps(other_set)
+        other_set = orjson.dumps(other_set).decode('utf-8')
 
     if platform.system() == 'Linux':
         if platform.machine() in ["AMD64", "x86_64"]:
@@ -329,7 +329,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))
+                    f.write(orjson.dumps(set_data).decode('utf-8'))
 
         print('DB name : ' + set_data['db'])
         print('DB type : ' + set_data['db_type'])
@@ -378,7 +378,7 @@ class class_check_json:
                 'w', 
                 encoding = 'utf8'
             ) as f:
-                f.write(orjson.dumps(set_data_mysql))
+                f.write(orjson.dumps(set_data_mysql).decode('utf-8'))
 
         data_db_set['mysql_user'] = set_data_mysql['user']
         data_db_set['mysql_pw'] = set_data_mysql['password']
@@ -572,7 +572,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)])
+            curs.execute(db_change("insert into user_set (name, id, data) values (?, ?, ?)"), ['application', i[0], orjson.dumps(sql_data).decode('utf-8')])
     
     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

@@ -1380,7 +1380,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)) + '</div>' + \
+                            '<div id="' + include_sub_name + '" style="display: none;">' + urllib.parse.quote(orjson.dumps(include_change_list).decode('utf-8')) + '</div>' + \
                         '', '', match_org)
                     else:
                         self.data_backlink[include_name]['no'] = ''

route_go/route/tool/language.go

@@ -11,6 +11,9 @@ import (
 func Get_language(db *sql.DB, data string, safe bool) string {
 	var json = jsoniter.ConfigCompatibleWithStandardLibrary
 
+	m_db := Temp_DB_connect()
+	defer m_db.Close()
+
 	var language string
 
 	err := db.QueryRow(DB_change("select data from other where name = 'language'")).Scan(&language)
@@ -22,26 +25,51 @@ func Get_language(db *sql.DB, data string, safe bool) string {
 		}
 	}
 
-	file, err := os.Open("./lang/" + language + ".json")
+	var language_data string
+
+	stmt, err := m_db.Prepare("select data from temp where name = ?")
 	if err != nil {
 		log.Fatal(err)
 	}
-	defer file.Close()
-
-	lang_data := map[string]string{}
+	defer stmt.Close()
 
-	decoder := json.NewDecoder(file)
-	if err := decoder.Decode(&lang_data); err != nil {
-		log.Fatal(err)
+	err = stmt.QueryRow("lang_" + language + "_" + data).Scan(&language_data)
+	if err != nil {
+		if err == sql.ErrNoRows {
+			language_data = ""
+		} else {
+			log.Fatal(err)
+		}
 	}
 
-	if _, ok := lang_data[data]; ok {
+	if language_data != "" {
 		if safe {
-			return lang_data[data]
+			return language_data
 		} else {
-			return HTML_escape(lang_data[data])
+			return HTML_escape(language_data)
 		}
 	} else {
-		return data + " (" + language + ")"
+		file, err := os.Open("./lang/" + language + ".json")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer file.Close()
+
+		lang_data := map[string]string{}
+
+		decoder := json.NewDecoder(file)
+		if err := decoder.Decode(&lang_data); err != nil {
+			log.Fatal(err)
+		}
+
+		if _, ok := lang_data[data]; ok {
+			if safe {
+				return lang_data[data]
+			} else {
+				return HTML_escape(lang_data[data])
+			}
+		} else {
+			return data + " (" + language + ")"
+		}
 	}
 }