diff --git a/config_default.py b/config_default.py index d0a3feb555b6a50947a4f1f8f63c2e6cb707ef4c..5844c6ffebdc1f22aacab3237ddf8fc4da44d400 100644 --- a/config_default.py +++ b/config_default.py @@ -20,3 +20,5 @@ COMMAND_PREFIX = ["--", "!!"] COMMAND_COOLDOWN = 0 # 调试模式 DEBUG = False +# 服务器URL +SERVER_URL = "http://ecs.zhehao.top" diff --git a/plugins/music_gen/config_default.py b/plugins/music_gen/config_default.py index c432dd2964337f9ed418d844a9c41f51e54b80fa..49f40917391544fe3135c16162e569d6f49fb9e7 100644 --- a/plugins/music_gen/config_default.py +++ b/plugins/music_gen/config_default.py @@ -12,5 +12,3 @@ DOWNLOAD_TIMEOUT = 3*1000*60 # 所存储的最多的文件数 MAX_STORING_FILES = 10 -# URL根 -WEB_URL = "http://127.0.0.1:5002" diff --git a/plugins/music_gen/music_gen.py b/plugins/music_gen/music_gen.py index 466b736ea91d3c8a07704777ddfd94a716603183..0e09ad4772acb3c8bff9f8d0e498c46b43e3e76d 100644 --- a/plugins/music_gen/music_gen.py +++ b/plugins/music_gen/music_gen.py @@ -10,6 +10,7 @@ from typing import List, Tuple, Callable from pydub import AudioSegment from redis import Redis, ConnectionPool # from flask import Flask +import global_vars import flask import base64 import threading @@ -353,10 +354,9 @@ def generate_music(note_string: str, updater: Callable[[str], None], callback: C token = str(uuid.uuid1()) store_into_redis(token, mp3_data) download_url = urllib.parse.urljoin( - config.WEB_URL, f"/music/download/{token}") + f"{global_vars.config.SERVER_URL}:{global_vars.config.POST_PORT}", f"/music/download/{token}") updater( f"请前往 {download_url} 下载您的文件,此链接将在 {config.DOWNLOAD_TIMEOUT} 毫秒后失效.") - threading.Thread(target=process).start() diff --git a/plugins/sign_in/sign_in.py b/plugins/sign_in/sign_in.py index 4f5abc9397ef284b7b098711d9f42562986804cb..24fc1d4aa3830b6fcd987d2245180cb94611eb7c 100644 --- a/plugins/sign_in/sign_in.py +++ b/plugins/sign_in/sign_in.py @@ -38,8 +38,6 @@ def load(): import threading threading.Thread(target=fetch_ip).start() - - @web_app.route("/signin/rank", methods=["POST", "GET"]) @web_app.route("/signin/rank/", methods=["POST", "GET"]) @@ -50,9 +48,12 @@ def view_signin(group_id=None): @command(name="签到", help="签到") def sign_in(bot, context, args): + if global_vars.config.SERVER_URL: + url = global_vars.config.SERVER_URL + else: + url = f"http://{public_ip}" - tail_string = "请前往 http://{}:{}/signin/rank/{} 查看签到排名".format( - public_ip, global_vars.config.POST_PORT, context["group_id"]) + tail_string = f"请前往 {url}:{global_vars.config.POST_PORT}/signin/rank/{context['group_id']} 查看签到排名" bot.send(context, get_reply(context)+"\n"+tail_string)