diff --git a/0058-get-detection-envirnment-process-interface.patch b/0058-get-detection-envirnment-process-interface.patch new file mode 100644 index 0000000000000000000000000000000000000000..0db93f8548f1f80bc276f2c0fca0f7fc74def22b --- /dev/null +++ b/0058-get-detection-envirnment-process-interface.patch @@ -0,0 +1,74 @@ +From 2d5291afc5a6edfe9f2359e808eb4dab35834d6f Mon Sep 17 00:00:00 2001 +From: lixin +Date: Mon, 13 Nov 2023 10:00:20 +0800 +Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=8E=AF=E5=A2=83=E6=A3=80?= + =?UTF-8?q?=E6=9F=A5=E8=BF=9B=E5=BA=A6=E6=8E=A5=E5=8F=A3?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + index.py | 33 ++++++++++++--------------------- + 1 file changed, 12 insertions(+), 21 deletions(-) + +diff --git a/index.py b/index.py +index 2faae57..4ca7b38 100644 +--- a/index.py ++++ b/index.py +@@ -33,6 +33,7 @@ mods = { + 'check_repo': migration.check_repo, + 'get_repo_data': server.get_repo_data, + 'check_environment':migration.check_environment, ++ 'get_environment_data': server.get_environment_data, + } + + +@@ -156,6 +157,17 @@ def check_environment(): + return Response(mod, content_type='application/json') + + ++@app.route('/get_environment_data', methods=['GET', 'POST']) ++def get_environment_data(): ++ """ ++ 获取环境检查进度本 ++ :return: ++ """ ++ mod = check_methods() ++ if mod: ++ return Response(mod, content_type='application/json') ++ ++ + @app.route('/', methods=['GET', 'POST']) + def MT_index(): + """ +@@ -297,27 +309,6 @@ def MT_repo_kernel(): + return render_template('MT_kernel.html') + + +-@app.route('/Mt_environment', methods=['GET', 'POST']) +-def Mt_environment(): +- """ +- 跳转迁移前环境检测界面 +- :return: +- """ +- return render_template('MT_check_environment.html') +- +- +-@app.route('/MT_check_environment', methods=['GET', 'POST']) +-def MT_check_environment(): +- """ +- 迁移前系统环境检查 +- :return: +- """ +- mod = check_methods() +- if mod: +- return Response(mod, content_type='application/json') +- return render_template('MT_check_environment.html') +- +- + @app.route('/MT_check_progress', methods=['GET', 'POST']) + def MT_check_progress(): + """ +-- +2.20.1 + diff --git a/migration-tools.spec b/migration-tools.spec index 95dbad48bd0dcefcd4dec610b8f5e8fda714dae2..c179179c1a0e6fe9608b239cf021e33ef5a3d305 100644 --- a/migration-tools.spec +++ b/migration-tools.spec @@ -1,6 +1,6 @@ Name: migration-tools Version: 1.0.2 -Release: 57 +Release: 58 License: MulanPSL-2.0 Summary: A tool to help users migrate the Centos system to the UOS system and openEuler system Source0: %{name}-%{version}.tar.gz @@ -64,6 +64,8 @@ Patch54: 0054-removed-detection-abi-script.patch Patch55: 0055-add-envirnment-detection-interface-before-migration.patch Patch56: 0056-modify-detection-envirnment-interface.patch Patch57: 0057-abi-basic-data-for-report.patch +Patch58: 0058-get-detection-envirnment-process-interface.patch + BuildArch: noarch BuildRequires: systemd @@ -162,6 +164,9 @@ rm -rf /usr/bin/migration-tools %endif %changelog +* Tue Nov 5 2024 xuezhixin - 1.0.2-58 +- 0058-get-detection-envirnment-process-interface.patch + * Tue Nov 5 2024 xuezhixin - 1.0.2-57 - 0057-abi-basic-data-for-report.patch