From ed6e1150f275913ed83ebc3faf732cb0db25e986 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Dec 2019 10:25:43 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/admins/check_shixun_mirrors_service.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/services/admins/check_shixun_mirrors_service.rb b/app/services/admins/check_shixun_mirrors_service.rb
index 8334df485..85069ebc2 100644
--- a/app/services/admins/check_shixun_mirrors_service.rb
+++ b/app/services/admins/check_shixun_mirrors_service.rb
@@ -78,9 +78,8 @@ class Admins::CheckShixunMirrorsService < ApplicationService
       url = EduSetting.get('cloud_bridge')
       res = Faraday.get(url)
       res_body = JSON.parse(res.body)
-
-      raise Error, '拉取镜像信息异常' if res_body && res_body['code'].to_i != 0
-
+      Rails.logger.info("######res_body:#{res_body}")
+      raise Error, '拉取镜像信息异常' if res_body && res_body['code'].nonzero?
       res_body
     rescue => e
       Rails.logger.error("get response failed ! #{e.message}")

From 370715c7cc5b7fd56d93e6e81af9cf3b960a350f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Dec 2019 10:29:43 +0800
Subject: [PATCH 2/7] log

---
 app/services/admins/check_shixun_mirrors_service.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/services/admins/check_shixun_mirrors_service.rb b/app/services/admins/check_shixun_mirrors_service.rb
index 85069ebc2..2cfce6cf9 100644
--- a/app/services/admins/check_shixun_mirrors_service.rb
+++ b/app/services/admins/check_shixun_mirrors_service.rb
@@ -77,6 +77,7 @@ class Admins::CheckShixunMirrorsService < ApplicationService
     @_bridge_images ||= begin
       url = EduSetting.get('cloud_bridge')
       res = Faraday.get(url)
+      Rails.logger.info("######res:#{res}")
       res_body = JSON.parse(res.body)
       Rails.logger.info("######res_body:#{res_body}")
       raise Error, '拉取镜像信息异常' if res_body && res_body['code'].nonzero?

From b798f3878bd28a42b52d29a3af1f42777b099770 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Dec 2019 10:31:48 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/admins/check_shixun_mirrors_service.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/services/admins/check_shixun_mirrors_service.rb b/app/services/admins/check_shixun_mirrors_service.rb
index 2cfce6cf9..868fab042 100644
--- a/app/services/admins/check_shixun_mirrors_service.rb
+++ b/app/services/admins/check_shixun_mirrors_service.rb
@@ -77,11 +77,10 @@ class Admins::CheckShixunMirrorsService < ApplicationService
     @_bridge_images ||= begin
       url = EduSetting.get('cloud_bridge')
       res = Faraday.get(url)
-      Rails.logger.info("######res:#{res}")
-      res_body = JSON.parse(res.body)
-      Rails.logger.info("######res_body:#{res_body}")
-      raise Error, '拉取镜像信息异常' if res_body && res_body['code'].nonzero?
-      res_body
+
+      raise Error, '拉取镜像信息异常' if res && res['code'].nonzero?
+
+      res
     rescue => e
       Rails.logger.error("get response failed ! #{e.message}")
       raise Error, '实训云平台繁忙（繁忙等级：84）'

From b171efa8f294be4454955384b9afb19efbae0310 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Dec 2019 10:32:56 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/admins/check_shixun_mirrors_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/admins/check_shixun_mirrors_service.rb b/app/services/admins/check_shixun_mirrors_service.rb
index 868fab042..3ee8b6642 100644
--- a/app/services/admins/check_shixun_mirrors_service.rb
+++ b/app/services/admins/check_shixun_mirrors_service.rb
@@ -78,7 +78,7 @@ class Admins::CheckShixunMirrorsService < ApplicationService
       url = EduSetting.get('cloud_bridge')
       res = Faraday.get(url)
 
-      raise Error, '拉取镜像信息异常' if res && res['code'].nonzero?
+      raise Error, '拉取镜像信息异常' if res && res['code'] != 0
 
       res
     rescue => e

From bdabbf06d8cd507e9e218e39beafaa138770efc6 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Dec 2019 10:38:46 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/admins/check_shixun_mirrors_service.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/services/admins/check_shixun_mirrors_service.rb b/app/services/admins/check_shixun_mirrors_service.rb
index 3ee8b6642..4be8f0d6f 100644
--- a/app/services/admins/check_shixun_mirrors_service.rb
+++ b/app/services/admins/check_shixun_mirrors_service.rb
@@ -77,7 +77,10 @@ class Admins::CheckShixunMirrorsService < ApplicationService
     @_bridge_images ||= begin
       url = EduSetting.get('cloud_bridge')
       res = Faraday.get(url)
+      Rails.logger.error("#########res:#{res}")
+      Rails.logger.error("#########res.body:#{res.body}")
 
+      res = JSON.parse(res.body)
       raise Error, '拉取镜像信息异常' if res && res['code'] != 0
 
       res

From f375d657e2e8f788465e71226c9520a0bc0a663d Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Dec 2019 10:40:32 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E9=95=9C=E5=83=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/admins/check_shixun_mirrors_service.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/services/admins/check_shixun_mirrors_service.rb b/app/services/admins/check_shixun_mirrors_service.rb
index 4be8f0d6f..fc3c09918 100644
--- a/app/services/admins/check_shixun_mirrors_service.rb
+++ b/app/services/admins/check_shixun_mirrors_service.rb
@@ -76,11 +76,7 @@ class Admins::CheckShixunMirrorsService < ApplicationService
   def bridge_images
     @_bridge_images ||= begin
       url = EduSetting.get('cloud_bridge')
-      res = Faraday.get(url)
-      Rails.logger.error("#########res:#{res}")
-      Rails.logger.error("#########res.body:#{res.body}")
-
-      res = JSON.parse(res.body)
+      res = Faraday.get(url).body
       raise Error, '拉取镜像信息异常' if res && res['code'] != 0
 
       res

From a38325f9767db4457977699c160b06fab1c78af5 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Dec 2019 10:42:57 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=95=9C=E5=83=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/admins/check_shixun_mirrors_service.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/services/admins/check_shixun_mirrors_service.rb b/app/services/admins/check_shixun_mirrors_service.rb
index fc3c09918..4aa0af4cf 100644
--- a/app/services/admins/check_shixun_mirrors_service.rb
+++ b/app/services/admins/check_shixun_mirrors_service.rb
@@ -75,8 +75,9 @@ class Admins::CheckShixunMirrorsService < ApplicationService
 
   def bridge_images
     @_bridge_images ||= begin
-      url = EduSetting.get('cloud_bridge')
-      res = Faraday.get(url).body
+      url = "#{EduSetting.get('cloud_bridge')}/bridge/docker/images"
+      res = Faraday.get(url)
+      res = JSON.parse(res.body)
       raise Error, '拉取镜像信息异常' if res && res['code'] != 0
 
       res