From b4f6a600cf5b9083eb1464c88f7bf5bd713cd143 Mon Sep 17 00:00:00 2001
From: CodFrm <code.farmer@qq.com>
Date: Sat, 20 Apr 2019 23:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E9=80=81=E6=9C=BA?=
 =?UTF-8?q?=E5=99=A8=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json  |  2 +-
 src/tg-bot.js | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index caa9793..033e266 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cxmooc-tools",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "> 一个快速学习超星慕课的chrome扩展工具(੧ᐛ੭挂科模式,启动)\r > 初次开发chrome扩展,有兴趣的朋友可以一起来哦",
   "main": "mooc.js",
   "scripts": {
diff --git a/src/tg-bot.js b/src/tg-bot.js
index 4d12b60..008fb5b 100644
--- a/src/tg-bot.js
+++ b/src/tg-bot.js
@@ -14,15 +14,20 @@ const tgBot = new TelegramBot(botToken, { polling: false });
 let lastTag = '';
 if (branch == tag) {
     //获取上一个tag
-    exec('git describe --tags HEAD^', (err, stdout, stderr) => {
-        lastTag = stdout.toString().match(/([v\.\d]+)-/)[1];
+    exec('git describe --tags HEAD^^', (err, stdout, stderr) => {
+        let match = stdout.toString().match(/([v\.\d]+)-/);
+        lastTag = match[1];
         push();
     });
 } else {
     push();
 }
 function push() {
-    exec('git log --pretty=format:"%s" ' + (branch == tag ? tag + '..' + lastTag : commit_range) + (commit_range.search('.') < 0 ? ' -1' : ''), (err, stdout, stderr) => {
+    let range=commit_range;
+    if (branch == tag) {
+        range = tag + '...' + lastTag;
+    }
+    exec('git log --pretty=format:"%s" ' + range + (range.search('.') < 0 ? ' -1' : ''), (err, stdout, stderr) => {
         let sendText = '';
         let end = '';
         if (branch == tag) {
@@ -37,6 +42,7 @@ function push() {
             sendText += hotUpdate();
         }
         sendText += "更新了以下内容:\n```\n" + stdout + "\n```\n" + end;
+        console.log(sendText);
         tgBot.sendMessage(chat_id, sendText, { parse_mode: 'Markdown' });
         tgBot.sendDocument(chat_id, fs.createReadStream('build/cxmooc-tools.crx'));
     });
-- 
GitLab