Merge pull request #5 from stark666/dev

merge fron Dev

.github/workflows/main.yml

@@ -6,7 +6,7 @@ name: "GitHub Actions SMZDM Bot"
 # events but only for the main branch
 on:
   push:
-    branches: [ main ]
+    # branches: [ main ]
   pull_request:
     branches: [ main ]
   schedule:
@@ -38,4 +38,4 @@ jobs:
         env:
           COOKIES: ${{ secrets.SMZDM_COOKIE }}
           SERVERCHAN_SECRETKEY: ${{ secrets.SERVERCHAN_SECRETKEY }}
-        run: python main.py >SMZDM_Bot.log
+        run: python main.py #>SMZDM_Bot.log

README.md

@@ -4,7 +4,7 @@
 <p align="center">
     <img src="https://img.shields.io/badge/Created on-2020.10-green"/>
     <img src="https://img.shields.io/badge/Python-3.7-blue"/>
-    <img src="https://img.shields.io/badge/Last commit-October-yellow"/>
+    <img src="https://img.shields.io/badge/Last commit-Dec.-yellow"/>
     <img src="https://img.shields.io/badge/Repo size-35.8kb-red"/>
 </p>
 
@@ -35,7 +35,12 @@
 
 
 # N. Log
-不清楚Cookie需多久更新一次，目前已连续正常签到25天
+在没有更换`SMZDM_COOKIE`的情况下，截至2020-12-12, 我的账号已正常签到68天，具体`SMZDM_COOKIE`有效时间继续验证。  
+<img src="pics/log_20201212.jpg" width="300" height="200" alt="签到截图" div align=center /><br/>
 
 + 2020-10-08  
 first push
+
++ 2020-12-12  
+修复如果没有填写`SERVERCHAN_SECRETKEY`，会在正常签到后报错的问题。  
+现在没有`SERVERCHAN_SECRETKEY`也可以正常签到并不报错。

main.py

@@ -53,10 +53,14 @@ def checkin(self):
     sb = SMZDM_Bot()
     # sb.load_cookie_str(config.TEST_COOKIE)
     cookies = os.environ["COOKIES"]
-    SERVERCHAN_SECRETKEY = os.environ["SERVERCHAN_SECRETKEY"]
     sb.load_cookie_str(cookies)
     res = sb.checkin()
     print(res)
-    push_to_wechat(text = '什么值得买每日签到',
-                    desp = str(res),
-                    secretKey = SERVERCHAN_SECRETKEY)
+    SERVERCHAN_SECRETKEY = os.environ["SERVERCHAN_SECRETKEY"]
+    print('sc_key: ', SERVERCHAN_SECRETKEY)
+    if isinstance(SERVERCHAN_SECRETKEY,str) and len(SERVERCHAN_SECRETKEY)>0:
+        print('检测到 SCKEY， 准备推送')
+        push_to_wechat(text = '什么值得买每日签到',
+                        desp = str(res),
+                        secretKey = SERVERCHAN_SECRETKEY)
+    print('代码完毕')