From 556f5380eb6668188a83bd85a7b848ff131ef1b5 Mon Sep 17 00:00:00 2001
From: Easy <easychen@qq.com>
Date: Tue, 20 Aug 2024 15:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0server=E9=85=B1=E5=9F=9F?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 serverchan/config.json.js                                | 6 +++---
 serverchan/serverchan/scripts/serverchan_check.sh        | 2 +-
 serverchan/serverchan/scripts/serverchan_dhcp_trigger.sh | 2 +-
 serverchan/serverchan/scripts/serverchan_ifup_trigger.sh | 2 +-
 serverchan/serverchan/version                            | 2 +-
 serverchan/serverchan/webs/Module_serverchan.asp         | 8 ++++----
 serverchan/version                                       | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/serverchan/config.json.js b/serverchan/config.json.js
index 2bdb74bc..d9f9d6dd 100644
--- a/serverchan/config.json.js
+++ b/serverchan/config.json.js
@@ -1,6 +1,6 @@
 {
-"version":"1.4.1",
-"md5":"1a31029f482273a8ead2102084228d4d",
+"version":"1.4.2",
+"md5":"97ff331c7aa458e87a27a1755ba06331",
 "home_url":"Module_serverchan.asp",
 "title":"serverChan微信推送",
 "description":"从路由器推送状态及通知的工具",
@@ -8,5 +8,5 @@
 "author":"clang",
 "link":"",
 "changelog":"",
-"build_date":"2021-08-20_22:31:26"
+"build_date":"2024-08-20_15:55:36"
 }
diff --git a/serverchan/serverchan/scripts/serverchan_check.sh b/serverchan/serverchan/scripts/serverchan_check.sh
index 5ef57b0d..3690b631 100755
--- a/serverchan/serverchan/scripts/serverchan_check.sh
+++ b/serverchan/serverchan/scripts/serverchan_check.sh
@@ -463,7 +463,7 @@ serverchan_send_content=$(cat ${serverchan_info_text})
 sckey_nu=$(dbus list serverchan_config_sckey | sort -n -t "_" -k 4 | cut -d "=" -f 1 | cut -d "_" -f 4)
 for nu in ${sckey_nu}; do
     serverchan_config_sckey=$(dbus get serverchan_config_sckey_${nu})
-    url="https://sc.ftqq.com/${serverchan_config_sckey}.send"
+    url="https://sctapi.ftqq.com/${serverchan_config_sckey}.send"
     result=$(wget --no-check-certificate --post-data "text=${serverchan_send_title}&desp=${serverchan_send_content}" -qO- ${url})
     if [ -n $(echo $result | grep "success") ]; then
         [ "${serverchan_info_logger}" == "1" ] && logger "[ServerChan]: 路由器状态信息推送到 SCKEY No.${nu} 成功！"
diff --git a/serverchan/serverchan/scripts/serverchan_dhcp_trigger.sh b/serverchan/serverchan/scripts/serverchan_dhcp_trigger.sh
index d1eeaa3a..5d69e842 100755
--- a/serverchan/serverchan/scripts/serverchan_dhcp_trigger.sh
+++ b/serverchan/serverchan/scripts/serverchan_dhcp_trigger.sh
@@ -142,7 +142,7 @@ serverchan_send_content=$(cat ${serverchan_lease_text})
 sckey_nu=$(dbus list serverchan_config_sckey | sort -n -t "_" -k 4 | cut -d "=" -f 1 | cut -d "_" -f 4)
 for nu in ${sckey_nu}; do
     serverchan_config_sckey=$(dbus get serverchan_config_sckey_${nu})
-    url="https://sc.ftqq.com/${serverchan_config_sckey}.send"
+    url="https://sctapi.ftqq.com/${serverchan_config_sckey}.send"
     result=$(wget --no-check-certificate --post-data "text=${serverchan_send_title}&desp=${serverchan_send_content}" -qO- ${url})
     if [ -n $(echo $result | grep "success") ]; then
         [ "${serverchan_info_logger}" == "1" ] && logger "[ServerChan]: 设备上线信息推送到 SCKEY No.${nu} 成功！！"
diff --git a/serverchan/serverchan/scripts/serverchan_ifup_trigger.sh b/serverchan/serverchan/scripts/serverchan_ifup_trigger.sh
index ac42f312..d58917f9 100755
--- a/serverchan/serverchan/scripts/serverchan_ifup_trigger.sh
+++ b/serverchan/serverchan/scripts/serverchan_ifup_trigger.sh
@@ -83,7 +83,7 @@ serverchan_send_content=$(cat ${serverchan_ifup_text})
 sckey_nu=$(dbus list serverchan_config_sckey | sort -n -t "_" -k 4 | cut -d "=" -f 1 | cut -d "_" -f 4)
 for nu in ${sckey_nu}; do
     serverchan_config_sckey=$(dbus get serverchan_config_sckey_${nu})
-    url="https://sc.ftqq.com/${serverchan_config_sckey}.send"
+    url="https://sctapi.ftqq.com/${serverchan_config_sckey}.send"
     result=$(wget --no-check-certificate --post-data "text=${serverchan_send_title}&desp=${serverchan_send_content}" -qO- ${url})
     if [ -n $(echo $result | grep "success") ]; then
         [ "${serverchan_info_logger}" == "1" ] && logger "[ServerChan]: 网络重启信息推送到 SCKEY No.${nu} 成功！！"
diff --git a/serverchan/serverchan/version b/serverchan/serverchan/version
index 347f5833..9df886c4 100644
--- a/serverchan/serverchan/version
+++ b/serverchan/serverchan/version
@@ -1 +1 @@
-1.4.1
+1.4.2
diff --git a/serverchan/serverchan/webs/Module_serverchan.asp b/serverchan/serverchan/webs/Module_serverchan.asp
index c6e3f224..6d1dfbf9 100644
--- a/serverchan/serverchan/webs/Module_serverchan.asp
+++ b/serverchan/serverchan/webs/Module_serverchan.asp
@@ -567,11 +567,11 @@ function version_show() {
                                     <div style="float:right; width:15px; height:25px;margin-top:10px"><img id="return_btn" onclick="reload_Soft_Center();" align="right" style="cursor:pointer;position:absolute;margin-left:-30px;margin-top:-25px;" title="返回软件中心" src="/images/backprev.png" onMouseOver="this.src='/images/backprevclick.png'" onMouseOut="this.src='/images/backprev.png'"></img></div>
                                     <div style="margin:30px 0 10px 5px;" class="splitLine"></div>
                                     <div class="formfontdesc" id="cmdDesc">
-                                        * 「<a href="http://sc.ftqq.com" target=_blank><i>Server酱</i></a>」，英文名「ServerChan」，是一款「程序员」和「服务器」之间的通信软件。说人话？就是从服务器推报警和日志到手机的工具。<br><br>
+                                        * 「<a href="https://sct.ftqq.com" target=_blank><i>Server酱</i></a>」，英文名「ServerChan」，是一款「程序员」和「服务器」之间的通信软件。说人话？就是从服务器推报警和日志到手机的工具。<br><br>
                                         开通并使用上它，只需要一分钟：<br>
-                                        <i>1. 登录：</i>用GitHub账号<a href="http://sc.ftqq.com/?c=github&a=login" target="_blank"><i>登入网站</i></a>，就能获得一个<a href="http://sc.ftqq.com/?c=code" target="_blank"><i>SCKEY</i></a>（在「<a href="http://sc.ftqq.com/?c=code" target="_blank"><i>发送消息</i></a>」页面）<br>
-                                        <i>2. 绑定：</i>点击「<a href="http://sc.ftqq.com/?c=wechat&a=bind" target="_blank"><i>微信推送</i></a>」，扫码关注同时即可完成绑定<br>
-                                        <i>3. 发消息：</i>将获得到的<a href="http://sc.ftqq.com/?c=code" target="_blank"><i>SCKEY</i></a>填入插件中并勾选相应选项提交即可。<br>
+                                        <i>1. 登录：</i>用微信<a href="https://sct.ftqq.com" target="_blank"><i>登入网站</i></a>，就能获得一个<a href="https://sct.ftqq.com/sendkey" target="_blank"><i>SendKey</i></a>（在「<a href="https://sct.ftqq.com/sendkey" target="_blank"><i>Key&API</i></a>」页面）<br>
+                                        <i>2. 设置消息通道：</i>默认开通服务号通道，其他通道可点击「<a href="https://sct.ftqq.com/forward" target="_blank"><i>通道配置</i></a>」<br>
+                                        <i>3. 发消息：</i>将获得到的<a href="https://sct.ftqq.com/sendkey" target="_blank"><i>SendKey</i></a>填入插件中并勾选相应选项提交即可。<br>
                                     </div>
                                     <table width="100%" border="1" align="center" cellpadding="4" cellspacing="0" bordercolor="#6b8fa3" class="FormTable">
                                         <tr id="switch_tr">
diff --git a/serverchan/version b/serverchan/version
index 271dde00..c2c6a807 100644
--- a/serverchan/version
+++ b/serverchan/version
@@ -1,2 +1,2 @@
-1.4.1
-1a31029f482273a8ead2102084228d4d
+1.4.2
+97ff331c7aa458e87a27a1755ba06331