Merge remote-tracking branch 'origin/main'

mikumifa · Aug 26, 2024 · 6b6d934 · 6b6d934
2 parents 2dc3728 + e7f6db6
commit 6b6d934
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -72,17 +72,17 @@ Running on local URL:  http://127.0.0.1:xxx
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/gpc123456">
-                    <img src="https://avatars.githubusercontent.com/u/78298238?v=4" width="100;" alt="gpc123456"/>
+                <a href="https://github.com/WittF">
+                    <img src="https://avatars.githubusercontent.com/u/108567138?v=4" width="100;" alt="WittF"/>
                     <br />
-                    <sub><b>gpc123456</b></sub>
+                    <sub><b>W1ttF</b></sub>
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/WittF">
-                    <img src="https://avatars.githubusercontent.com/u/108567138?v=4" width="100;" alt="WittF"/>
+                <a href="https://github.com/gpc123456">
+                    <img src="https://avatars.githubusercontent.com/u/78298238?v=4" width="100;" alt="gpc123456"/>
                     <br />
-                    <sub><b>W1ttF</b></sub>
+                    <sub><b>gpc123456</b></sub>
                 </a>
             </td>
             <td align="center">

diff --git a/main.py b/main.py
@@ -36,15 +36,15 @@
     logger.add("app.log")
     with gr.Blocks(head=short_js, css=custom_css) as demo:
         gr.Markdown(header)
-        with gr.Tab("配置"):
+        with gr.Tab("生成配置"):
             setting_tab()
-        with gr.Tab("抢票"):
+        with gr.Tab("操作抢票"):
             go_tab()
-        with gr.Tab("训练你的验证码速度"):
+        with gr.Tab("过码测试"):
             train_tab()
         with gr.Tab("登录管理"):
             login_tab()
-        with gr.Tab("常见问题"):
+        with gr.Tab("项目说明"):
             problems_tab()
 
 

diff --git a/tab/go.py b/tab/go.py
@@ -60,7 +60,7 @@ def go_tab():
 > - 程序能保证用最快的速度发送订单请求，但是不保证这一次订单请求能够成功。所以不要完全依靠程序
 > - 现在各个平台抢票和秒杀机制都是进抽签池抽签，网速快发请求多快在拥挤的时候基本上没有效果
 > 此时就要看你有没有足够的设备和账号来提高中签率
-> - 欢迎前往[discussions](https://github.com/mikumifa/biliTickerBuy/discussions) 分享你的经验
+> - 欢迎前往 [discussions](https://github.com/mikumifa/biliTickerBuy/discussions) 分享你的经验
 """)
     with gr.Column():
         gr.Markdown(
@@ -622,9 +622,9 @@ def inner_request():
                     if pushplusToken is not None and pushplusToken != "":
                         PushPlusUtil.send_message(pushplusToken, "抢票成功", "前往订单中心付款吧")
 
-                    serverchanToken = configDB.get("serverchanToken")
-                    if serverchanToken is not None and serverchanToken != "":
-                        ServerChanUtil.send_message(serverchanToken, "抢票成功", "前往订单中心付款吧")
+                    serverchanKey = configDB.get("serverchanKey")
+                    if serverchanKey is not None and serverchanKey != "":
+                        ServerChanUtil.send_message(serverchanKey, "抢票成功", "前往订单中心付款吧")
 
                     if audio_path is not None and audio_path != "":
                         def play_sound_in_loop(file_path):

diff --git a/tab/login.py b/tab/login.py
@@ -16,7 +16,7 @@ def login_tab():
 > 1. 去更改账号，
 > 2. 查看当前程序正在使用哪个账号
 > 3. 使用配置文件切换到另一个账号
->
+> 4. 配置抢票成功的提醒功能
 """)
     with gr.Row():
         username_ui = gr.Text(
@@ -69,31 +69,30 @@ def add():
             inputs=None,
             outputs=[info_ui, username_ui, gr_file_ui]
         )
-    gr.Markdown("""
-        > **微信消息推送功能如何添加**
-        > [Server酱](https://sct.ftqq.com/) 和 [pushplus](https://www.pushplus.plus/)
-        > 等哪个哥们有空写个wiki
-        > 留空则表示不使用提醒功能
-        > 关闭直接删除token即可
-                
+    gr.Markdown(
+        """
+        🗨️ 抢票成功提醒
+        > 你需要去对应的网站获取key或token，然后填入下面的输入框  
+        > [Server酱](https://sct.ftqq.com/sendkey) | [pushplus](https://www.pushplus.plus/uc.html)  
+        > 留空以不启用提醒功能  
         """)
     with gr.Row():
         serverchan_ui = gr.Textbox(
-            value=configDB.get("serverchanToken") if configDB.get("serverchanToken") is not None else "",
-            label="Server酱的Token",
+            value=configDB.get("serverchanKey") if configDB.get("serverchanKey") is not None else "",
+            label="Server酱的SendKey",
             interactive=True,
-            info="[https://sct.ftqq.com/](https://sct.ftqq.com/)",
+            info="https://sct.ftqq.com/",
         )
 
         pushplus_ui = gr.Textbox(
             value=configDB.get("pushplusToken") if configDB.get("pushplusToken") is not None else "",
-            label="pushplus的Token",
+            label="PushPlus的Token",
             interactive=True,
-            info="[https://www.pushplus.plus/](https://www.pushplus.plus/)",
+            info="https://www.pushplus.plus/",
         )
 
         def inner_input_serverchan(x):
-            return configDB.insert("serverchanToken", x)        
+            return configDB.insert("serverchanKey", x)        
         def inner_input_pushplus(x):
             return configDB.insert("pushplusToken", x)
 

diff --git a/tab/problems.py b/tab/problems.py
@@ -3,8 +3,11 @@
 
 def problems_tab():
     gr.Markdown("""
-
-本项目使用说明书 [使用说明书](https://github.com/mikumifa/biliTickerBuy/wiki/%E6%8A%A2%E7%A5%A8%E8%AF%B4%E6%98%8E)
-
-本项目的提问专区 [提问专区](https://github.com/mikumifa/biliTickerBuy/discussions)
-""")
+- **项目地址**：[mikumifa/biliTickerBuy](https://github.com/mikumifa/biliTickerBuy)
+- **讨论区**：[Discussions](https://github.com/mikumifa/biliTickerBuy/discussions)
+- **问题反馈**：[Issues](https://github.com/mikumifa/biliTickerBuy/issues)
+  - [漏洞反馈](https://github.com/mikumifa/biliTickerBuy/issues/new?assignees=&labels=bug%3F&projects=&template=bug-report.yml&title=%5BBug%5D%3A+)
+  - [需求建议](https://github.com/mikumifa/biliTickerBuy/issues/new?assignees=&labels=enhancement&projects=&template=feature-request.yml&title=%5BFeature%5D%3A+)
+- **文档**：[Wiki](https://github.com/mikumifa/biliTickerBuy/wiki)
+  - [抢票说明书](https://github.com/mikumifa/biliTickerBuy/wiki/%E6%8A%A2%E7%A5%A8%E8%AF%B4%E6%98%8E)
+    """)
diff --git a/util/PushPlusUtil.py b/util/PushPlusUtil.py
@@ -22,7 +22,7 @@ def send_message(token, content, title):
         }
         requests.post(url, headers=headers, data=json.dumps(data))
     except Exception as e:
-        loguru.logger.info("pushplus消息发送失败")
+        loguru.logger.info("PushPlus消息发送失败")