diff --git a/.vscode/settings.json b/.vscode/settings.json index 6b8fa15..a07a049 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,5 +9,7 @@ "editor.formatOnSave": true, "editor.rulers": [ 120 - ] + ], + "editor.bracketPairColorization.enabled": true, + "editor.guides.bracketPairs": "active" } diff --git a/develop_requirements.txt b/develop_requirements.txt index 89452a9..c71d62c 100644 --- a/develop_requirements.txt +++ b/develop_requirements.txt @@ -31,3 +31,4 @@ user-agents==2.2.0 wcwidth==0.2.5 zipp==3.5.0 redis==4.1.0 +black diff --git a/scripts/dodo.py b/scripts/dodo.py index b3628a5..13eb0cf 100644 --- a/scripts/dodo.py +++ b/scripts/dodo.py @@ -224,6 +224,11 @@ class RequestHandler(BaseHTTPRequestHandler): subprocess.call("/root/deploy/dsite_prepare.sh") subprocess.run(["supervisorctl", "restart", "dsite"]) self.msg_compoment(access_token, open_id, 'πŸŽ‰ %s ιƒ¨η½²ζˆεŠŸ πŸŽ‰' % site_) + if site_ == 'dodo': + self.msg_compoment(access_token, open_id, '🚧 %s 开始部署 🚧' % site_) + subprocess.run(["git", "pull"]) + subprocess.run(["supervisorctl", "restart", "dodo"]) + self.msg_compoment(access_token, open_id, 'πŸŽ‰ %s ιƒ¨η½²ζˆεŠŸ πŸŽ‰' % site_) else: self.msg_compoment(access_token, open_id, '⚠️ %s 不存在 ⚠️' % site_) elif orig_text.startswith('/菜谱 '):