diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index ed61b64..ac9a671 --- a/.gitignore +++ b/.gitignore @@ -130,3 +130,6 @@ dmypy.json # Cookie File cookie.json + +# Log +log/ diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 4480660..5dfbfec --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ 2023.3.9 更新 添加启动时自动更新上游包。 +2023.3.13 更新 修复权限问题。 + ## 前提准备 - 搭建一个可以运行的koshi服务器 @@ -51,7 +53,7 @@ # **docker 搭建 server (推荐)By D-Jy** -[Docker](https://hub.docker.com/r/duan2001/bingchat) 更新时间:2023.3.9 +[Docker](https://hub.docker.com/r/duan2001/bingchat) 更新时间:2023.3.13 ```shell # 新建一个目录 diff --git a/bing.py b/bing.py old mode 100644 new mode 100755 index 2570232..cc3d6ed --- a/bing.py +++ b/bing.py @@ -1,6 +1,3 @@ -import os -os.system(f'pip install --upgrade -r requirements.txt') - from EdgeGPT import Chatbot from fastapi import FastAPI, Body import uvicorn diff --git a/conf/runit/bing.sh b/conf/runit/bing.sh old mode 100644 new mode 100755 index 781560f..f518970 --- a/conf/runit/bing.sh +++ b/conf/runit/bing.sh @@ -1,4 +1,16 @@ #!/bin/sh # `/sbin/setuser www-data` runs the given command as the user `www-data`. cd /srv/openchat || exit -exec /sbin/setuser www-data /srv/openchat/venv/bin/python /srv/openchat/bing.py >> /dev/null 2>&1 + +python3 -m venv venv && \ +. venv/bin/activate && \ +pip3 install -U pip && \ +pip3 install wheel && \ +pip3 install --upgrade -r requirements.txt + +if [ ! -d "/srv/openchat/log/" ];then + exec /srv/openchat/venv/bin/python /srv/openchat/bing.py >> /dev/null 2>&1 +else + exec /srv/openchat/venv/bin/python /srv/openchat/bing.py >> /srv/openchat/log/$(date "+%Y%m%d-%H%M%S").log 2>&1 +fi + diff --git a/debug.py b/debug.py old mode 100644 new mode 100755 diff --git a/requirements.txt b/requirements.txt old mode 100644 new mode 100755