Merge pull request #873 from midoks/dev

常规更新

scripts/init.d/mw.tpl

@@ -407,6 +407,19 @@ mw_update_dev()
     cd ${PANEL_DIR}
 }
 
+mw_dev()
+{
+    if [ -f ${PANEL_DIR}/task.py ];then
+        echo "与后续版本差异太大,不再提供更新"
+        exit 0
+    fi
+
+    mw_common_proxy
+    echo "bash <(curl -fsSL "${HTTP_PREFIX}raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh")"
+    bash <(curl -fsSL "${HTTP_PREFIX}raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh")
+    cd ${PANEL_DIR}
+}
+
 mw_update_venv()
 {
     rm -rf ${PANEL_DIR}/bin
@@ -474,7 +487,7 @@ mw_debug(){
         cd ${PANEL_DIR}/web
     fi
     # gunicorn -b :$port -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
-    gunicorn -b :$port -k gthread -w 1  app:app
+    gunicorn -b :$port -k gevent -w 1  app:app
 }
 
 mw_connect_mysql(){
@@ -759,7 +772,7 @@ case "$1" in
     'open') mw_open;;
     'install') mw_install;;
     'update') mw_update;;
-    'dev') mw_update_dev;;
+    'dev') mw_dev;;
     'update_dev') mw_update_dev;;
     'install_app') mw_install_app;;
     'close_admin_path') mw_close_admin_path;;

web/admin/__init__.py

@@ -172,7 +172,8 @@ def inject_global_variables():
 #                     ping_interval=25, ping_timeout=120)
 socketio = SocketIO(logger=False,
     engineio_logger=False,
-    cors_allowed_origins="*")
+    cors_allowed_origins="*",
+    async_mode='threading')
 socketio.init_app(app)
 
 @socketio.on('webssh_websocketio')