diff --git a/app-dm/src/TeacherPages/TestManage/Test.jsx b/app-dm/src/TeacherPages/TestManage/Test.jsx
index bf6ed27..3860368 100644
--- a/app-dm/src/TeacherPages/TestManage/Test.jsx
+++ b/app-dm/src/TeacherPages/TestManage/Test.jsx
@@ -21,7 +21,7 @@ export default function Test({ ip = "", port = "22", password = "123456", user =
if (terminal !== null) {
terminal.open(terminalObj.current);
- const newSocket = io("ws://36.138.114.105:31055");
+ const newSocket = io("ws:///");
setSocket(newSocket);
terminal.onData((data) => {
diff --git a/app-dm/src/pages/ListPages/Training/Operation2.css b/app-dm/src/pages/ListPages/Training/Operation2.css
index 9b627b6..ebe6403 100644
--- a/app-dm/src/pages/ListPages/Training/Operation2.css
+++ b/app-dm/src/pages/ListPages/Training/Operation2.css
@@ -94,7 +94,7 @@ Link{
.btn-back2{
height: 50px;
position: absolute;
- bottom: 60px;
+ bottom: 100px;
right: 230px;
padding: 0 20px;
display: flex;
@@ -113,7 +113,7 @@ Link{
cursor: pointer;
height: 50px;
position: absolute;
- bottom: 60px;
+ bottom: 100px;
right: 70px;
padding: 0 20px;
display: flex;
diff --git a/app-dm/src/pages/ListPages/Training/Operation2.jsx b/app-dm/src/pages/ListPages/Training/Operation2.jsx
index f541043..948deea 100644
--- a/app-dm/src/pages/ListPages/Training/Operation2.jsx
+++ b/app-dm/src/pages/ListPages/Training/Operation2.jsx
@@ -150,7 +150,7 @@ function Operation2() {
{/* 导航 */}
{/*
{OperationId}
*/}
- {countdown>0&&
剩余时间:{formatTime(countdown)}
}
+ {countdown>0 &&
剩余时间:{formatTime(countdown)}
}
diff --git a/docker-compose.yml b/docker-compose.yml
index 2401c83..3397c48 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,4 +41,5 @@ services:
- '8443:8443'
- '5000:5000'
- '3000:3000'
+ command: service DmServiceDMTEST start && sleep 9999999999
diff --git a/docker/code-server/Dockerfile b/docker/code-server/Dockerfile
index 9ffa20a..6e9521a 100644
--- a/docker/code-server/Dockerfile
+++ b/docker/code-server/Dockerfile
@@ -6,6 +6,7 @@ ENV DEBIAN_FRONTEND="noninteractive"
WORKDIR /home/dmdba
USER root
+
RUN apt-get update && apt-get install -y --no-install-recommends \
git jq libatomic1 net-tools netcat python3-pip curl sudo catatonit libssl-dev \
cron \
@@ -69,6 +70,12 @@ ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-s
ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run"
ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown"
+USER dmdba
+WORKDIR /home/dmdba/dmdbms/bin
+RUN /home/dmdba/dmdbms/bin/dminit path=/home/dmdba/data
+USER root
+RUN /home/dmdba/dmdbms/script/root/dm_service_installer.sh -t dmserver -dm_ini /home/dmdba/data/DAMENG/dm.ini -p DMTEST
+
# 添加本地目录
COPY /root /
diff --git a/python/Dockerfile b/python/Dockerfile
index 789da3f..8561f66 100644
--- a/python/Dockerfile
+++ b/python/Dockerfile
@@ -27,6 +27,7 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
COPY --from=build-dmpython --chown=flask:flask /home/dmdba/build_artifacts/dmPython-2.5.5-cp310-cp310-linux_x86_64.whl .
RUN python3 -m venv "$VIRTUAL_ENV" && \
+pip3 config set global.index-url https://mirrors.bfsu.edu.cn/pypi/web/simple && \
export FLASK_APP=app.py && \
pip3 install dmPython-2.5.5-cp310-cp310-linux_x86_64.whl && rm dmPython-2.5.5-cp310-cp310-linux_x86_64.whl && \
MAKEFLAGS="-j$(nproc)" pip install -r requirements.txt
diff --git a/python/app.py b/python/app.py
index d49270e..7cd7686 100644
--- a/python/app.py
+++ b/python/app.py
@@ -393,8 +393,10 @@ def teacher_check_pod():
@app.route('/')
@app.route('/
')
def catch_all(path = "index.html"):
- return send_from_directory("public", path)
-
+ if os.path.exists(f"public/{path}"):
+ return send_from_directory("public", path)
+ else:
+ return send_from_directory("public", "index.html")
@socketio.on('connect_ssh')
def handle_connect_ssh(data):