From 263dd61ba0a14e576ad2a685656d157755a5f8b9 Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:08:24 +0800
Subject: [PATCH 01/13] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d0cdafe6..8b137891 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-# 女朋友专属公众号
+

From 24a929c5e3df4005ca700675e462c32533fbc909 Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:14:15 +0800
Subject: [PATCH 02/13] Update config.conf

---
 config.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.conf b/config.conf
index a203e591..203eb578 100644
--- a/config.conf
+++ b/config.conf
@@ -1,14 +1,14 @@
 [info]
 #开始在一起的日期，格式参考 2022-06-24
-start_date=2022-06-24
+start_date=2018-06-08
 #你女朋友所在的城市，写城市名或省份名或者所在的区  如 "云南"或者"昆明"或者"五华区"
-city1=昆明
+city1=茶陵
 #你女朋友的家乡，写城市名或省份名或者所在的区  如 "云南"或者"昆明"或者"五华区"
-city2=腾冲
+city2=茶陵
 #你女朋友的生日，注意格式只写*月*日 如："07-21"
-birthday_lover=07-21
+birthday_lover=05-28
 #你的生日,注意格式只写*月*日 如："07-21"
-birthday_my=05-04
+birthday_my=11-17
 #以下为微信测试号的参数，在申请时会显示
 app_id=wxbc471cb
 app_secret=c4149ff570

From 1c841f94981ae2bfcc9c80425a283a5b74e3b753 Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:14:58 +0800
Subject: [PATCH 03/13] Update config.conf

---
 config.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.conf b/config.conf
index 203eb578..f90a3247 100644
--- a/config.conf
+++ b/config.conf
@@ -10,8 +10,8 @@ birthday_lover=05-28
 #你的生日,注意格式只写*月*日 如："07-21"
 birthday_my=11-17
 #以下为微信测试号的参数，在申请时会显示
-app_id=wxbc471cb
-app_secret=c4149ff570
+app_id=wx988d424668e5472d
+app_secret=201fdc67759ff7b50d56bb916210cbe1
 #消息模板ID，在微信测试号中添加模板会自动生成ID
 template_id=o_H3x859-mrYPv2ynphC
 #接收消息的用户ID，让你的女朋友扫微信测试号的二维码，获取微信用户ID

From cf60e700a84b3d485b20464382d6f206b40e8f67 Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:18:15 +0800
Subject: [PATCH 04/13] Update tmp.txt

---
 tmp.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tmp.txt b/tmp.txt
index 9c86185e..b7923e94 100644
--- a/tmp.txt
+++ b/tmp.txt
@@ -8,10 +8,10 @@
 今日天气：{{weather1.DATA}}
 当前温度：{{temperature1.DATA}}
 {{sid.DATA}}
-距离领导的生日还有{{birthday_lover.DATA}}天
+在一起的第{{birthday_lover.DATA}}天
 距离秘书的生日还有{{birthday_my.DATA}}天
 距离元旦还有{{yd.DATA}}天
 距离春节还有{{cj.DATA}}天
 ===家乡:{{city2.DATA}} 天气:{{weather2.DATA}}===
 今日评分最高电影：{{mv.DATA}}
-每日一句：{{words.DATA}}
\ No newline at end of file
+每日一句：{{words.DATA}}

From 621d811210f60217a8ed8a623c6ea1b4340ebb74 Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:24:49 +0800
Subject: [PATCH 05/13] Update tmp.txt

---
 tmp.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tmp.txt b/tmp.txt
index b7923e94..5a0161bc 100644
--- a/tmp.txt
+++ b/tmp.txt
@@ -8,10 +8,7 @@
 今日天气：{{weather1.DATA}}
 当前温度：{{temperature1.DATA}}
 {{sid.DATA}}
-在一起的第{{birthday_lover.DATA}}天
-距离秘书的生日还有{{birthday_my.DATA}}天
+在一起的第{{start_date.DATA}}天
 距离元旦还有{{yd.DATA}}天
 距离春节还有{{cj.DATA}}天
-===家乡:{{city2.DATA}} 天气:{{weather2.DATA}}===
 今日评分最高电影：{{mv.DATA}}
-每日一句：{{words.DATA}}

From 6edc1cac4b92915caaf75024ef9e7c35ede6036c Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:30:23 +0800
Subject: [PATCH 06/13] Update config.conf

---
 config.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.conf b/config.conf
index f90a3247..02b95d89 100644
--- a/config.conf
+++ b/config.conf
@@ -13,9 +13,9 @@ birthday_my=11-17
 app_id=wx988d424668e5472d
 app_secret=201fdc67759ff7b50d56bb916210cbe1
 #消息模板ID，在微信测试号中添加模板会自动生成ID
-template_id=o_H3x859-mrYPv2ynphC
+template_id=roOZzH_3W6jOj4_tKDrHw6qUpVjKQTGr57cZ9-mU578
 #接收消息的用户ID，让你的女朋友扫微信测试号的二维码，获取微信用户ID
-user_id=oB3
+user_id=oycEm6KUQVWto5EWwy9jpMTcl5fs
 #如有多个女朋友或者女朋友有多个微信，请使用以下格式,","隔开
 #user_id=****,***,*****
 

From b43df3110350d65c3acea189f1250e7d65c735af Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:32:10 +0800
Subject: [PATCH 07/13] Create python-app1.yml

---
 .github/workflows/python-app1.yml | 39 +++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 .github/workflows/python-app1.yml

diff --git a/.github/workflows/python-app1.yml b/.github/workflows/python-app1.yml
new file mode 100644
index 00000000..143acc90
--- /dev/null
+++ b/.github/workflows/python-app1.yml
@@ -0,0 +1,39 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python application
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

From dffb9648ecf6f505f4237a503896ba335f44f61b Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:32:23 +0800
Subject: [PATCH 08/13] Delete python-app.yml

---
 .github/workflows/python-app.yml | 41 --------------------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 .github/workflows/python-app.yml

diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
deleted file mode 100644
index ce40b93a..00000000
--- a/.github/workflows/python-app.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Python application
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-  schedule:
-    - cron: 0 */3 * * * 
-  
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.8"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
-      run: python main.py

From de8819c538c36b22a53b0703bfcbe0d05220d8e2 Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 17:21:13 +0800
Subject: [PATCH 09/13] Create python-app2.yml

---
 .github/workflows/python-app2.yml | 39 +++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 .github/workflows/python-app2.yml

diff --git a/.github/workflows/python-app2.yml b/.github/workflows/python-app2.yml
new file mode 100644
index 00000000..143acc90
--- /dev/null
+++ b/.github/workflows/python-app2.yml
@@ -0,0 +1,39 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python application
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

From 6421590915e844566fd3811b690f9d189377f52e Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 17:21:25 +0800
Subject: [PATCH 10/13] Delete python-app1.yml

---
 .github/workflows/python-app1.yml | 39 -------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 .github/workflows/python-app1.yml

diff --git a/.github/workflows/python-app1.yml b/.github/workflows/python-app1.yml
deleted file mode 100644
index 143acc90..00000000
--- a/.github/workflows/python-app1.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Python application
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
-      run: |
-        pytest

From a92d800d15813e69bbe5cb50d26975322da31ac0 Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 17:41:08 +0800
Subject: [PATCH 11/13] Update config.conf

---
 config.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.conf b/config.conf
index 02b95d89..ef8888b3 100644
--- a/config.conf
+++ b/config.conf
@@ -2,9 +2,9 @@
 #开始在一起的日期，格式参考 2022-06-24
 start_date=2018-06-08
 #你女朋友所在的城市，写城市名或省份名或者所在的区  如 "云南"或者"昆明"或者"五华区"
-city1=茶陵
+city1=株洲
 #你女朋友的家乡，写城市名或省份名或者所在的区  如 "云南"或者"昆明"或者"五华区"
-city2=茶陵
+city2=株洲
 #你女朋友的生日，注意格式只写*月*日 如："07-21"
 birthday_lover=05-28
 #你的生日,注意格式只写*月*日 如："07-21"

From 4e42b616588d1d813794765a09ac9867aa73b58c Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 17:44:20 +0800
Subject: [PATCH 12/13] Create python-app1.yml

---
 .github/workflows/python-app1.yml | 39 +++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 .github/workflows/python-app1.yml

diff --git a/.github/workflows/python-app1.yml b/.github/workflows/python-app1.yml
new file mode 100644
index 00000000..143acc90
--- /dev/null
+++ b/.github/workflows/python-app1.yml
@@ -0,0 +1,39 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python application
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

From 502bac1b3eeb436f3c911a25d3389c8ea2a2a650 Mon Sep 17 00:00:00 2001
From: Loyalty0608 <74441341+Loyalty0608@users.noreply.github.com>
Date: Fri, 9 Sep 2022 17:45:28 +0800
Subject: [PATCH 13/13] Delete python-app2.yml

---
 .github/workflows/python-app2.yml | 39 -------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 .github/workflows/python-app2.yml

diff --git a/.github/workflows/python-app2.yml b/.github/workflows/python-app2.yml
deleted file mode 100644
index 143acc90..00000000
--- a/.github/workflows/python-app2.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Python application
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    - name: Lint with flake8
-      run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
-      run: |
-        pytest