Merge pull request #55 from Promix953/main

修复Runtime error & 提高Docker镜像稳定性
This commit is contained in:
johlanse 2022-08-13 11:32:59 +08:00 committed by GitHub
commit 379cd00788
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 132 additions and 128 deletions

View File

@ -1,20 +1,22 @@
FROM debian:bullseye-slim FROM ubuntu:jammy
ARG DEBIAN_FRONTEND=noninteractive
ARG TARGETARCH ARG TARGETARCH
ARG TZ="Asia/Shanghai"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime && \
echo 'Asia/Shanghai' >/etc/timezone && \ echo ${TZ} > /etc/timezone && \
apt-get -qq update && \ apt-get -qq update && \
apt-get -qq install -y --no-install-recommends ca-certificates curl && \ apt-get -qq install -y --no-install-recommends ca-certificates libglib2.0-0 libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 libcups2 libdrm2 \
apt-get install -y libx11-6 libgbm1 libasound2 libcairo2 libxshmfence1 libatspi2.0-0 libpango-1.0-0 libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libxrandr2 libxfixes3 libxdamage1 libxcomposite1 libxkbcommon0 && \ libdbus-1-3 libexpat1 libxcb1 libxkbcommon0 libx11-6 libxcomposite1 libxdamage1 libxext6 libxfixes3 libxrandr2 libgbm1 libpango-1.0-0 \
apt-get clean && \ libcairo2 libasound2 libatspi2.0-0 && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
mkdir /opt/config/ mkdir /opt/config/
COPY ./dist/docker_linux_$TARGETARCH*/study_xxqg /opt/study_xxqg
COPY conf/config_default.yml /opt/config/config.yml COPY conf/config_default.yml /opt/config/config.yml
COPY ./dist/docker_linux_$TARGETARCH*/study_xxqg /opt/study_xxqg
RUN chmod -R 777 /opt/study_xxqg && \ RUN chmod -R 777 /opt/study_xxqg && \
cd /opt/ && \ cd /opt/ && \
./study_xxqg --init ./study_xxqg --init

View File

@ -285,6 +285,7 @@ func (c *Core) RespondDaily(user *model.User, model string) {
return return
} }
if category != nil {
_ = category.WaitForElementState(`visible`) _ = category.WaitForElementState(`visible`)
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
@ -425,6 +426,7 @@ func (c *Core) RespondDaily(user *model.User, model string) {
return return
} }
} }
}
score, _ = GetUserScore(user.ToCookies()) score, _ = GetUserScore(user.ToCookies())
} }
} }