2312072104
/
dm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm

This commit is contained in:
30404 2024-07-11 14:23:12 +08:00
parent 01d11a6835 c275228755
commit 6b7fc0d3d6
7 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app-dm/src/TeacherPages/TestManage/Test.jsx
View File

@ -21,7 +21,7 @@ export default function Test({ ip = "", port = "22", password = "123456", user =
if (terminal !== null) { if (terminal !== null) {
terminal.open(terminalObj.current); terminal.open(terminalObj.current);
const newSocket = io("ws://36.138.114.105:31055"); const newSocket = io("ws:///");
setSocket(newSocket); setSocket(newSocket);
terminal.onData((data) => { terminal.onData((data) => {

4
app-dm/src/pages/ListPages/Training/Operation2.css
View File

@ -94,7 +94,7 @@ Link{
.btn-back2{ .btn-back2{
height: 50px; height: 50px;
position: absolute; position: absolute;
bottom: 60px; bottom: 100px;
right: 230px; right: 230px;
padding: 0 20px; padding: 0 20px;
display: flex; display: flex;
@ -113,7 +113,7 @@ Link{
cursor: pointer; cursor: pointer;
height: 50px; height: 50px;
position: absolute; position: absolute;
bottom: 60px; bottom: 100px;
right: 70px; right: 70px;
padding: 0 20px; padding: 0 20px;
display: flex; display: flex;

1
docker-compose.yml
View File

@ -41,4 +41,5 @@ services:
- '8443:8443' - '8443:8443'
- '5000:5000' - '5000:5000'
- '3000:3000' - '3000:3000'
command: service DmServiceDMTEST start && sleep 9999999999

7
docker/code-server/Dockerfile
View File

@ -6,6 +6,7 @@ ENV DEBIAN_FRONTEND="noninteractive"
WORKDIR /home/dmdba WORKDIR /home/dmdba
USER root USER root
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
git jq libatomic1 net-tools netcat python3-pip curl sudo catatonit libssl-dev \ git jq libatomic1 net-tools netcat python3-pip curl sudo catatonit libssl-dev \
cron \ 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/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" 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 / COPY /root /

1
python/Dockerfile
View File

@ -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 . 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" && \ 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 && \ 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 && \ 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 MAKEFLAGS="-j$(nproc)" pip install -r requirements.txt

4
python/app.py
View File

@ -393,8 +393,10 @@ def teacher_check_pod():
@app.route('/') @app.route('/')
@app.route('/<path:path>') @app.route('/<path:path>')
def catch_all(path = "index.html"): def catch_all(path = "index.html"):
if os.path.exists(f"public/{path}"):
return send_from_directory("public", path) return send_from_directory("public", path)
else:
return send_from_directory("public", "index.html")
@socketio.on('connect_ssh') @socketio.on('connect_ssh')
def handle_connect_ssh(data): def handle_connect_ssh(data):