Merge branch 'refs/heads/dev'

# Conflicts:
#	server/app.py
#	server/apps/agentcomm.py
#	server/apps/sysinfo.py
#	server/apps/sysmange.py
#	server/apps/target.py
#	server/apps/task.py

1 files changed, 5 insertions, 6 deletions

diff --git a/server/app.py b/server/app.py
index 3c53056..b1ed6a5 100644
--- a/server/app.py
+++ b/server/app.py
@@ -1,7 +1,7 @@
-import argparse
-
 from apiflask import APIFlask
+from flask_cors import CORS
 
+import settings
 from apps.agentcomm import bp as agentbp
 from apps.sysinfo import bp as sysbp
 from apps.sysmange import bp as mangbp
@@ -10,6 +10,8 @@ from apps.task import bp as taskbp
 
 # 注册蓝图
 app = APIFlask(__name__, template_folder='./static/templates')
+# 跨域支持
+CORS(app)
 # 目标状态获取接口
 app.register_blueprint(targetbp)
 # 代理接口
@@ -29,7 +31,4 @@ def hello():
 
 
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    parser.add_argument("-p", "--port", type=int, default=12525, help="主控服务的开放通信端口")
-    args = parser.parse_args()
-    app.run(host="0.0.0.0", debug=True, port=args.port)
+    app.run(host="0.0.0.0", debug=settings.DEBUG, port=settings.SERVER_PORT)