同步develop最新代码后更改client

Gemfile

@@ -140,4 +140,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 1.2.1'
+gem 'gitea-client', '~> 1.3.1'

app/controllers/api/v1/projects/tags_controller.rb

@@ -4,6 +4,7 @@ class Api::V1::Projects::TagsController < Api::V1::BaseController
   def index 
     @release_tags = @repository.version_releases.pluck(:tag_name)
     @result_object = Api::V1::Projects::Tags::ListService.call(@project, {page: page, limit: limit}, current_user&.gitea_token)
+    puts @result_object
   end
 
   before_action :require_operate_above, only: [:destroy] 

app/services/api/v1/projects/branches/all_list_service.rb

@@ -25,6 +25,6 @@ class Api::V1::Projects::Branches::AllListService < ApplicationService
 
   def load_gitea_data 
     @gitea_data = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
-    raise Error, '获取所有分支失败！' unless @gitea_data.is_a?(Hash)
+    raise Error, '获取所有分支失败！' unless @gitea_data.is_a?(Array)
   end
 end

app/services/api/v1/projects/branches/create_service.rb

@@ -43,10 +43,10 @@ class Api::V1::Projects::Branches::CreateService < ApplicationService
     raise Error, '创建分支失败！' unless @gitea_data.is_a?(Hash)
   end
 
-  def check_new_branch_exist
+  def check_branch_exist
     result = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
-    raise Error, '查询分支名称失败！' unless result.is_a?(Hash)
-    raise Error, '旧分支不存在！' if !result['branch_name'].include?(@old_branch_name)
-    raise Error, '新分支已存在！' if result['branch_name'].include?(@new_branch_name)
+    raise Error, '查询分支名称失败！' unless result.is_a?(Array)
+    raise Error, '旧分支不存在！' if !result.include?(@old_branch_name)
+    raise Error, '新分支已存在！' if result.include?(@new_branch_name)
   end
 end

app/services/api/v1/projects/branches/delete_service.rb

@@ -40,8 +40,8 @@ class Api::V1::Projects::Branches::DeleteService < ApplicationService
   end
 
   def check_branch_exist
-    result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
-    raise Error, '查询分支名称失败！' unless result.is_a?(Hash)
-    raise Error, '分支不存在！' if !result['branch_name'].include?(@branch_name)
+    result = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
+    raise Error, '查询分支名称失败！' unless result.is_a?(Array)
+    raise Error, '分支不存在！' if !result.include?(@branch_name)
   end
 end

app/services/api/v1/projects/branches/update_default_branch_service.rb

@@ -48,8 +48,8 @@ class Api::V1::Projects::Branches::UpdateDefaultBranchService < ApplicationServi
   end
 
   def check_branch_exist
-    result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
-    raise Error, '查询分支名称失败！' unless result.is_a?(Hash)
-    raise Error, '新默认分支不存在！' if !result['branch_name'].include?(@new_default_branch)
+    result = $gitea_hat_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
+    raise Error, '查询分支名称失败！' unless result.is_a?(Array)
+    raise Error, '新默认分支不存在！' if !result.include?(@new_default_branch)
   end
 end

app/services/api/v1/projects/tags/delete_service.rb

@@ -40,7 +40,7 @@ class Api::V1::Projects::Tags::DeleteService < ApplicationService
   end
 
   def check_tag_exist
-    result = $gitea_client.get_repos_tag_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
+    result = $gitea_hat_client.get_repos_tag_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
     raise Error, '查询标签名称失败！' unless result.is_a?(Array)
     raise Error, '标签不存在！' if !result.include?(@tag_name)
   end

app/services/api/v1/projects/tags/list_service.rb

@@ -30,7 +30,7 @@ class Api::V1::Projects::Tags::ListService < ApplicationService
   end
 
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_tags_by_owner_repo(owner, repo, {query: request_params}) rescue nil
+    @gitea_data = $gitea_hat_client.get_repos_tags_by_owner_repo(owner, repo, {query: request_params}) rescue nil
     raise Error, '获取标签列表失败！' unless @gitea_data.is_a?(Hash)
   end
 end

app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder

@@ -17,9 +17,9 @@ end
 json.protected branch['protected']
 json.user_can_push branch['user_can_push']
 json.user_can_merge branch['user_can_merge']
-json.commit_id branch['commit_id']
+json.commit_id branch['commit']['id']
 json.commit_time_from_now time_from_now(branch['commit']['timestamp'].to_time)
-json.commit_time branch['commit_time']
+json.commit_time branch['commit']['timestamp']
 json.default_branch branch['default_branch']
 json.http_url render_http_url(@project)
 json.zip_url render_zip_url(@owner, @project.repository, branch['name'])

app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder

@@ -12,10 +12,10 @@ if tag.present? && tag.is_a?(Hash)
   json.commit do
     json.sha tag['commit']['sha']
     json.message tag['commit']['message']
-    json.time_ago time_from_now(tag['commit']['commiter']['date'].to_time)
-    json.created_at_unix tag['commit']['commiter']['date'].to_time.to_i
+    json.time_ago time_from_now(tag['commit']['committer']['date'].to_time)
+    json.created_at_unix tag['commit']['committer']['date'].to_time.to_i
     json.committer do 
-      json.partial! 'api/v1/users/commit_user', user: render_cache_commit_author(tag['commit']['commiter']), name: tag['commit']['commiter']['name']
+      json.partial! 'api/v1/users/commit_user', user: render_cache_commit_author(tag['commit']['committer']), name: tag['commit']['committer']['name']
     end
     json.author do 
       json.partial! 'api/v1/users/commit_user', user: render_cache_commit_author(tag['commit']['author']), name: tag['commit']['author']['name']