From 55a0cfc0ab4db8dfde50fb07ba0cc936094c872a Mon Sep 17 00:00:00 2001
From: Antares <antares.oier@gmail.com>
Date: Wed, 12 Feb 2020 00:21:43 +0800
Subject: [PATCH 1/2] update config

---
 config_default.py                   | 2 ++
 plugins/music_gen/config_default.py | 2 --
 plugins/music_gen/music_gen.py      | 4 ++--
 plugins/sign_in/sign_in.py          | 9 +++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/config_default.py b/config_default.py
index d0a3feb..5844c6f 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 c432dd2..49f4091 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 466b736..0e09ad4 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 4f5abc9..304f248 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/<int:group_id>", 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)
 
 
-- 
Gitee


From 14b2543e8dbc23331be90d6de9cb99da9708b260 Mon Sep 17 00:00:00 2001
From: Antares <antares.oier@gmail.com>
Date: Wed, 12 Feb 2020 00:43:32 +0800
Subject: [PATCH 2/2] fix bug

---
 plugins/sign_in/sign_in.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/sign_in/sign_in.py b/plugins/sign_in/sign_in.py
index 304f248..24fc1d4 100644
--- a/plugins/sign_in/sign_in.py
+++ b/plugins/sign_in/sign_in.py
@@ -53,7 +53,7 @@ def sign_in(bot, context, args):
     else:
         url = f"http://{public_ip}"
 
-    tail_string = f"请前往 {url}:{global_vars.config.POST_PORT}/signin/rank/{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)
 
 
-- 
Gitee