From 8e9c2232b08e741b293a0acab3616cd803ecb0d5 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 16 Jan 2023 18:05:27 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=B0?=
 =?UTF-8?q?=E7=89=88gitea=E8=B7=AF=E7=94=B1=E8=AF=B7=E6=B1=82=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  | 42 +++++++++++++++++--
 app/services/gitea/client_service.rb          | 32 +++++++-------
 app/services/gitea/hooks/create_service.rb    |  2 +-
 .../gitea/organization/create_service.rb      |  2 +-
 .../gitea/organization/update_service.rb      |  2 +-
 .../gitea/pull_request/commits_service.rb     |  2 +-
 .../gitea/pull_request/files_service.rb       |  2 +-
 .../gitea/pull_request/get_service.rb         |  2 +-
 .../repository/branches/list_name_service.rb  |  2 +-
 .../repository/branches/list_slice_service.rb |  2 +-
 .../repository/commits/compare_service.rb     |  2 +-
 .../repository/commits/file_list_service.rb   |  2 +-
 .../gitea/repository/commits/get_service.rb   |  2 +-
 .../repository/commits/list_slice_service.rb  |  2 +-
 .../repository/contributors/get_service.rb    |  2 +-
 .../gitea/repository/entries/get_service.rb   |  2 +-
 .../gitea/repository/entries/list_service.rb  |  2 +-
 .../gitea/repository/files/get_service.rb     |  2 +-
 .../get_branch_and_tag_total_num_service.rb   |  2 +-
 .../gitea/repository/readme/dir_service.rb    |  2 +-
 .../gitea/repository/readme/get_service.rb    |  2 +-
 .../repository/tags/list_name_service.rb      |  2 +-
 .../gitea/repository/tags/list_service.rb     |  2 +-
 .../gitea/repository/transfer_service.rb      |  2 +-
 .../repository/webhooks/tasks_service.rb      |  2 +-
 app/services/gitea/user/headmap_service.rb    |  2 +-
 app/services/gitea/user/update_service.rb     |  2 +-
 app/services/gitea/versions/create_service.rb |  2 +-
 app/services/gitea/versions/get_service.rb    |  2 +-
 app/services/gitea/versions/list_service.rb   |  2 +-
 app/services/gitea/versions/update_service.rb |  2 +-
 config/configuration.yml.example              |  1 +
 33 files changed, 88 insertions(+), 47 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0645fa72c..621ca4d0d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'puma', '~> 3.11'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 
-# gem 'coffee-rails', '~> 4.2'
+# gem 'coffee-rails', '~> 4.2'[p-qwa9aq]
 gem 'turbolinks', '~> 5'
 gem 'jbuilder', '~> 2.5'
 gem 'groupdate', '~> 4.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index e27c504aa..0001f2321 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,6 +106,8 @@ GEM
       activerecord (>= 3.1.0, < 7)
     diff-lcs (1.3)
     diffy (3.3.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
     doorkeeper (5.5.1)
       railties (>= 5)
     doorkeeper-jwt (0.4.1)
@@ -127,12 +129,14 @@ GEM
     execjs (2.7.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
+    ffi (1.15.5)
     font-awesome-sass (4.7.0)
       sass (>= 3.2)
     fugit (1.4.1)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
+    gitea-client (0.11.1)
+      rest-client (~> 2.1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     grape-entity (0.7.1)
@@ -143,6 +147,9 @@ GEM
     harmonious_dictionary (0.0.1)
     hashie (3.6.0)
     htmlentities (4.3.4)
+    http-accept (1.7.0)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     io-like (0.3.1)
@@ -180,6 +187,9 @@ GEM
       mimemagic (~> 0.3.2)
     maruku (0.7.3)
     method_source (0.9.2)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
     mimemagic (0.3.10)
       nokogiri (~> 1)
       rake
@@ -193,6 +203,7 @@ GEM
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mysql2 (0.5.3)
+    netrc (0.11.0)
     nio4r (2.5.2)
     nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
@@ -209,9 +220,21 @@ GEM
       addressable (~> 2.3)
       nokogiri (~> 1.5)
       omniauth (~> 1.2)
+    omniauth-gitee (1.0.0)
+      omniauth (>= 1.5, < 3.0)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
+    omniauth-github (1.4.0)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
     omniauth-oauth2 (1.6.0)
       oauth2 (~> 1.1)
       omniauth (~> 1.9)
+    omniauth-rails_csrf_protection (0.1.2)
+      actionpack (>= 4.2)
+      omniauth (>= 1.3.1)
+    omniauth-wechat-oauth2 (0.2.2)
+      omniauth (>= 1.3.2)
+      omniauth-oauth2 (>= 1.1.1)
     parallel (1.19.1)
     parser (2.7.1.1)
       ast (~> 2.4.0)
@@ -292,6 +315,11 @@ GEM
     regexp_parser (1.7.0)
     request_store (1.5.0)
       rack (>= 1.4)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     reverse_markdown (1.4.0)
       nokogiri
     roo (2.8.3)
@@ -346,7 +374,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sassc (2.2.1)
+    sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
@@ -418,6 +446,9 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
     unicode-display_width (1.6.1)
     web-console (3.7.0)
       actionview (>= 5.0)
@@ -459,6 +490,7 @@ DEPENDENCIES
   enumerize
   faraday (~> 0.15.4)
   font-awesome-sass (= 4.7.0)
+  gitea-client (~> 0.11.1)
   grape-entity (~> 0.7.1)
   groupdate (~> 4.1.0)
   harmonious_dictionary (~> 0.0.1)
@@ -472,7 +504,11 @@ DEPENDENCIES
   oauth2
   omniauth (~> 1.9.0)
   omniauth-cas
+  omniauth-gitee (~> 1.0.0)
+  omniauth-github
   omniauth-oauth2 (~> 1.6.0)
+  omniauth-rails_csrf_protection
+  omniauth-wechat-oauth2
   parallel (~> 1.19, >= 1.19.1)
   pdfkit
   prettier
@@ -512,4 +548,4 @@ DEPENDENCIES
   wkhtmltopdf-binary
 
 BUNDLED WITH
-   2.1.4
+   2.3.26
diff --git a/app/services/gitea/client_service.rb b/app/services/gitea/client_service.rb
index e2bd9d491..fae4ae27e 100644
--- a/app/services/gitea/client_service.rb
+++ b/app/services/gitea/client_service.rb
@@ -18,19 +18,19 @@ class Gitea::ClientService < ApplicationService
   #   token: {},
   #   data: {}
   # }
-  def post(url, params={})
+  def post(url, params={}, is_hat=false)
     puts "[gitea] request params: #{params}"
     auth_token = authen_params(params[:token])
     conn(auth_token).post do |req|
-      req.url full_url(url)
+      req.url full_url(url, "post", is_hat)
       req.body = params[:data].to_json
     end
   end
 
-  def get(url, params={})
+  def get(url, params={}, is_hat = false)
     auth_token = authen_params(params[:token])
     conn(auth_token).get do |req|
-      req.url full_url(url, 'get')
+      req.url full_url(url, 'get', is_hat)
       params.except(:token).each_pair do |key, value|
         req.params["#{key}"] = value
       end
@@ -41,27 +41,27 @@ class Gitea::ClientService < ApplicationService
     # end #=> 响应头
   end
 
-  def delete(url, params={})
+  def delete(url, params={}, is_hat = false)
     auth_token = authen_params(params[:token])
     conn(auth_token).delete do |req|
-      req.url full_url(url)
+      req.url full_url(url, "delete", is_hat)
       req.body = params[:data].to_json
     end
   end
 
-  def patch(url, params={})
+  def patch(url, params={}, is_hat=false)
     puts "[gitea] request params: #{params}"
     auth_token = authen_params(params[:token])
     conn(auth_token).patch do |req|
-      req.url full_url(url)
+      req.url full_url(url, 'patch', is_hat)
       req.body = params[:data].to_json
     end
   end
 
-  def put(url, params={})
+  def put(url, params={}, is_hat=false)
     puts "[gitea] put request params: #{params}"
     conn(authen_params(params[:token])).put do |req|
-      req.url full_url(url)
+      req.url full_url(url, "put", is_hat)
       req.body = params[:data].to_json
     end
   end
@@ -99,16 +99,20 @@ class Gitea::ClientService < ApplicationService
     GiteaService.gitea_config[:base_url]
   end
 
+  def hat_base_url 
+    GiteaService.gitea_config[:hat_base_url]
+  end
+
   def domain
     GiteaService.gitea_config[:domain]
   end
 
-  def api_url
-    [domain, base_url].join('')
+  def api_url(is_hat=false)
+    is_hat ? [domain, hat_base_url].join('') : [domain, base_url].join('')
   end
 
-  def full_url(api_rest, action='post')
-    url = [api_url, api_rest].join('').freeze
+  def full_url(api_rest, action='post', is_hat=false)
+    url = [api_url(is_hat), api_rest].join('').freeze
     url = action === 'get' ? url : URI.escape(url)
     url = URI.escape(url) unless url.ascii_only?
     puts "[gitea] request url: #{url}"
diff --git a/app/services/gitea/hooks/create_service.rb b/app/services/gitea/hooks/create_service.rb
index 6b65a6860..8b8d7f2c3 100644
--- a/app/services/gitea/hooks/create_service.rb
+++ b/app/services/gitea/hooks/create_service.rb
@@ -24,7 +24,7 @@ class Gitea::Hooks::CreateService < Gitea::ClientService
   end
 
   def call
-    response = post(url, params)
+    response = post(url, params, true)
     render_201_response(response)
   end
 
diff --git a/app/services/gitea/organization/create_service.rb b/app/services/gitea/organization/create_service.rb
index 4da1720cc..6f4c3d4f2 100644
--- a/app/services/gitea/organization/create_service.rb
+++ b/app/services/gitea/organization/create_service.rb
@@ -7,7 +7,7 @@ class Gitea::Organization::CreateService < Gitea::ClientService
   end
 
   def call
-    response = post(url, request_params)
+    response = post(url, request_params, true)
     render_status(response)
   end
 
diff --git a/app/services/gitea/organization/update_service.rb b/app/services/gitea/organization/update_service.rb
index 963099ad9..7a0fd1eec 100644
--- a/app/services/gitea/organization/update_service.rb
+++ b/app/services/gitea/organization/update_service.rb
@@ -8,7 +8,7 @@ class Gitea::Organization::UpdateService < Gitea::ClientService
   end
 
   def call
-    response = patch(url, request_params)
+    response = patch(url, request_params, true)
     render_status(response)
   end
 
diff --git a/app/services/gitea/pull_request/commits_service.rb b/app/services/gitea/pull_request/commits_service.rb
index dc2877eba..f85edd296 100644
--- a/app/services/gitea/pull_request/commits_service.rb
+++ b/app/services/gitea/pull_request/commits_service.rb
@@ -16,7 +16,7 @@ class Gitea::PullRequest::CommitsService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_result(response)
   end
 
diff --git a/app/services/gitea/pull_request/files_service.rb b/app/services/gitea/pull_request/files_service.rb
index f7a2bd750..a5c2cf0d8 100644
--- a/app/services/gitea/pull_request/files_service.rb
+++ b/app/services/gitea/pull_request/files_service.rb
@@ -17,7 +17,7 @@ class Gitea::PullRequest::FilesService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params.merge(token: token))
+    response = get(url, params.merge(token: token), true)
     render_result(response)
   end
 
diff --git a/app/services/gitea/pull_request/get_service.rb b/app/services/gitea/pull_request/get_service.rb
index f9a35fdca..bd1fd8957 100644
--- a/app/services/gitea/pull_request/get_service.rb
+++ b/app/services/gitea/pull_request/get_service.rb
@@ -12,7 +12,7 @@ class Gitea::PullRequest::GetService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_result(response)
   end
 
diff --git a/app/services/gitea/repository/branches/list_name_service.rb b/app/services/gitea/repository/branches/list_name_service.rb
index c005c8359..84f6d3a4c 100644
--- a/app/services/gitea/repository/branches/list_name_service.rb
+++ b/app/services/gitea/repository/branches/list_name_service.rb
@@ -8,7 +8,7 @@ class Gitea::Repository::Branches::ListNameService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_200_response(response)
   end
 
diff --git a/app/services/gitea/repository/branches/list_slice_service.rb b/app/services/gitea/repository/branches/list_slice_service.rb
index 6b643831a..e04a4b6e6 100644
--- a/app/services/gitea/repository/branches/list_slice_service.rb
+++ b/app/services/gitea/repository/branches/list_slice_service.rb
@@ -7,7 +7,7 @@ class Gitea::Repository::Branches::ListSliceService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_200_response(response)
   end
 
diff --git a/app/services/gitea/repository/commits/compare_service.rb b/app/services/gitea/repository/commits/compare_service.rb
index 502f6ce90..bdfd4ca3d 100644
--- a/app/services/gitea/repository/commits/compare_service.rb
+++ b/app/services/gitea/repository/commits/compare_service.rb
@@ -14,7 +14,7 @@ class Gitea::Repository::Commits::CompareService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_status(response)
   end
 
diff --git a/app/services/gitea/repository/commits/file_list_service.rb b/app/services/gitea/repository/commits/file_list_service.rb
index b1606a0f3..77a193475 100644
--- a/app/services/gitea/repository/commits/file_list_service.rb
+++ b/app/services/gitea/repository/commits/file_list_service.rb
@@ -14,7 +14,7 @@ class Gitea::Repository::Commits::FileListService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_result(response)
   end
 
diff --git a/app/services/gitea/repository/commits/get_service.rb b/app/services/gitea/repository/commits/get_service.rb
index d497f1e4f..a8fc67235 100644
--- a/app/services/gitea/repository/commits/get_service.rb
+++ b/app/services/gitea/repository/commits/get_service.rb
@@ -14,7 +14,7 @@ class Gitea::Repository::Commits::GetService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_status(response)
   end
 
diff --git a/app/services/gitea/repository/commits/list_slice_service.rb b/app/services/gitea/repository/commits/list_slice_service.rb
index 04f45f55b..d31cf2bcd 100644
--- a/app/services/gitea/repository/commits/list_slice_service.rb
+++ b/app/services/gitea/repository/commits/list_slice_service.rb
@@ -13,7 +13,7 @@ class Gitea::Repository::Commits::ListSliceService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_result(response)
   end
 
diff --git a/app/services/gitea/repository/contributors/get_service.rb b/app/services/gitea/repository/contributors/get_service.rb
index 1ee1c3955..e5ad32e38 100644
--- a/app/services/gitea/repository/contributors/get_service.rb
+++ b/app/services/gitea/repository/contributors/get_service.rb
@@ -7,7 +7,7 @@ class Gitea::Repository::Contributors::GetService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_status(response)
   end
 
diff --git a/app/services/gitea/repository/entries/get_service.rb b/app/services/gitea/repository/entries/get_service.rb
index f8ac27543..f8e7b9451 100644
--- a/app/services/gitea/repository/entries/get_service.rb
+++ b/app/services/gitea/repository/entries/get_service.rb
@@ -13,7 +13,7 @@ class Gitea::Repository::Entries::GetService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_result(response)
   end
 
diff --git a/app/services/gitea/repository/entries/list_service.rb b/app/services/gitea/repository/entries/list_service.rb
index dd62a1147..df9fdb1e3 100644
--- a/app/services/gitea/repository/entries/list_service.rb
+++ b/app/services/gitea/repository/entries/list_service.rb
@@ -10,7 +10,7 @@ class Gitea::Repository::Entries::ListService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_result(response)
   end
 
diff --git a/app/services/gitea/repository/files/get_service.rb b/app/services/gitea/repository/files/get_service.rb
index e5b96e7ba..2a1589821 100644
--- a/app/services/gitea/repository/files/get_service.rb
+++ b/app/services/gitea/repository/files/get_service.rb
@@ -10,7 +10,7 @@ class Gitea::Repository::Files::GetService < Gitea::ClientService
   end
 
   def call 
-    response = get(url, params)
+    response = get(url, params, true)
     render_status(response)
   end
 
diff --git a/app/services/gitea/repository/get_branch_and_tag_total_num_service.rb b/app/services/gitea/repository/get_branch_and_tag_total_num_service.rb
index 0b8a52467..f0fd2557b 100644
--- a/app/services/gitea/repository/get_branch_and_tag_total_num_service.rb
+++ b/app/services/gitea/repository/get_branch_and_tag_total_num_service.rb
@@ -11,7 +11,7 @@ module Gitea
       end
 
       def call
-        response = get(url, params)
+        response = get(url, params, true)
         render_result(response)
       end
 
diff --git a/app/services/gitea/repository/readme/dir_service.rb b/app/services/gitea/repository/readme/dir_service.rb
index 587fb5d55..830cceaa8 100644
--- a/app/services/gitea/repository/readme/dir_service.rb
+++ b/app/services/gitea/repository/readme/dir_service.rb
@@ -10,7 +10,7 @@ class Gitea::Repository::Readme::DirService < Gitea::ClientService
   end
 
   def call 
-    response = get(url, params) 
+    response = get(url, params, true) 
     status, message, body = render_response(response)
     json_format(status, message, body)
   end
diff --git a/app/services/gitea/repository/readme/get_service.rb b/app/services/gitea/repository/readme/get_service.rb
index 48e2d4475..5af86b5ae 100644
--- a/app/services/gitea/repository/readme/get_service.rb
+++ b/app/services/gitea/repository/readme/get_service.rb
@@ -15,7 +15,7 @@ class Gitea::Repository::Readme::GetService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     status, message, body = render_response(response)
     json_format(status, message, body)
   end
diff --git a/app/services/gitea/repository/tags/list_name_service.rb b/app/services/gitea/repository/tags/list_name_service.rb
index 0857ca11c..ac81c9d75 100644
--- a/app/services/gitea/repository/tags/list_name_service.rb
+++ b/app/services/gitea/repository/tags/list_name_service.rb
@@ -8,7 +8,7 @@ class Gitea::Repository::Tags::ListNameService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_200_response(response)
   end
 
diff --git a/app/services/gitea/repository/tags/list_service.rb b/app/services/gitea/repository/tags/list_service.rb
index 0f8158b3e..958287179 100644
--- a/app/services/gitea/repository/tags/list_service.rb
+++ b/app/services/gitea/repository/tags/list_service.rb
@@ -11,7 +11,7 @@ class Gitea::Repository::Tags::ListService < Gitea::ClientService
   end
 
   def call
-    response = get(url, request_params)
+    response = get(url, request_params, true)
     render_result(response)
   end
 
diff --git a/app/services/gitea/repository/transfer_service.rb b/app/services/gitea/repository/transfer_service.rb
index 358ac9421..40cf5d1bf 100644
--- a/app/services/gitea/repository/transfer_service.rb
+++ b/app/services/gitea/repository/transfer_service.rb
@@ -9,7 +9,7 @@ class Gitea::Repository::TransferService < Gitea::ClientService
   end
 
   def call
-    response = post(url, request_params)
+    response = post(url, request_params, true)
     render_status(response)
   end
 
diff --git a/app/services/gitea/repository/webhooks/tasks_service.rb b/app/services/gitea/repository/webhooks/tasks_service.rb
index e4c62edb4..be5a59290 100644
--- a/app/services/gitea/repository/webhooks/tasks_service.rb
+++ b/app/services/gitea/repository/webhooks/tasks_service.rb
@@ -11,7 +11,7 @@ class Gitea::Repository::Webhooks::TasksService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_response(response)
   end
 
diff --git a/app/services/gitea/user/headmap_service.rb b/app/services/gitea/user/headmap_service.rb
index 611a8b9d0..d066d0f16 100644
--- a/app/services/gitea/user/headmap_service.rb
+++ b/app/services/gitea/user/headmap_service.rb
@@ -8,7 +8,7 @@ class Gitea::User::HeadmapService < Gitea::ClientService
   end
 
   def call 
-    response = get(url, params)
+    response = get(url, params, true)
     render_response(response)
   end
 
diff --git a/app/services/gitea/user/update_service.rb b/app/services/gitea/user/update_service.rb
index 9826c7ed0..24660158b 100644
--- a/app/services/gitea/user/update_service.rb
+++ b/app/services/gitea/user/update_service.rb
@@ -24,7 +24,7 @@ class Gitea::User::UpdateService < Gitea::ClientService
   end
 
   def call
-    patch(url, data_params)
+    patch(url, data_params, true)
   end
 
   private
diff --git a/app/services/gitea/versions/create_service.rb b/app/services/gitea/versions/create_service.rb
index 04fed00f2..4424fc276 100644
--- a/app/services/gitea/versions/create_service.rb
+++ b/app/services/gitea/versions/create_service.rb
@@ -18,7 +18,7 @@ class Gitea::Versions::CreateService < Gitea::ClientService
   end
 
   def call
-    response = post(url, request_params)
+    response = post(url, request_params, true)
     render_status(response)
   end
 
diff --git a/app/services/gitea/versions/get_service.rb b/app/services/gitea/versions/get_service.rb
index b3c6cf9cc..2af78ab28 100644
--- a/app/services/gitea/versions/get_service.rb
+++ b/app/services/gitea/versions/get_service.rb
@@ -12,7 +12,7 @@ class Gitea::Versions::GetService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_result(response)
   end
 
diff --git a/app/services/gitea/versions/list_service.rb b/app/services/gitea/versions/list_service.rb
index 5d160fc3e..3505fa254 100644
--- a/app/services/gitea/versions/list_service.rb
+++ b/app/services/gitea/versions/list_service.rb
@@ -11,7 +11,7 @@ class Gitea::Versions::ListService < Gitea::ClientService
   end
 
   def call
-    response = get(url, params)
+    response = get(url, params, true)
     render_result(response)
   end
 
diff --git a/app/services/gitea/versions/update_service.rb b/app/services/gitea/versions/update_service.rb
index a4c9acfc2..c07620bc8 100644
--- a/app/services/gitea/versions/update_service.rb
+++ b/app/services/gitea/versions/update_service.rb
@@ -19,7 +19,7 @@ class Gitea::Versions::UpdateService < Gitea::ClientService
   end
 
   def call
-    patch(url, request_params)
+    patch(url, request_params, true)
   end
 
   private
diff --git a/config/configuration.yml.example b/config/configuration.yml.example
index f056dee1b..75d5eb5c0 100644
--- a/config/configuration.yml.example
+++ b/config/configuration.yml.example
@@ -55,6 +55,7 @@ default: &default
     access_key_secret: ''
     domain: 'https://testgit.trustie.net'
     base_url: '/api/v1'
+    hat_base_url: '/api/hat'
     accelerator:
       access_key_id: ''
       access_key_secret: ''

From 2326bde96d45362306e42548eaed3b1e5e061e74 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Mon, 16 Jan 2023 18:10:13 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Agemfile?=
 =?UTF-8?q?=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile      |  2 +-
 Gemfile.lock | 42 +++---------------------------------------
 2 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/Gemfile b/Gemfile
index 621ca4d0d..0645fa72c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'puma', '~> 3.11'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 
-# gem 'coffee-rails', '~> 4.2'[p-qwa9aq]
+# gem 'coffee-rails', '~> 4.2'
 gem 'turbolinks', '~> 5'
 gem 'jbuilder', '~> 2.5'
 gem 'groupdate', '~> 4.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0001f2321..e27c504aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,8 +106,6 @@ GEM
       activerecord (>= 3.1.0, < 7)
     diff-lcs (1.3)
     diffy (3.3.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
     doorkeeper (5.5.1)
       railties (>= 5)
     doorkeeper-jwt (0.4.1)
@@ -129,14 +127,12 @@ GEM
     execjs (2.7.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.15.5)
+    ffi (1.12.2)
     font-awesome-sass (4.7.0)
       sass (>= 3.2)
     fugit (1.4.1)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    gitea-client (0.11.1)
-      rest-client (~> 2.1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     grape-entity (0.7.1)
@@ -147,9 +143,6 @@ GEM
     harmonious_dictionary (0.0.1)
     hashie (3.6.0)
     htmlentities (4.3.4)
-    http-accept (1.7.0)
-    http-cookie (1.0.5)
-      domain_name (~> 0.5)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     io-like (0.3.1)
@@ -187,9 +180,6 @@ GEM
       mimemagic (~> 0.3.2)
     maruku (0.7.3)
     method_source (0.9.2)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
     mimemagic (0.3.10)
       nokogiri (~> 1)
       rake
@@ -203,7 +193,6 @@ GEM
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mysql2 (0.5.3)
-    netrc (0.11.0)
     nio4r (2.5.2)
     nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
@@ -220,21 +209,9 @@ GEM
       addressable (~> 2.3)
       nokogiri (~> 1.5)
       omniauth (~> 1.2)
-    omniauth-gitee (1.0.0)
-      omniauth (>= 1.5, < 3.0)
-      omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-github (1.4.0)
-      omniauth (~> 1.5)
-      omniauth-oauth2 (>= 1.4.0, < 2.0)
     omniauth-oauth2 (1.6.0)
       oauth2 (~> 1.1)
       omniauth (~> 1.9)
-    omniauth-rails_csrf_protection (0.1.2)
-      actionpack (>= 4.2)
-      omniauth (>= 1.3.1)
-    omniauth-wechat-oauth2 (0.2.2)
-      omniauth (>= 1.3.2)
-      omniauth-oauth2 (>= 1.1.1)
     parallel (1.19.1)
     parser (2.7.1.1)
       ast (~> 2.4.0)
@@ -315,11 +292,6 @@ GEM
     regexp_parser (1.7.0)
     request_store (1.5.0)
       rack (>= 1.4)
-    rest-client (2.1.0)
-      http-accept (>= 1.7.0, < 2.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
     reverse_markdown (1.4.0)
       nokogiri
     roo (2.8.3)
@@ -374,7 +346,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sassc (2.4.0)
+    sassc (2.2.1)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
@@ -446,9 +418,6 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     unicode-display_width (1.6.1)
     web-console (3.7.0)
       actionview (>= 5.0)
@@ -490,7 +459,6 @@ DEPENDENCIES
   enumerize
   faraday (~> 0.15.4)
   font-awesome-sass (= 4.7.0)
-  gitea-client (~> 0.11.1)
   grape-entity (~> 0.7.1)
   groupdate (~> 4.1.0)
   harmonious_dictionary (~> 0.0.1)
@@ -504,11 +472,7 @@ DEPENDENCIES
   oauth2
   omniauth (~> 1.9.0)
   omniauth-cas
-  omniauth-gitee (~> 1.0.0)
-  omniauth-github
   omniauth-oauth2 (~> 1.6.0)
-  omniauth-rails_csrf_protection
-  omniauth-wechat-oauth2
   parallel (~> 1.19, >= 1.19.1)
   pdfkit
   prettier
@@ -548,4 +512,4 @@ DEPENDENCIES
   wkhtmltopdf-binary
 
 BUNDLED WITH
-   2.3.26
+   2.1.4

From ad9c5fe0fbbba5325ff900fa83861494d48a1028 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 31 Jan 2023 10:04:07 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9Areadme?=
 =?UTF-8?q?=E4=B8=ADgitea=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1bcd05cce..a1cadd1cc 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@ gitea:
   access_key_secret: 'password'
   domain: 'http://www.gitea.example.com'
   base_url: '/api/v1'
+  hat_base_url: '/api/hat'
 ```
 
 #### 6. 安装redis环境

From 718457888d846f94713d778a5f4de210478500e7 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 31 Jan 2023 10:55:55 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9Aclient?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E4=BB=A5=E5=8F=8Agitea=5Fclient=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=96=87=E4=BB=B6=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                               |  2 +-
 app/services/api/v1/projects/blame_service.rb         |  2 +-
 .../api/v1/projects/branches/all_list_service.rb      |  2 +-
 .../api/v1/projects/branches/create_service.rb        |  4 ++--
 .../api/v1/projects/code_stats/list_service.rb        |  2 +-
 app/services/api/v1/projects/commits/diff_service.rb  |  2 +-
 .../api/v1/projects/contents/batch_create_service.rb  |  4 ++--
 app/services/api/v1/projects/get_service.rb           |  2 +-
 app/services/api/v1/projects/pulls/get_service.rb     |  2 +-
 .../v1/projects/pulls/versions/get_diff_service.rb    |  2 +-
 .../api/v1/projects/pulls/versions/list_service.rb    |  2 +-
 .../api/v1/projects/webhooks/create_service.rb        |  2 +-
 .../api/v1/projects/webhooks/hooktasks_service.rb     |  2 +-
 app/services/projects/transfer_service.rb             |  2 +-
 config/initializers/gitea_client.rb                   | 11 ++++++++++-
 15 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0645fa72c..e0b2bcd12 100644
--- a/Gemfile
+++ b/Gemfile
@@ -140,4 +140,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 0.11.6'
\ No newline at end of file
+gem 'gitea-client', '~> 1.2.1'
diff --git a/app/services/api/v1/projects/blame_service.rb b/app/services/api/v1/projects/blame_service.rb
index d419fec14..cdd5739b8 100644
--- a/app/services/api/v1/projects/blame_service.rb
+++ b/app/services/api/v1/projects/blame_service.rb
@@ -32,7 +32,7 @@ class Api::V1::Projects::BlameService < ApplicationService
   end
 
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_blame_by_owner_repo(owner, repo, {query: request_params})
+    @gitea_data = $gitea_hat_client.get_repos_blame_by_owner_repo(owner, repo, {query: request_params})
     raise Error, '获取项目blame失败！' unless @gitea_data.is_a?(Hash)
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/branches/all_list_service.rb b/app/services/api/v1/projects/branches/all_list_service.rb
index 182495cdf..4d31f6534 100644
--- a/app/services/api/v1/projects/branches/all_list_service.rb
+++ b/app/services/api/v1/projects/branches/all_list_service.rb
@@ -24,7 +24,7 @@ class Api::V1::Projects::Branches::AllListService < ApplicationService
   end
 
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
+    @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)
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/branches/create_service.rb b/app/services/api/v1/projects/branches/create_service.rb
index eae3779f8..0f2ec1d5e 100644
--- a/app/services/api/v1/projects/branches/create_service.rb
+++ b/app/services/api/v1/projects/branches/create_service.rb
@@ -43,8 +43,8 @@ class Api::V1::Projects::Branches::CreateService < ApplicationService
     raise Error, '创建分支失败！' unless @gitea_data.is_a?(Hash)
   end
 
-  def check_branch_exist
-    result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params}) rescue nil
+  def check_new_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)
diff --git a/app/services/api/v1/projects/code_stats/list_service.rb b/app/services/api/v1/projects/code_stats/list_service.rb
index a5e330e21..0831bc722 100644
--- a/app/services/api/v1/projects/code_stats/list_service.rb
+++ b/app/services/api/v1/projects/code_stats/list_service.rb
@@ -28,7 +28,7 @@ class Api::V1::Projects::CodeStats::ListService < ApplicationService
   end
 
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_code_stats_by_owner_repo(owner, repo, {query: request_params}) rescue nil
+    @gitea_data = $gitea_hat_client.get_repos_code_stats_by_owner_repo(owner, repo, {query: request_params}) rescue nil
     raise Error, '获取贡献者贡献度失败！' unless @gitea_data.is_a?(Hash)
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/commits/diff_service.rb b/app/services/api/v1/projects/commits/diff_service.rb
index 71dd155a0..3de96fbaa 100644
--- a/app/services/api/v1/projects/commits/diff_service.rb
+++ b/app/services/api/v1/projects/commits/diff_service.rb
@@ -29,7 +29,7 @@ class Api::V1::Projects::Commits::DiffService < ApplicationService
   end
 
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_commits_diff_by_owner_repo_sha(owner, repo, sha, {query: request_params}) rescue nil
+    @gitea_data = $gitea_hat_client.get_repos_commits_diff_by_owner_repo_sha(owner, repo, sha, {query: request_params}) rescue nil
     raise Error, '获取提交对比失败！' unless @gitea_data.is_a?(Hash)
   end
 
diff --git a/app/services/api/v1/projects/contents/batch_create_service.rb b/app/services/api/v1/projects/contents/batch_create_service.rb
index 92bd30a99..7c514c376 100644
--- a/app/services/api/v1/projects/contents/batch_create_service.rb
+++ b/app/services/api/v1/projects/contents/batch_create_service.rb
@@ -78,12 +78,12 @@ class Api::V1::Projects::Contents::BatchCreateService < ApplicationService
 
   def excute_data_to_gitea
     puts request_body.to_json
-    @gitea_data = $gitea_client.post_repos_contents_batch_by_owner_repo(owner, repo, {body: request_body.to_json, query: request_params}) rescue nil 
+    @gitea_data = $gitea_hat_client.post_repos_contents_batch_by_owner_repo(owner, repo, {body: request_body.to_json, query: request_params}) rescue nil 
     raise Error, '提交文件失败！' unless @gitea_data.is_a?(Hash)
   end
 
   def check_branch_exist 
-    result = $gitea_client.get_repos_branch_name_set_by_owner_repo(owner, repo, {query: request_params} ) rescue nil 
+    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, '分支不存在！' unless result['branch_name'].include?(branch)
     raise Error, '分支已存在！' if result['branch_name'].include?(new_branch) && !new_branch.nil?
diff --git a/app/services/api/v1/projects/get_service.rb b/app/services/api/v1/projects/get_service.rb
index ebb0d1cfa..480744bfc 100644
--- a/app/services/api/v1/projects/get_service.rb
+++ b/app/services/api/v1/projects/get_service.rb
@@ -45,6 +45,6 @@ class Api::V1::Projects::GetService < ApplicationService
   end
 
   def load_gitea_branch_tag_count 
-    @gitea_branch_tag_count = $gitea_client.get_repos_branch_tag_count_by_owner_repo(owner, repo, {query: request_params}) rescue nil
+    @gitea_branch_tag_count = $gitea_hat_client.get_repos_branch_tag_count_by_owner_repo(owner, repo, {query: request_params}) rescue nil
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/pulls/get_service.rb b/app/services/api/v1/projects/pulls/get_service.rb
index 3c1bba99b..f28881ae0 100644
--- a/app/services/api/v1/projects/pulls/get_service.rb
+++ b/app/services/api/v1/projects/pulls/get_service.rb
@@ -26,7 +26,7 @@ class Api::V1::Projects::Pulls::GetService < ApplicationService
   end
 
   def load_gitea_data
-    @gitea_data = $gitea_client.get_repos_pulls_by_owner_repo_index(owner, repo, index, {query: request_params})
+    @gitea_data = $gitea_hat_client.get_repos_pulls_by_owner_repo_index(owner, repo, index, {query: request_params})
     # raise Error, '获取合并请求失败！' unless @gitea_data.is_a?(Hash)
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/pulls/versions/get_diff_service.rb b/app/services/api/v1/projects/pulls/versions/get_diff_service.rb
index 979bc33fb..1cae8c345 100644
--- a/app/services/api/v1/projects/pulls/versions/get_diff_service.rb
+++ b/app/services/api/v1/projects/pulls/versions/get_diff_service.rb
@@ -30,7 +30,7 @@ class Api::V1::Projects::Pulls::Versions::GetDiffService < ApplicationService
   end
 
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_pulls_versions_diff_by_owner_repo_index_version_id(owner, repo, index, version_id, {query: request_params})
+    @gitea_data = $gitea_hat_client.get_repos_pulls_versions_diff_by_owner_repo_index_version_id(owner, repo, index, version_id, {query: request_params})
     raise Error, '获取合并请求版本diff失败！' unless @gitea_data.is_a?(Hash)
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/pulls/versions/list_service.rb b/app/services/api/v1/projects/pulls/versions/list_service.rb
index ca88ff1f6..e9ae69c32 100644
--- a/app/services/api/v1/projects/pulls/versions/list_service.rb
+++ b/app/services/api/v1/projects/pulls/versions/list_service.rb
@@ -30,7 +30,7 @@ class Api::V1::Projects::Pulls::Versions::ListService < ApplicationService
   end
 
   def load_gitea_data
-    @gitea_data = $gitea_client.get_repos_pulls_versions_by_owner_repo_index(owner, repo, index, {query: request_params})
+    @gitea_data = $gitea_hat_client.get_repos_pulls_versions_by_owner_repo_index(owner, repo, index, {query: request_params})
     raise Error, '获取合并请求版本失败！' unless @gitea_data.is_a?(Hash)
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/webhooks/create_service.rb b/app/services/api/v1/projects/webhooks/create_service.rb
index edc8b2263..cc9cf37f0 100644
--- a/app/services/api/v1/projects/webhooks/create_service.rb
+++ b/app/services/api/v1/projects/webhooks/create_service.rb
@@ -58,6 +58,6 @@ class Api::V1::Projects::Webhooks::CreateService < ApplicationService
   end
 
   def excute_data_to_gitea 
-    @gitea_data = $gitea_client.post_repos_hooks_by_owner_repo(owner, repo, {body: request_body.to_json, query: request_params}) rescue nil
+    @gitea_data = $gitea_hat_client.post_repos_hooks_by_owner_repo(owner, repo, {body: request_body.to_json, query: request_params}) rescue nil
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/webhooks/hooktasks_service.rb b/app/services/api/v1/projects/webhooks/hooktasks_service.rb
index 6be9c67c8..17ada9089 100644
--- a/app/services/api/v1/projects/webhooks/hooktasks_service.rb
+++ b/app/services/api/v1/projects/webhooks/hooktasks_service.rb
@@ -30,6 +30,6 @@ class Api::V1::Projects::Webhooks::ListService < ApplicationService
   end
 
   def load_gitea_data 
-    @gitea_data = $gitea_client.get_repos_hooks_hooktasks_by_owner_repo(owner, repo, id, {query: request_params}) rescue nil
+    @gitea_data = $gitea_hat_client.get_repos_hooks_hooktasks_by_owner_repo(owner, repo, id, {query: request_params}) rescue nil
   end
 end
\ No newline at end of file
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 8ed58f8a7..07eab8981 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -51,7 +51,7 @@ class Projects::TransferService < ApplicationService
 
   def gitea_update_owner
     begin
-      @gitea_repo = $gitea_client.post_repos_transfer_by_owner_repo(owner&.login, project.identifier, {body: {new_owner: new_owner&.login}.to_json})
+      @gitea_repo = $gitea_hat_client.post_repos_transfer_by_owner_repo(owner&.login, project.identifier, {body: {new_owner: new_owner&.login}.to_json})
       # @gitea_repo = Gitea::Repository::TransferService.call(owner&.gitea_token, owner&.login, project.identifier, new_owner&.login)
     rescue Exception => e
       Rails.logger.info("##### Project transfer_service, gitea transfer error #{e}")
diff --git a/config/initializers/gitea_client.rb b/config/initializers/gitea_client.rb
index c909cebf4..15777ac30 100644
--- a/config/initializers/gitea_client.rb
+++ b/config/initializers/gitea_client.rb
@@ -7,5 +7,14 @@ $gitea_client = Gitea::Api::Client.new({
   domain: gitea_config[:domain], 
   base_url: gitea_config[:base_url],
   username: gitea_config[:access_key_id], 
-  password: gitea_config[:access_key_secret]
+  password: gitea_config[:access_key_secret],
+  log_filepath: "log/gitea-client.log"
+})
+
+$gitea_hat_client = Gitea::Api::Hat::Client.new({
+  domain: gitea_config[:domain], 
+  hat_base_url:  gitea_config[:hat_base_url],
+  username: gitea_config[:access_key_id], 
+  password: gitea_config[:access_key_secret], 
+  log_filepath: "log/gitea-client.log"
 })
\ No newline at end of file

From 8463518adedd1f79a797fdf3c0fdf720eecc52d5 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 2 Feb 2023 15:31:38 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Atags=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8commiter=E6=9B=B4=E6=94=B9=E4=B8=BAcommitter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/repositories/tags.json.jbuilder | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/repositories/tags.json.jbuilder b/app/views/repositories/tags.json.jbuilder
index 4f5bb4330..5e3c7e39e 100644
--- a/app/views/repositories/tags.json.jbuilder
+++ b/app/views/repositories/tags.json.jbuilder
@@ -14,10 +14,10 @@ json.tags @tags do |tag|
     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! 'commit_author', user: render_cache_commit_author(tag['commit']['commiter']), name: tag['commit']['commiter']['name']
+        json.partial! 'commit_author', user: render_cache_commit_author(tag['commit']['committer']), name: tag['commit']['committer']['name']
       end
       json.author do 
         json.partial! 'commit_author', user: render_cache_commit_author(tag['commit']['author']), name: tag['commit']['author']['name']

From 54b7cef1bd27b6eb7c1de042bf6b7c4a4541294d Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 17 Feb 2023 22:03:18 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E5=90=8C=E6=AD=A5develop=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E4=BB=A3=E7=A0=81=E5=90=8E=E6=9B=B4=E6=94=B9client?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                                   | 2 +-
 app/controllers/api/v1/projects/tags_controller.rb        | 1 +
 app/services/api/v1/projects/branches/all_list_service.rb | 2 +-
 app/services/api/v1/projects/branches/create_service.rb   | 8 ++++----
 app/services/api/v1/projects/branches/delete_service.rb   | 6 +++---
 .../v1/projects/branches/update_default_branch_service.rb | 6 +++---
 app/services/api/v1/projects/tags/delete_service.rb       | 2 +-
 app/services/api/v1/projects/tags/list_service.rb         | 2 +-
 .../projects/branches/_simple_gitea_detail.json.jbuilder  | 4 ++--
 .../tags/_simple_gitea_index_detail.json.jbuilder         | 6 +++---
 10 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index e0b2bcd12..1528d502b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -140,4 +140,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 1.2.1'
+gem 'gitea-client', '~> 1.3.1'
diff --git a/app/controllers/api/v1/projects/tags_controller.rb b/app/controllers/api/v1/projects/tags_controller.rb
index 06c3b1c8e..b87d48429 100644
--- a/app/controllers/api/v1/projects/tags_controller.rb
+++ b/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] 
diff --git a/app/services/api/v1/projects/branches/all_list_service.rb b/app/services/api/v1/projects/branches/all_list_service.rb
index 4d31f6534..9ca4ae7d0 100644
--- a/app/services/api/v1/projects/branches/all_list_service.rb
+++ b/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
\ No newline at end of file
diff --git a/app/services/api/v1/projects/branches/create_service.rb b/app/services/api/v1/projects/branches/create_service.rb
index 0f2ec1d5e..39964e402 100644
--- a/app/services/api/v1/projects/branches/create_service.rb
+++ b/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
\ No newline at end of file
diff --git a/app/services/api/v1/projects/branches/delete_service.rb b/app/services/api/v1/projects/branches/delete_service.rb
index 79a6ba0db..28836c797 100644
--- a/app/services/api/v1/projects/branches/delete_service.rb
+++ b/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
\ No newline at end of file
diff --git a/app/services/api/v1/projects/branches/update_default_branch_service.rb b/app/services/api/v1/projects/branches/update_default_branch_service.rb
index 5c220aa5d..c79c33bd2 100644
--- a/app/services/api/v1/projects/branches/update_default_branch_service.rb
+++ b/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
\ No newline at end of file
diff --git a/app/services/api/v1/projects/tags/delete_service.rb b/app/services/api/v1/projects/tags/delete_service.rb
index 492898b53..d0d317aa8 100644
--- a/app/services/api/v1/projects/tags/delete_service.rb
+++ b/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
diff --git a/app/services/api/v1/projects/tags/list_service.rb b/app/services/api/v1/projects/tags/list_service.rb
index a7743fe00..9bf4701fc 100644
--- a/app/services/api/v1/projects/tags/list_service.rb
+++ b/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
\ No newline at end of file
diff --git a/app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder b/app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder
index 6a35b782e..98890eba4 100644
--- a/app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder
+++ b/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'])
diff --git a/app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder b/app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder
index b8ba28f85..460b56f56 100644
--- a/app/views/api/v1/projects/tags/_simple_gitea_index_detail.json.jbuilder
+++ b/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']

From de1e931c2f442c9d6cb2b02427ae7aa07e52aa84 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 23 Feb 2023 11:38:16 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E8=B4=A1?=
 =?UTF-8?q?=E7=8C=AE=E8=80=85=E8=8E=B7=E5=8F=96=E8=A7=84=E5=88=99=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=88=86=E6=94=AF=E5=88=97=E8=A1=A8=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=97=A7=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb    |  5 ++--
 .../api/v1/projects/branches/list_service.rb  | 13 ++++++----
 .../repository/contributors/get_service.rb    | 24 +++++++++++++++----
 .../repositories/_contributor.json.jbuilder   | 18 +++++++-------
 .../repositories/contributors.json.jbuilder   |  2 +-
 5 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index e32b31017..e6fef78f0 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -166,8 +166,9 @@ class RepositoriesController < ApplicationController
     if params[:filepath].present? || @project.educoder?
       @contributors = []
     else
-      result = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier)
-      @contributors = result.is_a?(Hash) && result.key?(:status) ? [] : result
+      result = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier, {page: params[:page], limit: params[:limit]})
+      @total_count = result[:total_count]
+      @contributors = result.is_a?(Hash) ? result[:body] : []
     end
   rescue
     @contributors = []
diff --git a/app/services/api/v1/projects/branches/list_service.rb b/app/services/api/v1/projects/branches/list_service.rb
index e5c6fe442..f53dc1f49 100644
--- a/app/services/api/v1/projects/branches/list_service.rb
+++ b/app/services/api/v1/projects/branches/list_service.rb
@@ -1,7 +1,7 @@
 class Api::V1::Projects::Branches::ListService < ApplicationService 
 
   attr_accessor :project, :token, :owner, :repo, :name, :page, :limit
-  attr_accessor :gitea_data
+  attr_accessor :gitea_data, :gitea_repo_data
 
   def initialize(project, params, token=nil)
     @project = project 
@@ -16,6 +16,8 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
   def call 
     load_gitea_data
     
+    gitea_data["default_branch"] = gitea_repo_data["default_branch"]
+
     gitea_data
   end
 
@@ -32,9 +34,12 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
   end
 
   def load_gitea_data 
-    puts request_params
-    @gitea_data = $gitea_client.get_repos_branches_by_owner_repo(owner, repo, {query: request_params}) rescue nil
-    puts @gitea_data
+    @gitea_data = $gitea_hat_client.get_repos_branches_by_owner_repo(owner, repo, {query: request_params}) rescue nil
     raise Error, '获取分支列表失败！' unless @gitea_data.is_a?(Hash)
   end
+
+  def load_default_branch 
+    @gitea_repo_data = $gitea_client.get_repos_by_owner_repo('yystopf', 'pig') rescue nil 
+    raise Error, '获取仓库信息失败！' unless @gitea_data.is_a?(Hash)
+  end
 end
\ No newline at end of file
diff --git a/app/services/gitea/repository/contributors/get_service.rb b/app/services/gitea/repository/contributors/get_service.rb
index e5ad32e38..fe9ed2463 100644
--- a/app/services/gitea/repository/contributors/get_service.rb
+++ b/app/services/gitea/repository/contributors/get_service.rb
@@ -1,22 +1,38 @@
 class Gitea::Repository::Contributors::GetService < Gitea::ClientService
-  attr_reader :owner, :repo_name
+  attr_reader :owner, :repo_name, :page, :limit
 
-  def initialize(owner, repo_name)
+  def initialize(owner, repo_name, params={})
     @owner = owner 
     @repo_name = repo_name
+    @page = params[:page] || 1
+    @limit = params[:limit] || 20
   end
 
   def call
     response = get(url, params, true)
-    render_status(response)
+    render_result(response)
   end
 
   private 
   def params
-    Hash.new.merge(token: owner.gitea_token)
+    Hash.new.merge(token: owner.gitea_token, page: page, limit: limit)
   end
 
   def url 
     "/repos/#{owner.login}/#{repo_name}/contributors"
   end
+
+  def render_result(response)
+    case response.status
+    when 200
+      result = {}
+      headers = response.headers.to_hash
+      body = JSON.parse(response.body)
+      total_count = headers["x-total"]
+      result.merge(total_count: total_count.to_i, body: body)
+    else
+      nil
+      # {status: -1, message: "#{body['message']}"}
+    end
+  end
 end
\ No newline at end of file
diff --git a/app/views/repositories/_contributor.json.jbuilder b/app/views/repositories/_contributor.json.jbuilder
index 56fa9ce86..ed036aae3 100644
--- a/app/views/repositories/_contributor.json.jbuilder
+++ b/app/views/repositories/_contributor.json.jbuilder
@@ -1,15 +1,15 @@
-user = $redis_cache.hgetall("v2-owner-common:#{contributor["login"]}-#{contributor["email"]}")
+user = $redis_cache.hgetall("v2-owner-common:#{contributor["name"]}-#{contributor["email"]}")
 if user.blank?
-  json.contributions contributor["contributions"]
-  # json.gid contributor["id"]
-  json.login contributor["login"]
+  json.contributions contributor["commits"]
+  # json.id contributor["id"]
+  json.name contributor["name"]
   json.type nil
-  json.name contributor["login"]
-  json.image_url User::Avatar.get_letter_avatar_url(contributor["login"])
+  json.name contributor["name"]
+  json.image_url User::Avatar.get_letter_avatar_url(contributor["name"])
 else
-  json.contributions contributor["contributions"]
-  # json.gid contributor["id"]
-  json.login user["login"]
+  json.contributions contributor["commits"]
+  json.id user["id"]
+  json.name user["name"]
   json.type user["type"]
   json.name user["name"]
   json.image_url user["avatar_url"]
diff --git a/app/views/repositories/contributors.json.jbuilder b/app/views/repositories/contributors.json.jbuilder
index 2fb6abae8..bec285523 100644
--- a/app/views/repositories/contributors.json.jbuilder
+++ b/app/views/repositories/contributors.json.jbuilder
@@ -1,4 +1,4 @@
-total_count = @contributors.size 
+total_count = @total_count
 json.list @contributors.each do |contributor|
   json.partial! 'contributor', locals: { contributor: contributor }
 end

From 36dbf76d808718526d88216a32cddc1861334e8a Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 23 Feb 2023 13:45:30 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/api/v1/projects/branches/list_service.rb    | 9 +++++----
 .../projects/branches/_simple_gitea_detail.json.jbuilder | 2 +-
 app/views/api/v1/projects/branches/create.json.jbuilder  | 2 +-
 app/views/api/v1/projects/branches/index.json.jbuilder   | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/services/api/v1/projects/branches/list_service.rb b/app/services/api/v1/projects/branches/list_service.rb
index f53dc1f49..590c4884f 100644
--- a/app/services/api/v1/projects/branches/list_service.rb
+++ b/app/services/api/v1/projects/branches/list_service.rb
@@ -15,10 +15,11 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
 
   def call 
     load_gitea_data
-    
-    gitea_data["default_branch"] = gitea_repo_data["default_branch"]
+    load_default_branch
 
-    gitea_data
+    @gitea_data[:default_branch] = @gitea_repo_data["default_branch"]
+
+    @gitea_data
   end
 
   private 
@@ -39,7 +40,7 @@ class Api::V1::Projects::Branches::ListService < ApplicationService
   end
 
   def load_default_branch 
-    @gitea_repo_data = $gitea_client.get_repos_by_owner_repo('yystopf', 'pig') rescue nil 
+    @gitea_repo_data = $gitea_client.get_repos_by_owner_repo(owner, repo) rescue nil 
     raise Error, '获取仓库信息失败！' unless @gitea_data.is_a?(Hash)
   end
 end
\ No newline at end of file
diff --git a/app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder b/app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder
index 98890eba4..c9235bdb4 100644
--- a/app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder
+++ b/app/views/api/v1/projects/branches/_simple_gitea_detail.json.jbuilder
@@ -20,7 +20,7 @@ json.user_can_merge branch['user_can_merge']
 json.commit_id branch['commit']['id']
 json.commit_time_from_now time_from_now(branch['commit']['timestamp'].to_time)
 json.commit_time branch['commit']['timestamp']
-json.default_branch branch['default_branch']
+json.default_branch default_branch || nil
 json.http_url render_http_url(@project)
 json.zip_url render_zip_url(@owner, @project.repository, branch['name'])
 json.tar_url render_tar_url(@owner, @project.repository, branch['name'])
\ No newline at end of file
diff --git a/app/views/api/v1/projects/branches/create.json.jbuilder b/app/views/api/v1/projects/branches/create.json.jbuilder
index eed860b81..b7de0f576 100644
--- a/app/views/api/v1/projects/branches/create.json.jbuilder
+++ b/app/views/api/v1/projects/branches/create.json.jbuilder
@@ -1 +1 @@
-json.partial! "api/v1/projects/branches/simple_gitea_detail", branch: @result_object
+json.partial! "api/v1/projects/branches/simple_gitea_detail", branch: @result_object, default_branch: @result_object[:default_branch]
diff --git a/app/views/api/v1/projects/branches/index.json.jbuilder b/app/views/api/v1/projects/branches/index.json.jbuilder
index cfb9bb647..80b3e4d03 100644
--- a/app/views/api/v1/projects/branches/index.json.jbuilder
+++ b/app/views/api/v1/projects/branches/index.json.jbuilder
@@ -1,4 +1,5 @@
 json.total_count @result_object[:total_data].to_i 
 json.branches @result_object[:data].each do |branch| 
-  json.partial! "api/v1/projects/branches/simple_gitea_detail", branch: branch
+  json.partial! "api/v1/projects/branches/simple_gitea_detail", branch: branch, default_branch: @result_object[:default_branch]
+
 end
\ No newline at end of file

From 222de17437b64485dc6dfb6f3b18cf713ec7ffb1 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 23 Feb 2023 13:54:18 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 1528d502b..216884ea6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -140,4 +140,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 1.3.1'
+gem 'gitea-client', '~> 1.3.2'

From d9b2e98110664f4ce01ff80af5e7a2f31b9b8ced Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 28 Feb 2023 14:19:55 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9Awebhook=20http?=
 =?UTF-8?q?=5Fmethod=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                                         | 2 +-
 app/services/api/v1/projects/pulls/versions/get_diff_service.rb | 2 +-
 app/services/api/v1/projects/webhooks/update_service.rb         | 2 +-
 app/services/gitea/repository/webhooks/create_service.rb        | 2 +-
 app/services/gitea/repository/webhooks/update_service.rb        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 216884ea6..805e88fc6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -140,4 +140,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 1.3.2'
+gem 'gitea-client', '~> 1.3.3'
diff --git a/app/services/api/v1/projects/pulls/versions/get_diff_service.rb b/app/services/api/v1/projects/pulls/versions/get_diff_service.rb
index 1cae8c345..1f882fd3b 100644
--- a/app/services/api/v1/projects/pulls/versions/get_diff_service.rb
+++ b/app/services/api/v1/projects/pulls/versions/get_diff_service.rb
@@ -30,7 +30,7 @@ class Api::V1::Projects::Pulls::Versions::GetDiffService < ApplicationService
   end
 
   def load_gitea_data 
-    @gitea_data = $gitea_hat_client.get_repos_pulls_versions_diff_by_owner_repo_index_version_id(owner, repo, index, version_id, {query: request_params})
+    @gitea_data = $gitea_hat_client.get_repos_pulls_versions_diff_by_owner_repo_index_id(owner, repo, index, version_id, {query: request_params})
     raise Error, '获取合并请求版本diff失败！' unless @gitea_data.is_a?(Hash)
   end
 end
\ No newline at end of file
diff --git a/app/services/api/v1/projects/webhooks/update_service.rb b/app/services/api/v1/projects/webhooks/update_service.rb
index a632d6f2d..c98a24ad8 100644
--- a/app/services/api/v1/projects/webhooks/update_service.rb
+++ b/app/services/api/v1/projects/webhooks/update_service.rb
@@ -58,6 +58,6 @@ class Api::V1::Projects::Webhooks::UpdateService < ApplicationService
   end
 
   def excute_data_to_gitea 
-    @gitea_data = $gitea_client.patch_repos_hooks_by_owner_repo_id(owner, repo, id, {body: request_body.to_json, query: request_params}) rescue nil
+    @gitea_data = $gitea_hat_client.patch_repos_hooks_by_owner_repo_id(owner, repo, id, {body: request_body.to_json, query: request_params}) rescue nil
   end
 end
\ No newline at end of file
diff --git a/app/services/gitea/repository/webhooks/create_service.rb b/app/services/gitea/repository/webhooks/create_service.rb
index 33c9a9b0c..9105b39c5 100644
--- a/app/services/gitea/repository/webhooks/create_service.rb
+++ b/app/services/gitea/repository/webhooks/create_service.rb
@@ -8,7 +8,7 @@ class Gitea::Repository::Webhooks::CreateService < Gitea::ClientService
   end
 
   def call 
-    response = post(url, request_params)
+    response = post(url, request_params, true)
     render_response(response)
   end
 
diff --git a/app/services/gitea/repository/webhooks/update_service.rb b/app/services/gitea/repository/webhooks/update_service.rb
index 6094c6c51..25456a801 100644
--- a/app/services/gitea/repository/webhooks/update_service.rb
+++ b/app/services/gitea/repository/webhooks/update_service.rb
@@ -9,7 +9,7 @@ class Gitea::Repository::Webhooks::UpdateService < Gitea::ClientService
   end
 
   def call
-    response = patch(url, data_params)
+    response = patch(url, data_params, true)
     render_response(response)
   end
 

From 13e266aa282e177cc067c700ee4d4216f7237e4b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 7 Mar 2023 15:27:22 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E6=8C=87=E6=B4=BE=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/gitea/pull_request/update_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/gitea/pull_request/update_service.rb b/app/services/gitea/pull_request/update_service.rb
index a68981f29..339caa6ce 100644
--- a/app/services/gitea/pull_request/update_service.rb
+++ b/app/services/gitea/pull_request/update_service.rb
@@ -27,7 +27,7 @@ class Gitea::PullRequest::UpdateService < Gitea::ClientService
   end
 
   def call
-    response = patch(url, request_params)
+    response = patch(url, request_params, true)
 
     status, message, body = render_response(response)
     json_format(status, message, body)

From 77b3c20e154ca0de1f77c5fc16c538a7845ad6ac Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 16 Mar 2023 09:47:11 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9Agitea=20client?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 805e88fc6..abe202581 100644
--- a/Gemfile
+++ b/Gemfile
@@ -140,4 +140,4 @@ gem 'doorkeeper'
 
 gem 'doorkeeper-jwt'
 
-gem 'gitea-client', '~> 1.3.3'
+gem 'gitea-client', '~> 1.4.1'