From 479c39b5dba66f1cb8d2bbc7e591befcc68cfdff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Thu, 25 Sep 2025 10:59:44 +0800 Subject: [PATCH] update sca response --- .../api/v1/projects/sca/base_service.rb | 20 ++++++------------- .../v1/projects/sca/create_project_service.rb | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/app/services/api/v1/projects/sca/base_service.rb b/app/services/api/v1/projects/sca/base_service.rb index 53428141a..06947a1ef 100644 --- a/app/services/api/v1/projects/sca/base_service.rb +++ b/app/services/api/v1/projects/sca/base_service.rb @@ -33,12 +33,7 @@ class Api::V1::Projects::Sca::BaseService < ApplicationService request["Authorization"] = auth_token if auth_token response = http.request(request) - - { - code: response.code.to_i, - body: response.body, - json: (JSON.parse(response.body) rescue nil) - } + JSON.parse(response.body) rescue nil rescue raise Error, "SCA服务器错误,请联系系统管理员!" end @@ -58,11 +53,8 @@ class Api::V1::Projects::Sca::BaseService < ApplicationService response = http.request(request) - { - code: response.code.to_i, - body: response.body, - json: (JSON.parse(response.body) rescue nil) - } + JSON.parse(response.body) rescue nil + rescue raise Error, "SCA服务器错误,请联系系统管理员!" end @@ -72,8 +64,8 @@ class Api::V1::Projects::Sca::BaseService < ApplicationService def sca_user_info if Rails.cache.fetch("sca_user").nil? data = sca_get_request("user/", params = {}) - Rails.cache.write("sca_user",data[:body], expires_in: 1.day, force: true) - data[:json] + Rails.cache.write("sca_user",data, expires_in: 1.day, force: true) + data else JSON.parse Rails.cache.fetch("sca_user") end @@ -81,7 +73,7 @@ class Api::V1::Projects::Sca::BaseService < ApplicationService def sca_team_id data = sca_get_request("orgs/#{sca_user_info["default_org"]}/teams/", params = {}) - default_team = data[:json]["results"].find { |team| team["is_default"] } + default_team = data["results"].find { |team| team["is_default"] } default_team ? default_team["id"] : nil end diff --git a/app/services/api/v1/projects/sca/create_project_service.rb b/app/services/api/v1/projects/sca/create_project_service.rb index 7c866903e..3e63034b8 100644 --- a/app/services/api/v1/projects/sca/create_project_service.rb +++ b/app/services/api/v1/projects/sca/create_project_service.rb @@ -15,7 +15,7 @@ class Api::V1::Projects::Sca::CreateProjectService < Api::V1::Projects::Sca::Ba "description": @project.description } data = sca_post_request("projects/", params) - if @project.update(sca_project_id:data[:json]["id"]) + if @project.update(sca_project_id:data["id"]) true else false