Merge branch 'master' of https://gitea.xn--7p0a.site/2312072104/dm
This commit is contained in:
commit
eb068333c6
|
@ -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:///");
|
||||
const newSocket = io("ws://" + window.location.host);
|
||||
setSocket(newSocket);
|
||||
|
||||
terminal.onData((data) => {
|
||||
|
|
|
@ -29,7 +29,7 @@ services:
|
|||
ports:
|
||||
- '8000:8000'
|
||||
- '8765:8765'
|
||||
command: gunicorn -w 3 -t 60 -b 0.0.0.0:8000 app:app
|
||||
command: python app.py
|
||||
|
||||
code-server:
|
||||
build: ./docker/code-server
|
||||
|
|
|
@ -39,4 +39,4 @@ COPY --from=build-frontend /usr/src/app/build/ /home/flask/public/
|
|||
EXPOSE 8000 22 8765
|
||||
USER root
|
||||
|
||||
CMD ["gunicorn", "-w", "3", "-t", "60", "-b", "0.0.0.0:8000", "app:app"]
|
||||
CMD ["python", "app.py"]
|
|
@ -11,19 +11,21 @@ from student_func import *
|
|||
from flask import Flask, render_template, request, jsonify, send_from_directory, session
|
||||
from flask_cors import CORS
|
||||
from flask_socketio import SocketIO, emit, disconnect
|
||||
from engineio.payload import Payload
|
||||
Payload.max_decode_packets = 500
|
||||
|
||||
import logging
|
||||
import os
|
||||
print(os.getcwd())
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
app = Flask(__name__, static_folder="public")
|
||||
CORS(app)
|
||||
cors = CORS(app, resource={
|
||||
cors = CORS(app, resources={
|
||||
r"/*":{
|
||||
"origins":"*"
|
||||
}
|
||||
})
|
||||
app.config['SECRET_KEY'] = '350625'
|
||||
socketio = SocketIO(app, cors_allowed_origins="*")
|
||||
socketio = SocketIO(app, cors_allowed_origins="*", ping_timeout=1000, ping_interval=0)
|
||||
|
||||
clients = {}
|
||||
|
||||
|
@ -450,6 +452,6 @@ def handle_disconnect():
|
|||
|
||||
|
||||
if __name__ == '__main__':
|
||||
socketio.run(app, host='0.0.0.0', port=5000 ,allow_unsafe_werkzeug=True, debug=True)
|
||||
socketio.run(app, host='0.0.0.0', port=8000 ,allow_unsafe_werkzeug=True, debug=False)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue