Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
FHU-yezi committed Jun 10, 2022
2 parents b64e951 + 45e00b2 commit 7605ea2
Show file tree
Hide file tree
Showing 7 changed files with 1,128 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@
*.pyc
*.otf
__pycache__/
config.yaml
poetry.lock
config.yaml
2 changes: 1 addition & 1 deletion config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 1.4.2
version: 1.4.3
port: 8602
mainpage_footer: 'Made with <a href="https://github.com/FHU-yezi/JianshuResearchTools/" style="color: #0056B3">JRT</a>, <a href="https://github.com/pywebio/PyWebIO" style="color: #0056B3">PyWebIO</a> and ♥'
service_pages_footer: 'Powered By <a href="https://github.com/FHU-yezi/JianshuResearchTools/" style="color: #0056B3">JRT</a> and <a href="https://github.com/pywebio/PyWebIO" style="color: #0056B3">PyWebIO</a>'
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
main:
image: jianshumicrofeatures:1.4.2
image: jianshumicrofeatures:1.4.3
build: .
ports:
- "8602:8602"
Expand All @@ -16,4 +16,4 @@ services:
condition: on-failure
delay: 5s
max_attempts: 3
stop_grace_period: 1s
stop_grace_period: 1s
2 changes: 1 addition & 1 deletion modules/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def GetUrl():
"""
获取当前 URL
"""
return eval_js("window.location.href")
return eval_js("window.location.href").split("/")[0]


def TimeDeltaFormat(td_object):
Expand Down
Loading

0 comments on commit 7605ea2

Please sign in to comment.