Merge branch 'master' into dev

.github/ISSUE_TEMPLATE/bug-report----问题反馈.md

@@ -0,0 +1,35 @@
+---
+name: Bug report  | 问题反馈
+about: Tell us what problems you have encountered
+title: "[BUG]"
+labels: ''
+assignees: ''
+
+---
+
+The V2Board version number you are using
+当前使用的V2Board版本号
+--------
+
+
+Briefly describe the problem you are experiencing
+简单描述你遇到的问题
+--------
+
+
+
+Screenshot of the reported error(Please do desensitization)
+报告错误的截图（请做脱敏处理）
+--------
+
+
+
+Screenshot of the reported error(Please do desensitization)
+报告错误的截图（请做脱敏处理）
+--------
+
+
+
+The latest log files in the storage/logs directory report from #1 (Please do desensitization)
+storage/logs 目录下最新的日志文件从 #1 开始报告（请做脱敏处理）
+--------

.github/ISSUE_TEMPLATE/feature-request---功能请求.md

@@ -0,0 +1,11 @@
+---
+name: Feature request | 功能请求
+about: Tell us what you need
+title: "[Feature request]"
+labels: ''
+assignees: ''
+
+---
+
+Please describe in detail the problems or needs you have encountered.
+请详细描述你遇到的问题或需求。

app/Http/Controllers/Client/Protocols/Surge.php

@@ -66,6 +66,7 @@ class Surge
         // Subscription link
         $subsURL = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
         $subsDomain = $_SERVER['SERVER_NAME'];
+        $subsURL = 'https://' . $subsDomain . '/api/v1/client/subscribe?token=' . $user['token'];
 
         $config = str_replace('$subs_link', $subsURL, $config);
         $config = str_replace('$subs_domain', $subsDomain, $config);