diff --git a/.env b/.env index 4ed2426..9381afb 100644 --- a/.env +++ b/.env @@ -1,6 +1,21 @@ # Общие настройки SECRET_KEY=24af5f41dba9d8cc0dbc1841660da0b14d7df86ab5e0ed973cdd3bc2dbac23f6 -LOG_FILE = /var/log/zilantposter.log +LOG_FILE = /opt/testbot-git/logs/testzilantposter.log + +# Webhook Responder-bot +WEBHOOK_URL = "https://bot.aabpro.ru/testbot" +WEBHOOK_PORT = 5005 +WEBHOOK_SECRET = "cc0dbc1841660da0b14d7df86ab5e0ed973c" + +# Webhook Poster-bot +#POSTHOOK_URL = "https://bot.aabpro.ru/testbot2" +#POSTHOOK_PORT = 5008 +#POSTHOOK_SECRET = "cc0dbc1841660da0b14d7df86ab5e0ed973c" + +# Controller +WEBCTRL_URL = "https://bot.aabpro.ru/testedit" +WEBCTRL_PORT = 5006 +WEBCTRL_PREFIX = "/testedit" # логин и пароль по умолчанию для первого запуска веб-контроллера DEFNM=admin @@ -12,24 +27,70 @@ VK_ACCESS_TOKEN = 'e3732a7ee3732a7ee3732a7ea7e044a75fee373e3732a7e8bf4e48a52d012 VK_API_VERSION = '5.131' # MySQL database -MDBASE = 'zilant_posts' +MDBASE = 'testposts' MDB_HOST = 'localhost' -MDB_USER = 'zilantposter' -MDB_PW = 'Z1l@ntp08t3r' +MDB_USER = 'testuser' +MDB_PW = 'T38tU83r69' # Poster bot -BOT_TOKEN = "8301828103:AAHDuBkw7EUkmMvv5TPpVJaLeeBLu-EB21U" +# Debug bot +# BOT_TOKEN = "8301828103:AAHDuBkw7EUkmMvv5TPpVJaLeeBLu-EB21U" +POSTER_BOT_TOKEN = "8301828103:AAHDuBkw7EUkmMvv5TPpVJaLeeBLu-EB21U" +RESPONDER_BOT_TOKEN = "8301828103:AAHDuBkw7EUkmMvv5TPpVJaLeeBLu-EB21U" +# Zilant info bot +# BOT_TOKEN = "7951721805:AAEW6Go9yvOOcJSWjgJZ7E2XLPtii2qG7UU" +# +# Responder bot +# Zilant poster bot +# BOT_TOKEN = "8115998792:AAHamcNBlTgTXG0Birc1gNbZ5B7z4jMEdik" +# +# POSTER_BOT_TOKEN = "8115998792:AAHamcNBlTgTXG0Birc1gNbZ5B7z4jMEdik" +# RESPONDER_BOT_TOKEN = "7951721805:AAEW6Go9yvOOcJSWjgJZ7E2XLPtii2qG7UU" +# RESPONDER_BOT_NAME = "Zilant_info_bot" +RESPONDER_BOT_NAME = "posto_1638_bot" + +# Parameters +# +# Tag to detect org info +# Org info is normally long, publish without picture +ORG_MESSAGE_TAG = "#оргинфаЗиланткона" + + +# Minutes delay before publishing an event +# calculated as diff between modified field and current datetime +# !! DB datetime is UTC !! +# +# Set 1 hour when Zilant is near +# EVENT_POST_DELAY = 60 +# keep 1 day when far from Zilant +EVENT_POST_DELAY = 1440 # Poster channel +# Debug channel CHANNEL_ID = "@posto1638" -# DB_NAME = "vk_posts.db" +# Zilant production channel +# CHANNEL_ID = "@zilantkon" MAX_CAPTION_LENGTH = 1000 MAX_TEXT_LENGTH = 4000 # Button scripts -RESCAN_SCRIPT = "vk_load.py" -PUBLISH_SCRIPT = "dummy.py" +# RESCAN_SCRIPT = "vk_load.py" +# PUBLISH_SCRIPT = "tg_publish.py" + +# Zilant API call - План Захвата +# +# add event number and trailing / +# +PZK_PREFIX = "https://reg.konvent.ru/zk2025/draft/plan/api/add/" +EVT_PREFIX = "https://reg.konvent.ru/zk2025/events/actions/api/" +DESC_PREFIX = "https://reg.konvent.ru/zk2025/events/actions/" # Event status -IS_EVENT = false -AUTO_PUBLISH = false +IS_EVENT = true +AUTO_PUBLISH = true + +# OpenRouter +OR_KEY = "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" +OR_MODEL_NAME = "deepseek/deepseek-chat-v3.1" +# OR_MODEL_NAME = "deepseek/deepseek-r1-0528:free" +# OR_MODEL_NAME = "qwen/qwen3-coder:free" diff --git a/.woodpecker-ssh-agent-backup.yml b/.woodpecker-ssh-agent-backup.yml deleted file mode 100644 index b1af946..0000000 --- a/.woodpecker-ssh-agent-backup.yml +++ /dev/null @@ -1,27 +0,0 @@ -steps: - - - name: prepare - image: alpine:latest - commands: - - ls -la - - pwd - - 'echo "CI_WORKSPACE = $CI_WORKSPACE"' - - ls -la $CI_WORKSPACE/ - - find . -type f | head -n 20 - - name: deploy - image: appleboy/drone-ssh - settings: - host: 192.168.0.109 - user: deployer - key: - from_secret: SSH_PRIVATE_KEY - script: - - ls -la - - pwd - - 'echo "CI_WORKSPACE = $CI_WORKSPACE"' - - ls -la $CI_WORKSPACE/ - - find . -type f | head -n 20 - - rsync -av ./ /opt/testbot-git/ -when: - event: push - branch: main diff --git a/alter_about_field.py b/alter_about_field.py deleted file mode 100644 index 5ca0546..0000000 --- a/alter_about_field.py +++ /dev/null @@ -1,45 +0,0 @@ -import os -import mysql.connector -from dotenv import load_dotenv - -# Загрузка переменных окружения из .env файла -load_dotenv() - -# Конфигурация базы данных из переменных окружения -DB_CONFIG = { - 'host': os.getenv('MDB_HOST'), - 'user': os.getenv('MDB_USER'), - 'password': os.getenv('MDB_PW'), - 'database': os.getenv('MDBASE') -} - -def alter_column_type(): - try: - # Устанавливаем соединение с базой данных - connection = mysql.connector.connect(**DB_CONFIG) - cursor = connection.cursor() - - # Выполняем ALTER TABLE запрос - alter_query = """ - ALTER TABLE events - MODIFY COLUMN about TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci - """ - cursor.execute(alter_query) - - # Подтверждаем изменения - connection.commit() - - print("Тип поля 'about' успешно изменен на TEXT") - - except mysql.connector.Error as error: - print(f"Ошибка при изменении типа поля: {error}") - if connection: - connection.rollback() - finally: - if cursor: - cursor.close() - if connection: - connection.close() - -if __name__ == "__main__": - alter_column_type() diff --git a/backupdb.sh b/backupdb.sh index 28cca7a..0ddf60c 100644 --- a/backupdb.sh +++ b/backupdb.sh @@ -10,7 +10,7 @@ BACKUP_FILE="$BACKUP_DIR/${DB_NAME}_${DATE}.sql" mkdir -p "$BACKUP_DIR" # Делаем дамп базы данных -mysqldump --databases "$DB_NAME" > "$BACKUP_FILE" +sudo mysqldump --databases "$DB_NAME" > "$BACKUP_FILE" # Проверяем успешность выполнения if [ $? -eq 0 ]; then diff --git a/db_backup.sh b/db_backup.sh deleted file mode 100644 index af1bd55..0000000 --- a/db_backup.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/bash -# Backup database -mysqldump -utestuser -pT38tU83r69 testposts > test_posts_backup.sql diff --git a/logs/.gitkeep b/logs/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/wsgi_bot2.py b/wsgi_bot2.py deleted file mode 100644 index 3b23567..0000000 --- a/wsgi_bot2.py +++ /dev/null @@ -1,4 +0,0 @@ -from evtg_mainbot import app # Импортируйте ваше приложение - -if __name__ == "__main__": - app.run()