From 917a3edb7f026f2f5d5243d224218cc42db717c4 Mon Sep 17 00:00:00 2001
From: a76yyyy <q981331502@163.com>
Date: Mon, 15 Nov 2021 20:52:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0ReadMe=E5=92=8C=E7=89=88?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                         | 20 ++++++++++++++------
 version.json                      |  2 +-
 web/tpl/about.html                |  2 +-
 web/tpl/har/editor.html           |  2 +-
 web/tpl/index.html                |  2 +-
 web/tpl/password_reset.html       |  2 +-
 web/tpl/password_reset_email.html |  2 +-
 web/tpl/register.html             |  2 +-
 web/tpl/task_new.html             |  2 +-
 web/tpl/utils.html                |  2 +-
 10 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 8b90674d3cc..a6fc14a3385 100644
--- a/README.md
+++ b/README.md
@@ -211,6 +211,14 @@ sh /usr/src/app/update.sh # 先进入容器后台, 执行命令后重启进程
 
 更新日志
 ===========
+
+## 2021.11.15 更新
+1. 编辑任务时变量默认值为前值(by billypon)
+2. 修复编辑任务时无法识别模板的新变量(by billypon)
+3. 编辑任务逻辑优化(by billypon)
+4. 修改备注长度
+5. 修复更新错误后无法停止的bug
+
 ## 2021.11.02 更新
 1. 修复前端无正则匹配显示结果
 2. 修复工具箱-记事本
@@ -218,6 +226,12 @@ sh /usr/src/app/update.sh # 先进入容器后台, 执行命令后重启进程
 4. 加减乘除实现多组数据计算 fix qiandao-today/qiandao#136
 5. 第一个用户默认为管理员，在config.py中设置或修改环境变量USER0ISADMIN (by [AragonSnow](https://github.com/qiandao-today/qiandao/commits?author=AragonSnow))
 
+<details>
+
+<summary>
+历史更新日志
+</summary>
+
 ## 2021.10.23 更新
 1. CRON添加随机延时 (by [acooler15](https://github.com/qiandao-today/qiandao/commits?author=acooler15))
 2. 优化签到日志显示信息
@@ -227,12 +241,6 @@ sh /usr/src/app/update.sh # 先进入容器后台, 执行命令后重启进程
 6. 修复无法将签到任务的重试次数设为0
 7. 修复UnboundLocalError
 
-<details>
-
-<summary>
-历史更新日志
-</summary>
-
 ## 2021.10.17 更新
 1. 修复请求测试按钮绑定事件失效的bug
 2. 多任务操作时显示优化
diff --git a/version.json b/version.json
index 4049b6f7170..543f0369c91 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-    "version": 20211102,
+    "version": 20211115,
     "Repo": ["https://github.com/a76yyyy/qiandao", "https://github.com/AragonSnow/qiandao", "https://github.com/binux/qiandao"],
     "Author&Collaborator": ["a76yyyy", "AragonSnow", "binux", "acooler15", "billypon", "liubei121212", "gxitm", "戏如人生", "buzhibujuelb", "powersee", "cxk000"],
     "Theme": {
diff --git a/web/tpl/about.html b/web/tpl/about.html
index 9137dec6ae3..f4907523b8a 100644
--- a/web/tpl/about.html
+++ b/web/tpl/about.html
@@ -80,7 +80,7 @@
 
 <header>
 <div class="container">
-  <h2 class="text-center">私有签到框架<sup>20211102</sup></h2>
+  <h2 class="text-center">私有签到框架<sup>20211115</sup></h2>
   <div class="buttons">
     <a href="/" class="btn btn-default pull-left">首页</a>
     <a href="/about/" class="btn btn-default pull-left">常用API/过滤器</a>
diff --git a/web/tpl/har/editor.html b/web/tpl/har/editor.html
index 350216fd00b..049260bb44b 100644
--- a/web/tpl/har/editor.html
+++ b/web/tpl/har/editor.html
@@ -29,7 +29,7 @@
   <div class="row" ng-controller="EntryList">
     <div class="col-md-3" id="editor-switch">
       <a class="h1-index" href="/">
-        <h1 class="text-center">签到<sup>20211102</sup></h1>
+        <h1 class="text-center">签到<sup>20211115</sup></h1>
       </a>
       
       <!--checked switch-->
diff --git a/web/tpl/index.html b/web/tpl/index.html
index 028bd985981..451f49d1e80 100644
--- a/web/tpl/index.html
+++ b/web/tpl/index.html
@@ -11,7 +11,7 @@
     <a href="/login" class="btn btn-default">登录</a>
   </div>
   <form>
-    <h2 class="text-center">私有签到框架<sup>20211102</sup></h2>
+    <h2 class="text-center">私有签到框架<sup>20211115</sup></h2>
     <hr><br>
     <div class="form-group" id="site-select-div">
       <label class="control-label" for="site-select">
diff --git a/web/tpl/password_reset.html b/web/tpl/password_reset.html
index 6a01b755b64..f936e235c82 100644
--- a/web/tpl/password_reset.html
+++ b/web/tpl/password_reset.html
@@ -10,7 +10,7 @@
 {% block body %}
 <div class="container">
   <form method="POST">
-    <h1>签到<sup>20211102</sup></h1>
+    <h1>签到<sup>20211115</sup></h1>
     <p class="alert alert-info">密码重置</p>
     <div class="form-group {{ 'has-error' if password_error }}">
       <label for="password">密码</label>
diff --git a/web/tpl/password_reset_email.html b/web/tpl/password_reset_email.html
index 125ff129476..308b5f0429b 100644
--- a/web/tpl/password_reset_email.html
+++ b/web/tpl/password_reset_email.html
@@ -10,7 +10,7 @@
 {% block body %}
 <div class="container">
   <form method="POST">
-    <h2>签到<sup>20211102</sup></h2>
+    <h2>签到<sup>20211115</sup></h2>
     <p class="alert alert-info">密码重置</p>
     <div class="form-group {{ 'has-error' if email_error }}">
       <label class="control-label" for="email">Email 地址</label>
diff --git a/web/tpl/register.html b/web/tpl/register.html
index 3a09a5bcd37..1fe1439afd1 100644
--- a/web/tpl/register.html
+++ b/web/tpl/register.html
@@ -10,7 +10,7 @@
 {% block body %}
 <div class="container">
   <form method="POST">
-    <h2 class="text-center">私有签到框架<sup>20211102</sup></h2>
+    <h2 class="text-center">私有签到框架<sup>20211115</sup></h2>
 	<hr>
     {% block reg %}<p class="alert alert-info">注册签到 (欢迎注册私有签到服务)</p>{% endblock %}
     <div class="form-group {{ 'has-error' if email_error }}">
diff --git a/web/tpl/task_new.html b/web/tpl/task_new.html
index c6417910391..ad89b13cb95 100644
--- a/web/tpl/task_new.html
+++ b/web/tpl/task_new.html
@@ -1,6 +1,6 @@
 {% import "utils.html" as utils %}
 <form method="POST" action="/task/{{ '%s/edit' % task.id if task else 'new' }}">
-  <h2 class="text-center">私有签到框架<sup>20211102</sup></h2>
+  <h2 class="text-center">私有签到框架<sup>20211115</sup></h2>
   <hr>
   {% if task.disabled %}
   <p class="alert alert-danger">任务处于禁用状态，使用 <a data-load-method="POST" class="modal_load alert-link" href="/task/{{ task.id }}/run">立即执行</a> 成功签到一次，即可解除。</p>
diff --git a/web/tpl/utils.html b/web/tpl/utils.html
index acd893c7dbd..6e4fec898d3 100644
--- a/web/tpl/utils.html
+++ b/web/tpl/utils.html
@@ -1,7 +1,7 @@
 {% macro header(current_user=True) %}
 <header>
   <div class="container">
-    <h2 class="text-center">私有签到框架<sup>20211102</sup></h2>
+    <h2 class="text-center">私有签到框架<sup>20211115</sup></h2>
     <div class="buttons">
       <a href="/" class="btn btn-default pull-left">首页</a>
       <a href="/about/" class="btn btn-default pull-left">常用API/过滤器</a>