up_fail

Sleeping

App Files Files Community

DmitrMakeev commited on Oct 28, 2024

Commit

6ccef9f

verified ·

1 Parent(s): 6069a71

Update app.py

Browse files

Files changed (1) hide show

app.py +63 -103

app.py CHANGED Viewed

@@ -93,8 +93,7 @@ if not os.path.exists(HTML_FOLDER):
 DATABASES = ['data_gc.db', 'site_data.db', 'ws_data.db', 'vk_data.db', 'tg_data.db', 'gk_data.db']
 def init_db(db_name):
     conn = sqlite3.connect(db_name)
@@ -142,110 +141,60 @@ def init_db(db_name):
     conn.commit()
     conn.close()
 for db in DATABASES:
     init_db(db)
-DATABASE_NEW = 'data_gc.db'
-# Переменная для хранения IP-адреса сервера
-server_ip = None
-def get_ip_address():
-    global server_ip
-    if server_ip is None:
-        # Определяем IP-адрес сервера
-        hostname = socket.gethostname()
-        server_ip = socket.gethostbyname(hostname)
-    return server_ip
-@app.route('/ip')
-def index():
-    # Получаем IP-адрес и порт
-    ip_address = get_ip_address()
-    port = int(os.environ.get('PORT', 7860))  # Порт по умолчанию 7860
-    # Формируем HTML-страницу
-    html = f"""
-    <html>
-    <head>
-        <title>Server Info</title>
-    </head>
-    <body>
-        <h1>Server Information</h1>
-        <p>IP Address: {ip_address}</p>
-        <p>Port: {port}</p>
-    </body>
-    </html>
-    """
-    return render_template_string(html)
-# Глобальные переменные для хранения настроек
-api_key_auth = ''
-crypto_key_auth = ''
-crypto_key_url = ''
-vk_api_key_ser = ''
-senler_token_ser = ''
-wa_ak_ser = ''
-wa_api_key_ser = ''
-curators_ser = ''
-call_api_key_ser = ''
-# Пример данных настроек
-settings = {
-    'api_key_auth': 'api_key_auth_setting',
-    'crypto_key_auth': 'crypto_key_auth_setting',
-    'crypto_key_url': 'crypto_key_url_setting',
-    'vk_api_key': 'vk_api_key_setting',
-    'senler_token': 'senler_token_setting',
-    'wa_ak': 'wa_ak_setting',
-    'wa_api_key': 'wa_api_key_setting',
-    'curators': 'curators_setting',
-    'call_api_key': 'call_api_key_setting'
-}
-def update_global_variables_from_settings():
-    global api_key_auth, crypto_key_auth, crypto_key_url, vk_api_key_ser, senler_token_ser, wa_ak_ser, wa_api_key_ser, curators_ser, call_api_key_ser
-    # Обновляем глобальные переменные из массива settings
-    api_key_auth = settings.get('api_key_auth', '')
-    crypto_key_auth = settings.get('crypto_key_auth', '')
-    crypto_key_url = settings.get('crypto_key_url', '')
-    vk_api_key_ser = settings.get('vk_api_key', '')
-    senler_token_ser = settings.get('senler_token', '')
-    wa_ak_ser = settings.get('wa_ak', '')
-    wa_api_key_ser = settings.get('wa_api_key', '')
-    curators_ser = settings.get('curators', '')
-    call_api_key_ser = settings.get('call_api_key', '')
-    # Выводим значения в консоль сервера
-    print("Обновленные глобальные переменные:")
-    print(f"api_key_auth: {api_key_auth}")
-    print(f"crypto_key_auth: {crypto_key_auth}")
-    print(f"crypto_key_url: {crypto_key_url}")
-    print(f"vk_api_key_ser: {vk_api_key_ser}")
-    print(f"senler_token_ser: {senler_token_ser}")
-    print(f"wa_ak_ser: {wa_ak_ser}")
-    print(f"wa_api_key_ser: {wa_api_key_ser}")
-    print(f"curators_ser: {curators_ser}")
-    print(f"call_api_key_ser: {call_api_key_ser}")
 def save_settings(settings_dict):
-    global settings
-    # Обновляем глобальный словарь settings
-    for key, value in settings_dict.items():
-        if value is not None and key != 'api_key_sys':
-            settings[key] = value
-    update_global_variables_from_settings()
 @app.route('/load_settings', methods=['POST'])
 def get_settings():
@@ -253,10 +202,21 @@ def get_settings():
     client_api_key_sys = request.json.get('api_key_sys')
     # Проверка ключа авторизации
-    if client_api_key_sys != api_key_sys:
         return jsonify({"error": "Unauthorized access"}), 403
-    return jsonify(settings)
 @app.route('/save_settings', methods=['POST'])
 def save_settings_route():
@@ -264,7 +224,7 @@ def save_settings_route():
     client_api_key_sys = request.json.get('api_key_sys')
     # Проверка ключа авторизации
-    if client_api_key_sys != api_key_sys:
         return jsonify({"error": "Unauthorized access"}), 403
     data = request.json.get('data', {})

 DATABASES = ['data_gc.db', 'site_data.db', 'ws_data.db', 'vk_data.db', 'tg_data.db', 'gk_data.db']
+SETTINGS_DB = 'settings.db'
 def init_db(db_name):
     conn = sqlite3.connect(db_name)
     conn.commit()
     conn.close()
+def init_settings_db():
+    conn = sqlite3.connect(SETTINGS_DB)
+    cursor = conn.cursor()
+    cursor.execute('''
+        CREATE TABLE IF NOT EXISTS settings (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            api_key_auth TEXT,
+            crypto_key_auth TEXT,
+            crypto_key_url TEXT,
+            vk_api_key_ser TEXT,
+            senler_token_ser TEXT,
+            wa_ak_ser TEXT,
+            wa_api_key_ser TEXT,
+            curators_ser TEXT,
+            call_api_key_ser TEXT
+        )
+    ''')
+    conn.commit()
+    conn.close()
 for db in DATABASES:
     init_db(db)
+init_settings_db()
+def load_settings():
+    conn = sqlite3.connect(SETTINGS_DB)
+    cursor = conn.cursor()
+    cursor.execute('SELECT * FROM settings')
+    settings = cursor.fetchone()
+    conn.close()
+    return settings
 def save_settings(settings_dict):
+    conn = sqlite3.connect(SETTINGS_DB)
+    cursor = conn.cursor()
+    cursor.execute('''
+        INSERT OR REPLACE INTO settings (
+            api_key_auth, crypto_key_auth, crypto_key_url, vk_api_key_ser, senler_token_ser,
+            wa_ak_ser, wa_api_key_ser, curators_ser, call_api_key_ser
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+    ''', (
+        settings_dict.get('api_key_auth', ''),
+        settings_dict.get('crypto_key_auth', ''),
+        settings_dict.get('crypto_key_url', ''),
+        settings_dict.get('vk_api_key_ser', ''),
+        settings_dict.get('senler_token_ser', ''),
+        settings_dict.get('wa_ak_ser', ''),
+        settings_dict.get('wa_api_key_ser', ''),
+        settings_dict.get('curators_ser', ''),
+        settings_dict.get('call_api_key_ser', '')
+    ))
+    conn.commit()
+    conn.close()
 @app.route('/load_settings', methods=['POST'])
 def get_settings():
     client_api_key_sys = request.json.get('api_key_sys')
     # Проверка ключа авторизации
+    if client_api_key_sys != load_settings()[1]:  # Предполагаем, что api_key_auth находится на второй позиции
         return jsonify({"error": "Unauthorized access"}), 403
+    settings = load_settings()
+    return jsonify({
+        'api_key_auth': settings[1],
+        'crypto_key_auth': settings[2],
+        'crypto_key_url': settings[3],
+        'vk_api_key_ser': settings[4],
+        'senler_token_ser': settings[5],
+        'wa_ak_ser': settings[6],
+        'wa_api_key_ser': settings[7],
+        'curators_ser': settings[8],
+        'call_api_key_ser': settings[9]
+    })
 @app.route('/save_settings', methods=['POST'])
 def save_settings_route():
     client_api_key_sys = request.json.get('api_key_sys')
     # Проверка ключа авторизации
+    if client_api_key_sys != load_settings()[1]:  # Предполагаем, что api_key_auth находится на второй позиции
         return jsonify({"error": "Unauthorized access"}), 403
     data = request.json.get('data', {})